]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.1.6-201508181953.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.6-201508181953.patch
CommitLineData
db1e636c
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 838dabc..90df77d 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/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
1003index e22c119..abe7041 100644
1004--- a/arch/arm/include/asm/atomic.h
1005+++ b/arch/arm/include/asm/atomic.h
1006@@ -18,17 +18,41 @@
1007 #include <asm/barrier.h>
1008 #include <asm/cmpxchg.h>
1009
1010+#ifdef CONFIG_GENERIC_ATOMIC64
1011+#include <asm-generic/atomic64.h>
1012+#endif
1013+
1014 #define ATOMIC_INIT(i) { (i) }
1015
1016 #ifdef __KERNEL__
1017
1018+#ifdef CONFIG_THUMB2_KERNEL
1019+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
1020+#else
1021+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
1022+#endif
1023+
1024+#define _ASM_EXTABLE(from, to) \
1025+" .pushsection __ex_table,\"a\"\n"\
1026+" .align 3\n" \
1027+" .long " #from ", " #to"\n" \
1028+" .popsection"
1029+
1030 /*
1031 * On ARM, ordinary assignment (str instruction) doesn't clear the local
1032 * strex/ldrex monitor on some implementations. The reason we can use it for
1033 * atomic_set() is the clrex or dummy strex done on every exception return.
1034 */
1035 #define atomic_read(v) ACCESS_ONCE((v)->counter)
1036+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
1037+{
1038+ return ACCESS_ONCE(v->counter);
1039+}
1040 #define atomic_set(v,i) (((v)->counter) = (i))
1041+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1042+{
1043+ v->counter = i;
1044+}
1045
1046 #if __LINUX_ARM_ARCH__ >= 6
1047
1048@@ -38,26 +62,50 @@
1049 * to ensure that the update happens.
1050 */
1051
1052-#define ATOMIC_OP(op, c_op, asm_op) \
1053-static inline void atomic_##op(int i, atomic_t *v) \
1054+#ifdef CONFIG_PAX_REFCOUNT
1055+#define __OVERFLOW_POST \
1056+ " bvc 3f\n" \
1057+ "2: " REFCOUNT_TRAP_INSN "\n"\
1058+ "3:\n"
1059+#define __OVERFLOW_POST_RETURN \
1060+ " bvc 3f\n" \
1061+" mov %0, %1\n" \
1062+ "2: " REFCOUNT_TRAP_INSN "\n"\
1063+ "3:\n"
1064+#define __OVERFLOW_EXTABLE \
1065+ "4:\n" \
1066+ _ASM_EXTABLE(2b, 4b)
1067+#else
1068+#define __OVERFLOW_POST
1069+#define __OVERFLOW_POST_RETURN
1070+#define __OVERFLOW_EXTABLE
1071+#endif
1072+
1073+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1074+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1075 { \
1076 unsigned long tmp; \
1077 int result; \
1078 \
1079 prefetchw(&v->counter); \
1080- __asm__ __volatile__("@ atomic_" #op "\n" \
1081+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1082 "1: ldrex %0, [%3]\n" \
1083 " " #asm_op " %0, %0, %4\n" \
1084+ post_op \
1085 " strex %1, %0, [%3]\n" \
1086 " teq %1, #0\n" \
1087-" bne 1b" \
1088+" bne 1b\n" \
1089+ extable \
1090 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1091 : "r" (&v->counter), "Ir" (i) \
1092 : "cc"); \
1093 } \
1094
1095-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1096-static inline int atomic_##op##_return(int i, atomic_t *v) \
1097+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, _unchecked, c_op, asm_op, , )\
1098+ __ATOMIC_OP(op, , c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1099+
1100+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1101+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1102 { \
1103 unsigned long tmp; \
1104 int result; \
1105@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1106 smp_mb(); \
1107 prefetchw(&v->counter); \
1108 \
1109- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1110+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1111 "1: ldrex %0, [%3]\n" \
1112 " " #asm_op " %0, %0, %4\n" \
1113+ post_op \
1114 " strex %1, %0, [%3]\n" \
1115 " teq %1, #0\n" \
1116-" bne 1b" \
1117+" bne 1b\n" \
1118+ extable \
1119 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1120 : "r" (&v->counter), "Ir" (i) \
1121 : "cc"); \
1122@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1123 return result; \
1124 }
1125
1126+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op, , )\
1127+ __ATOMIC_OP_RETURN(op, , c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1128+
1129 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1130 {
1131 int oldval;
1132@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1133 __asm__ __volatile__ ("@ atomic_add_unless\n"
1134 "1: ldrex %0, [%4]\n"
1135 " teq %0, %5\n"
1136-" beq 2f\n"
1137-" add %1, %0, %6\n"
1138+" beq 4f\n"
1139+" adds %1, %0, %6\n"
1140+
1141+#ifdef CONFIG_PAX_REFCOUNT
1142+" bvc 3f\n"
1143+"2: " REFCOUNT_TRAP_INSN "\n"
1144+"3:\n"
1145+#endif
1146+
1147 " strex %2, %1, [%4]\n"
1148 " teq %2, #0\n"
1149 " bne 1b\n"
1150-"2:"
1151+"4:"
1152+
1153+#ifdef CONFIG_PAX_REFCOUNT
1154+ _ASM_EXTABLE(2b, 4b)
1155+#endif
1156+
1157 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1158 : "r" (&v->counter), "r" (u), "r" (a)
1159 : "cc");
1160@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1161 return oldval;
1162 }
1163
1164+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1165+{
1166+ unsigned long oldval, res;
1167+
1168+ smp_mb();
1169+
1170+ do {
1171+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1172+ "ldrex %1, [%3]\n"
1173+ "mov %0, #0\n"
1174+ "teq %1, %4\n"
1175+ "strexeq %0, %5, [%3]\n"
1176+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1177+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1178+ : "cc");
1179+ } while (res);
1180+
1181+ smp_mb();
1182+
1183+ return oldval;
1184+}
1185+
1186 #else /* ARM_ARCH_6 */
1187
1188 #ifdef CONFIG_SMP
1189 #error SMP not supported on pre-ARMv6 CPUs
1190 #endif
1191
1192-#define ATOMIC_OP(op, c_op, asm_op) \
1193-static inline void atomic_##op(int i, atomic_t *v) \
1194+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1195+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1196 { \
1197 unsigned long flags; \
1198 \
1199@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1200 raw_local_irq_restore(flags); \
1201 } \
1202
1203-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1204-static inline int atomic_##op##_return(int i, atomic_t *v) \
1205+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1206+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1207+
1208+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1209+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1210 { \
1211 unsigned long flags; \
1212 int val; \
1213@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1214 return val; \
1215 }
1216
1217+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1218+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1219+
1220 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1221 {
1222 int ret;
1223@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1224 return ret;
1225 }
1226
1227+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1228+{
1229+ return atomic_cmpxchg((atomic_t *)v, old, new);
1230+}
1231+
1232 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1233 {
1234 int c, old;
1235@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1236
1237 #undef ATOMIC_OPS
1238 #undef ATOMIC_OP_RETURN
1239+#undef __ATOMIC_OP_RETURN
1240 #undef ATOMIC_OP
1241+#undef __ATOMIC_OP
1242
1243 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1244+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1245+{
1246+ return xchg(&v->counter, new);
1247+}
1248
1249 #define atomic_inc(v) atomic_add(1, v)
1250+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1251+{
1252+ atomic_add_unchecked(1, v);
1253+}
1254 #define atomic_dec(v) atomic_sub(1, v)
1255+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1256+{
1257+ atomic_sub_unchecked(1, v);
1258+}
1259
1260 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1261+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1262+{
1263+ return atomic_add_return_unchecked(1, v) == 0;
1264+}
1265 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1266 #define atomic_inc_return(v) (atomic_add_return(1, v))
1267+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1268+{
1269+ return atomic_add_return_unchecked(1, v);
1270+}
1271 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1272 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1273
1274@@ -216,6 +336,14 @@ typedef struct {
1275 long long counter;
1276 } atomic64_t;
1277
1278+#ifdef CONFIG_PAX_REFCOUNT
1279+typedef struct {
1280+ long long counter;
1281+} atomic64_unchecked_t;
1282+#else
1283+typedef atomic64_t atomic64_unchecked_t;
1284+#endif
1285+
1286 #define ATOMIC64_INIT(i) { (i) }
1287
1288 #ifdef CONFIG_ARM_LPAE
1289@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1290 return result;
1291 }
1292
1293+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1294+{
1295+ long long result;
1296+
1297+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1298+" ldrd %0, %H0, [%1]"
1299+ : "=&r" (result)
1300+ : "r" (&v->counter), "Qo" (v->counter)
1301+ );
1302+
1303+ return result;
1304+}
1305+
1306 static inline void atomic64_set(atomic64_t *v, long long i)
1307 {
1308 __asm__ __volatile__("@ atomic64_set\n"
1309@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1310 : "r" (&v->counter), "r" (i)
1311 );
1312 }
1313+
1314+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1315+{
1316+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1317+" strd %2, %H2, [%1]"
1318+ : "=Qo" (v->counter)
1319+ : "r" (&v->counter), "r" (i)
1320+ );
1321+}
1322 #else
1323 static inline long long atomic64_read(const atomic64_t *v)
1324 {
1325@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1326 return result;
1327 }
1328
1329+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1330+{
1331+ long long result;
1332+
1333+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1334+" ldrexd %0, %H0, [%1]"
1335+ : "=&r" (result)
1336+ : "r" (&v->counter), "Qo" (v->counter)
1337+ );
1338+
1339+ return result;
1340+}
1341+
1342 static inline void atomic64_set(atomic64_t *v, long long i)
1343 {
1344 long long tmp;
1345@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1346 : "r" (&v->counter), "r" (i)
1347 : "cc");
1348 }
1349+
1350+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1351+{
1352+ long long tmp;
1353+
1354+ prefetchw(&v->counter);
1355+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1356+"1: ldrexd %0, %H0, [%2]\n"
1357+" strexd %0, %3, %H3, [%2]\n"
1358+" teq %0, #0\n"
1359+" bne 1b"
1360+ : "=&r" (tmp), "=Qo" (v->counter)
1361+ : "r" (&v->counter), "r" (i)
1362+ : "cc");
1363+}
1364 #endif
1365
1366-#define ATOMIC64_OP(op, op1, op2) \
1367-static inline void atomic64_##op(long long i, atomic64_t *v) \
1368+#undef __OVERFLOW_POST_RETURN
1369+#define __OVERFLOW_POST_RETURN \
1370+ " bvc 3f\n" \
1371+" mov %0, %1\n" \
1372+" mov %H0, %H1\n" \
1373+ "2: " REFCOUNT_TRAP_INSN "\n"\
1374+ "3:\n"
1375+
1376+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1377+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1378 { \
1379 long long result; \
1380 unsigned long tmp; \
1381 \
1382 prefetchw(&v->counter); \
1383- __asm__ __volatile__("@ atomic64_" #op "\n" \
1384+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1385 "1: ldrexd %0, %H0, [%3]\n" \
1386 " " #op1 " %Q0, %Q0, %Q4\n" \
1387 " " #op2 " %R0, %R0, %R4\n" \
1388+ post_op \
1389 " strexd %1, %0, %H0, [%3]\n" \
1390 " teq %1, #0\n" \
1391-" bne 1b" \
1392+" bne 1b\n" \
1393+ extable \
1394 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1395 : "r" (&v->counter), "r" (i) \
1396 : "cc"); \
1397 } \
1398
1399-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1400-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1401+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, _unchecked, op1, op2, , ) \
1402+ __ATOMIC64_OP(op, , op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1403+
1404+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1405+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1406 { \
1407 long long result; \
1408 unsigned long tmp; \
1409@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1410 smp_mb(); \
1411 prefetchw(&v->counter); \
1412 \
1413- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1414+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1415 "1: ldrexd %0, %H0, [%3]\n" \
1416 " " #op1 " %Q0, %Q0, %Q4\n" \
1417 " " #op2 " %R0, %R0, %R4\n" \
1418+ post_op \
1419 " strexd %1, %0, %H0, [%3]\n" \
1420 " teq %1, #0\n" \
1421-" bne 1b" \
1422+" bne 1b\n" \
1423+ extable \
1424 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1425 : "r" (&v->counter), "r" (i) \
1426 : "cc"); \
1427@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1428 return result; \
1429 }
1430
1431+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2, , ) \
1432+ __ATOMIC64_OP_RETURN(op, , op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1433+
1434 #define ATOMIC64_OPS(op, op1, op2) \
1435 ATOMIC64_OP(op, op1, op2) \
1436 ATOMIC64_OP_RETURN(op, op1, op2)
1437@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1438
1439 #undef ATOMIC64_OPS
1440 #undef ATOMIC64_OP_RETURN
1441+#undef __ATOMIC64_OP_RETURN
1442 #undef ATOMIC64_OP
1443+#undef __ATOMIC64_OP
1444+#undef __OVERFLOW_EXTABLE
1445+#undef __OVERFLOW_POST_RETURN
1446+#undef __OVERFLOW_POST
1447
1448 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1449 long long new)
1450@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1451 return oldval;
1452 }
1453
1454+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1455+ long long new)
1456+{
1457+ long long oldval;
1458+ unsigned long res;
1459+
1460+ smp_mb();
1461+
1462+ do {
1463+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1464+ "ldrexd %1, %H1, [%3]\n"
1465+ "mov %0, #0\n"
1466+ "teq %1, %4\n"
1467+ "teqeq %H1, %H4\n"
1468+ "strexdeq %0, %5, %H5, [%3]"
1469+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1470+ : "r" (&ptr->counter), "r" (old), "r" (new)
1471+ : "cc");
1472+ } while (res);
1473+
1474+ smp_mb();
1475+
1476+ return oldval;
1477+}
1478+
1479 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1480 {
1481 long long result;
1482@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1483 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1484 {
1485 long long result;
1486- unsigned long tmp;
1487+ u64 tmp;
1488
1489 smp_mb();
1490 prefetchw(&v->counter);
1491
1492 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1493-"1: ldrexd %0, %H0, [%3]\n"
1494-" subs %Q0, %Q0, #1\n"
1495-" sbc %R0, %R0, #0\n"
1496+"1: ldrexd %1, %H1, [%3]\n"
1497+" subs %Q0, %Q1, #1\n"
1498+" sbcs %R0, %R1, #0\n"
1499+
1500+#ifdef CONFIG_PAX_REFCOUNT
1501+" bvc 3f\n"
1502+" mov %Q0, %Q1\n"
1503+" mov %R0, %R1\n"
1504+"2: " REFCOUNT_TRAP_INSN "\n"
1505+"3:\n"
1506+#endif
1507+
1508 " teq %R0, #0\n"
1509-" bmi 2f\n"
1510+" bmi 4f\n"
1511 " strexd %1, %0, %H0, [%3]\n"
1512 " teq %1, #0\n"
1513 " bne 1b\n"
1514-"2:"
1515+"4:\n"
1516+
1517+#ifdef CONFIG_PAX_REFCOUNT
1518+ _ASM_EXTABLE(2b, 4b)
1519+#endif
1520+
1521 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1522 : "r" (&v->counter)
1523 : "cc");
1524@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1525 " teq %0, %5\n"
1526 " teqeq %H0, %H5\n"
1527 " moveq %1, #0\n"
1528-" beq 2f\n"
1529+" beq 4f\n"
1530 " adds %Q0, %Q0, %Q6\n"
1531-" adc %R0, %R0, %R6\n"
1532+" adcs %R0, %R0, %R6\n"
1533+
1534+#ifdef CONFIG_PAX_REFCOUNT
1535+" bvc 3f\n"
1536+"2: " REFCOUNT_TRAP_INSN "\n"
1537+"3:\n"
1538+#endif
1539+
1540 " strexd %2, %0, %H0, [%4]\n"
1541 " teq %2, #0\n"
1542 " bne 1b\n"
1543-"2:"
1544+"4:\n"
1545+
1546+#ifdef CONFIG_PAX_REFCOUNT
1547+ _ASM_EXTABLE(2b, 4b)
1548+#endif
1549+
1550 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1551 : "r" (&v->counter), "r" (u), "r" (a)
1552 : "cc");
1553@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1554
1555 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1556 #define atomic64_inc(v) atomic64_add(1LL, (v))
1557+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1558 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1559+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1560 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1561 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1562 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1563+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1564 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1565 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1566 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1567diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1568index d2f81e6..3c4dba5 100644
1569--- a/arch/arm/include/asm/barrier.h
1570+++ b/arch/arm/include/asm/barrier.h
1571@@ -67,7 +67,7 @@
1572 do { \
1573 compiletime_assert_atomic_type(*p); \
1574 smp_mb(); \
1575- ACCESS_ONCE(*p) = (v); \
1576+ ACCESS_ONCE_RW(*p) = (v); \
1577 } while (0)
1578
1579 #define smp_load_acquire(p) \
1580diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1581index 75fe66b..ba3dee4 100644
1582--- a/arch/arm/include/asm/cache.h
1583+++ b/arch/arm/include/asm/cache.h
1584@@ -4,8 +4,10 @@
1585 #ifndef __ASMARM_CACHE_H
1586 #define __ASMARM_CACHE_H
1587
1588+#include <linux/const.h>
1589+
1590 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1591-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1592+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1593
1594 /*
1595 * Memory returned by kmalloc() may be used for DMA, so we must make
1596@@ -24,5 +26,6 @@
1597 #endif
1598
1599 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1600+#define __read_only __attribute__ ((__section__(".data..read_only")))
1601
1602 #endif
1603diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1604index 2d46862..a35415b 100644
1605--- a/arch/arm/include/asm/cacheflush.h
1606+++ b/arch/arm/include/asm/cacheflush.h
1607@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1608 void (*dma_unmap_area)(const void *, size_t, int);
1609
1610 void (*dma_flush_range)(const void *, const void *);
1611-};
1612+} __no_const;
1613
1614 /*
1615 * Select the calling method
1616diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1617index 5233151..87a71fa 100644
1618--- a/arch/arm/include/asm/checksum.h
1619+++ b/arch/arm/include/asm/checksum.h
1620@@ -37,7 +37,19 @@ __wsum
1621 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1622
1623 __wsum
1624-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1625+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1626+
1627+static inline __wsum
1628+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1629+{
1630+ __wsum ret;
1631+ pax_open_userland();
1632+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1633+ pax_close_userland();
1634+ return ret;
1635+}
1636+
1637+
1638
1639 /*
1640 * Fold a partial checksum without adding pseudo headers
1641diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1642index abb2c37..96db950 100644
1643--- a/arch/arm/include/asm/cmpxchg.h
1644+++ b/arch/arm/include/asm/cmpxchg.h
1645@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1646
1647 #define xchg(ptr,x) \
1648 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1649+#define xchg_unchecked(ptr,x) \
1650+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1651
1652 #include <asm-generic/cmpxchg-local.h>
1653
1654diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
1655index 0f84249..8e83c55 100644
1656--- a/arch/arm/include/asm/cpuidle.h
1657+++ b/arch/arm/include/asm/cpuidle.h
1658@@ -32,7 +32,7 @@ struct device_node;
1659 struct cpuidle_ops {
1660 int (*suspend)(int cpu, unsigned long arg);
1661 int (*init)(struct device_node *, int cpu);
1662-};
1663+} __no_const;
1664
1665 struct of_cpuidle_method {
1666 const char *method;
1667diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1668index 6ddbe44..b5e38b1a 100644
1669--- a/arch/arm/include/asm/domain.h
1670+++ b/arch/arm/include/asm/domain.h
1671@@ -48,18 +48,37 @@
1672 * Domain types
1673 */
1674 #define DOMAIN_NOACCESS 0
1675-#define DOMAIN_CLIENT 1
1676 #ifdef CONFIG_CPU_USE_DOMAINS
1677+#define DOMAIN_USERCLIENT 1
1678+#define DOMAIN_KERNELCLIENT 1
1679 #define DOMAIN_MANAGER 3
1680+#define DOMAIN_VECTORS DOMAIN_USER
1681 #else
1682+
1683+#ifdef CONFIG_PAX_KERNEXEC
1684 #define DOMAIN_MANAGER 1
1685+#define DOMAIN_KERNEXEC 3
1686+#else
1687+#define DOMAIN_MANAGER 1
1688+#endif
1689+
1690+#ifdef CONFIG_PAX_MEMORY_UDEREF
1691+#define DOMAIN_USERCLIENT 0
1692+#define DOMAIN_UDEREF 1
1693+#define DOMAIN_VECTORS DOMAIN_KERNEL
1694+#else
1695+#define DOMAIN_USERCLIENT 1
1696+#define DOMAIN_VECTORS DOMAIN_USER
1697+#endif
1698+#define DOMAIN_KERNELCLIENT 1
1699+
1700 #endif
1701
1702 #define domain_val(dom,type) ((type) << (2*(dom)))
1703
1704 #ifndef __ASSEMBLY__
1705
1706-#ifdef CONFIG_CPU_USE_DOMAINS
1707+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1708 static inline void set_domain(unsigned val)
1709 {
1710 asm volatile(
1711@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1712 isb();
1713 }
1714
1715-#define modify_domain(dom,type) \
1716- do { \
1717- struct thread_info *thread = current_thread_info(); \
1718- unsigned int domain = thread->cpu_domain; \
1719- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1720- thread->cpu_domain = domain | domain_val(dom, type); \
1721- set_domain(thread->cpu_domain); \
1722- } while (0)
1723-
1724+extern void modify_domain(unsigned int dom, unsigned int type);
1725 #else
1726 static inline void set_domain(unsigned val) { }
1727 static inline void modify_domain(unsigned dom, unsigned type) { }
1728diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1729index d2315ff..f60b47b 100644
1730--- a/arch/arm/include/asm/elf.h
1731+++ b/arch/arm/include/asm/elf.h
1732@@ -117,7 +117,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1733 the loader. We need to make sure that it is out of the way of the program
1734 that it will "exec", and that there is sufficient room for the brk. */
1735
1736-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1737+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1738+
1739+#ifdef CONFIG_PAX_ASLR
1740+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1741+
1742+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1743+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1744+#endif
1745
1746 /* When the program starts, a1 contains a pointer to a function to be
1747 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1748diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1749index de53547..52b9a28 100644
1750--- a/arch/arm/include/asm/fncpy.h
1751+++ b/arch/arm/include/asm/fncpy.h
1752@@ -81,7 +81,9 @@
1753 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1754 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1755 \
1756+ pax_open_kernel(); \
1757 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1758+ pax_close_kernel(); \
1759 flush_icache_range((unsigned long)(dest_buf), \
1760 (unsigned long)(dest_buf) + (size)); \
1761 \
1762diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1763index 4e78065..f265b48 100644
1764--- a/arch/arm/include/asm/futex.h
1765+++ b/arch/arm/include/asm/futex.h
1766@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1767 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1768 return -EFAULT;
1769
1770+ pax_open_userland();
1771+
1772 smp_mb();
1773 /* Prefetching cannot fault */
1774 prefetchw(uaddr);
1775@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1776 : "cc", "memory");
1777 smp_mb();
1778
1779+ pax_close_userland();
1780+
1781 *uval = val;
1782 return ret;
1783 }
1784@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1785 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1786 return -EFAULT;
1787
1788+ pax_open_userland();
1789+
1790 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1791 "1: " TUSER(ldr) " %1, [%4]\n"
1792 " teq %1, %2\n"
1793@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1794 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1795 : "cc", "memory");
1796
1797+ pax_close_userland();
1798+
1799 *uval = val;
1800 return ret;
1801 }
1802@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1803 return -EFAULT;
1804
1805 pagefault_disable(); /* implies preempt_disable() */
1806+ pax_open_userland();
1807
1808 switch (op) {
1809 case FUTEX_OP_SET:
1810@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1811 ret = -ENOSYS;
1812 }
1813
1814+ pax_close_userland();
1815 pagefault_enable(); /* subsumes preempt_enable() */
1816
1817 if (!ret) {
1818diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1819index 83eb2f7..ed77159 100644
1820--- a/arch/arm/include/asm/kmap_types.h
1821+++ b/arch/arm/include/asm/kmap_types.h
1822@@ -4,6 +4,6 @@
1823 /*
1824 * This is the "bare minimum". AIO seems to require this.
1825 */
1826-#define KM_TYPE_NR 16
1827+#define KM_TYPE_NR 17
1828
1829 #endif
1830diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1831index 9e614a1..3302cca 100644
1832--- a/arch/arm/include/asm/mach/dma.h
1833+++ b/arch/arm/include/asm/mach/dma.h
1834@@ -22,7 +22,7 @@ struct dma_ops {
1835 int (*residue)(unsigned int, dma_t *); /* optional */
1836 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1837 const char *type;
1838-};
1839+} __do_const;
1840
1841 struct dma_struct {
1842 void *addr; /* single DMA address */
1843diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1844index f98c7f3..e5c626d 100644
1845--- a/arch/arm/include/asm/mach/map.h
1846+++ b/arch/arm/include/asm/mach/map.h
1847@@ -23,17 +23,19 @@ struct map_desc {
1848
1849 /* types 0-3 are defined in asm/io.h */
1850 enum {
1851- MT_UNCACHED = 4,
1852- MT_CACHECLEAN,
1853- MT_MINICLEAN,
1854+ MT_UNCACHED_RW = 4,
1855+ MT_CACHECLEAN_RO,
1856+ MT_MINICLEAN_RO,
1857 MT_LOW_VECTORS,
1858 MT_HIGH_VECTORS,
1859- MT_MEMORY_RWX,
1860+ __MT_MEMORY_RWX,
1861 MT_MEMORY_RW,
1862- MT_ROM,
1863- MT_MEMORY_RWX_NONCACHED,
1864+ MT_MEMORY_RX,
1865+ MT_ROM_RX,
1866+ MT_MEMORY_RW_NONCACHED,
1867+ MT_MEMORY_RX_NONCACHED,
1868 MT_MEMORY_RW_DTCM,
1869- MT_MEMORY_RWX_ITCM,
1870+ MT_MEMORY_RX_ITCM,
1871 MT_MEMORY_RW_SO,
1872 MT_MEMORY_DMA_READY,
1873 };
1874diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1875index 563b92f..689d58e 100644
1876--- a/arch/arm/include/asm/outercache.h
1877+++ b/arch/arm/include/asm/outercache.h
1878@@ -39,7 +39,7 @@ struct outer_cache_fns {
1879 /* This is an ARM L2C thing */
1880 void (*write_sec)(unsigned long, unsigned);
1881 void (*configure)(const struct l2x0_regs *);
1882-};
1883+} __no_const;
1884
1885 extern struct outer_cache_fns outer_cache;
1886
1887diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1888index 4355f0e..cd9168e 100644
1889--- a/arch/arm/include/asm/page.h
1890+++ b/arch/arm/include/asm/page.h
1891@@ -23,6 +23,7 @@
1892
1893 #else
1894
1895+#include <linux/compiler.h>
1896 #include <asm/glue.h>
1897
1898 /*
1899@@ -114,7 +115,7 @@ struct cpu_user_fns {
1900 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1901 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1902 unsigned long vaddr, struct vm_area_struct *vma);
1903-};
1904+} __no_const;
1905
1906 #ifdef MULTI_USER
1907 extern struct cpu_user_fns cpu_user;
1908diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1909index 19cfab5..3f5c7e9 100644
1910--- a/arch/arm/include/asm/pgalloc.h
1911+++ b/arch/arm/include/asm/pgalloc.h
1912@@ -17,6 +17,7 @@
1913 #include <asm/processor.h>
1914 #include <asm/cacheflush.h>
1915 #include <asm/tlbflush.h>
1916+#include <asm/system_info.h>
1917
1918 #define check_pgt_cache() do { } while (0)
1919
1920@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1921 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1922 }
1923
1924+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1925+{
1926+ pud_populate(mm, pud, pmd);
1927+}
1928+
1929 #else /* !CONFIG_ARM_LPAE */
1930
1931 /*
1932@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1933 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1934 #define pmd_free(mm, pmd) do { } while (0)
1935 #define pud_populate(mm,pmd,pte) BUG()
1936+#define pud_populate_kernel(mm,pmd,pte) BUG()
1937
1938 #endif /* CONFIG_ARM_LPAE */
1939
1940@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1941 __free_page(pte);
1942 }
1943
1944+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1945+{
1946+#ifdef CONFIG_ARM_LPAE
1947+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1948+#else
1949+ if (addr & SECTION_SIZE)
1950+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1951+ else
1952+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1953+#endif
1954+ flush_pmd_entry(pmdp);
1955+}
1956+
1957 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1958 pmdval_t prot)
1959 {
1960diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1961index 5e68278..1869bae 100644
1962--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1963+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1964@@ -27,7 +27,7 @@
1965 /*
1966 * - section
1967 */
1968-#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1969+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1970 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1971 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1972 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1973@@ -39,6 +39,7 @@
1974 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1975 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1976 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1977+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1978
1979 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1980 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1981@@ -68,6 +69,7 @@
1982 * - extended small page/tiny page
1983 */
1984 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1985+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1986 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1987 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1988 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1989diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1990index bfd662e..f6cbb02 100644
1991--- a/arch/arm/include/asm/pgtable-2level.h
1992+++ b/arch/arm/include/asm/pgtable-2level.h
1993@@ -127,6 +127,9 @@
1994 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1995 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1996
1997+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1998+#define L_PTE_PXN (_AT(pteval_t, 0))
1999+
2000 /*
2001 * These are the memory types, defined to be compatible with
2002 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
2003diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
2004index a745a2a..481350a 100644
2005--- a/arch/arm/include/asm/pgtable-3level.h
2006+++ b/arch/arm/include/asm/pgtable-3level.h
2007@@ -80,6 +80,7 @@
2008 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
2009 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
2010 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
2011+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2012 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2013 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
2014 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
2015@@ -91,10 +92,12 @@
2016 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
2017 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
2018 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
2019+#define PMD_SECT_RDONLY PMD_SECT_AP2
2020
2021 /*
2022 * To be used in assembly code with the upper page attributes.
2023 */
2024+#define L_PTE_PXN_HIGH (1 << (53 - 32))
2025 #define L_PTE_XN_HIGH (1 << (54 - 32))
2026 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2027
2028diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2029index f403541..b10df68 100644
2030--- a/arch/arm/include/asm/pgtable.h
2031+++ b/arch/arm/include/asm/pgtable.h
2032@@ -33,6 +33,9 @@
2033 #include <asm/pgtable-2level.h>
2034 #endif
2035
2036+#define ktla_ktva(addr) (addr)
2037+#define ktva_ktla(addr) (addr)
2038+
2039 /*
2040 * Just any arbitrary offset to the start of the vmalloc VM area: the
2041 * current 8MB value just means that there will be a 8MB "hole" after the
2042@@ -48,6 +51,9 @@
2043 #define LIBRARY_TEXT_START 0x0c000000
2044
2045 #ifndef __ASSEMBLY__
2046+extern pteval_t __supported_pte_mask;
2047+extern pmdval_t __supported_pmd_mask;
2048+
2049 extern void __pte_error(const char *file, int line, pte_t);
2050 extern void __pmd_error(const char *file, int line, pmd_t);
2051 extern void __pgd_error(const char *file, int line, pgd_t);
2052@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2053 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2054 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2055
2056+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2057+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2058+
2059+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2060+#include <asm/domain.h>
2061+#include <linux/thread_info.h>
2062+#include <linux/preempt.h>
2063+
2064+static inline int test_domain(int domain, int domaintype)
2065+{
2066+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2067+}
2068+#endif
2069+
2070+#ifdef CONFIG_PAX_KERNEXEC
2071+static inline unsigned long pax_open_kernel(void) {
2072+#ifdef CONFIG_ARM_LPAE
2073+ /* TODO */
2074+#else
2075+ preempt_disable();
2076+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2077+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2078+#endif
2079+ return 0;
2080+}
2081+
2082+static inline unsigned long pax_close_kernel(void) {
2083+#ifdef CONFIG_ARM_LPAE
2084+ /* TODO */
2085+#else
2086+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2087+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2088+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2089+ preempt_enable_no_resched();
2090+#endif
2091+ return 0;
2092+}
2093+#else
2094+static inline unsigned long pax_open_kernel(void) { return 0; }
2095+static inline unsigned long pax_close_kernel(void) { return 0; }
2096+#endif
2097+
2098 /*
2099 * This is the lowest virtual address we can permit any user space
2100 * mapping to be mapped at. This is particularly important for
2101@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2102 /*
2103 * The pgprot_* and protection_map entries will be fixed up in runtime
2104 * to include the cachable and bufferable bits based on memory policy,
2105- * as well as any architecture dependent bits like global/ASID and SMP
2106- * shared mapping bits.
2107+ * as well as any architecture dependent bits like global/ASID, PXN,
2108+ * and SMP shared mapping bits.
2109 */
2110 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2111
2112@@ -307,7 +355,7 @@ static inline pte_t pte_mknexec(pte_t pte)
2113 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2114 {
2115 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2116- L_PTE_NONE | L_PTE_VALID;
2117+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2118 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2119 return pte;
2120 }
2121diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2122index c25ef3e..735f14b 100644
2123--- a/arch/arm/include/asm/psci.h
2124+++ b/arch/arm/include/asm/psci.h
2125@@ -32,7 +32,7 @@ struct psci_operations {
2126 int (*affinity_info)(unsigned long target_affinity,
2127 unsigned long lowest_affinity_level);
2128 int (*migrate_info_type)(void);
2129-};
2130+} __no_const;
2131
2132 extern struct psci_operations psci_ops;
2133 extern struct smp_operations psci_smp_ops;
2134diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2135index 18f5a55..5072a40 100644
2136--- a/arch/arm/include/asm/smp.h
2137+++ b/arch/arm/include/asm/smp.h
2138@@ -107,7 +107,7 @@ struct smp_operations {
2139 int (*cpu_disable)(unsigned int cpu);
2140 #endif
2141 #endif
2142-};
2143+} __no_const;
2144
2145 struct of_cpu_method {
2146 const char *method;
2147diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2148index bd32ede..bd90a0b 100644
2149--- a/arch/arm/include/asm/thread_info.h
2150+++ b/arch/arm/include/asm/thread_info.h
2151@@ -74,9 +74,9 @@ struct thread_info {
2152 .flags = 0, \
2153 .preempt_count = INIT_PREEMPT_COUNT, \
2154 .addr_limit = KERNEL_DS, \
2155- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2156- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2157- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2158+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2159+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2160+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2161 }
2162
2163 #define init_thread_info (init_thread_union.thread_info)
2164@@ -152,7 +152,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2165 #define TIF_SYSCALL_AUDIT 9
2166 #define TIF_SYSCALL_TRACEPOINT 10
2167 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2168-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2169+/* within 8 bits of TIF_SYSCALL_TRACE
2170+ * to meet flexible second operand requirements
2171+ */
2172+#define TIF_GRSEC_SETXID 12
2173+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2174 #define TIF_USING_IWMMXT 17
2175 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2176 #define TIF_RESTORE_SIGMASK 20
2177@@ -166,10 +170,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2178 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2179 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2180 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2181+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2182
2183 /* Checks for any syscall work in entry-common.S */
2184 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2185- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2186+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2187
2188 /*
2189 * Change these and you break ASM code in entry-common.S
2190diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2191index 5f833f7..76e6644 100644
2192--- a/arch/arm/include/asm/tls.h
2193+++ b/arch/arm/include/asm/tls.h
2194@@ -3,6 +3,7 @@
2195
2196 #include <linux/compiler.h>
2197 #include <asm/thread_info.h>
2198+#include <asm/pgtable.h>
2199
2200 #ifdef __ASSEMBLY__
2201 #include <asm/asm-offsets.h>
2202@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2203 * at 0xffff0fe0 must be used instead. (see
2204 * entry-armv.S for details)
2205 */
2206+ pax_open_kernel();
2207 *((unsigned int *)0xffff0ff0) = val;
2208+ pax_close_kernel();
2209 #endif
2210 }
2211
2212diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2213index 74b17d0..57a4bf4 100644
2214--- a/arch/arm/include/asm/uaccess.h
2215+++ b/arch/arm/include/asm/uaccess.h
2216@@ -18,6 +18,7 @@
2217 #include <asm/domain.h>
2218 #include <asm/unified.h>
2219 #include <asm/compiler.h>
2220+#include <asm/pgtable.h>
2221
2222 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2223 #include <asm-generic/uaccess-unaligned.h>
2224@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2225 static inline void set_fs(mm_segment_t fs)
2226 {
2227 current_thread_info()->addr_limit = fs;
2228- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2229+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2230 }
2231
2232 #define segment_eq(a, b) ((a) == (b))
2233
2234+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2235+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2236+
2237+static inline void pax_open_userland(void)
2238+{
2239+
2240+#ifdef CONFIG_PAX_MEMORY_UDEREF
2241+ if (segment_eq(get_fs(), USER_DS)) {
2242+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2243+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2244+ }
2245+#endif
2246+
2247+}
2248+
2249+static inline void pax_close_userland(void)
2250+{
2251+
2252+#ifdef CONFIG_PAX_MEMORY_UDEREF
2253+ if (segment_eq(get_fs(), USER_DS)) {
2254+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2255+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2256+ }
2257+#endif
2258+
2259+}
2260+
2261 #define __addr_ok(addr) ({ \
2262 unsigned long flag; \
2263 __asm__("cmp %2, %0; movlo %0, #0" \
2264@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2265
2266 #define get_user(x, p) \
2267 ({ \
2268+ int __e; \
2269 might_fault(); \
2270- __get_user_check(x, p); \
2271+ pax_open_userland(); \
2272+ __e = __get_user_check((x), (p)); \
2273+ pax_close_userland(); \
2274+ __e; \
2275 })
2276
2277 extern int __put_user_1(void *, unsigned int);
2278@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2279
2280 #define put_user(x, p) \
2281 ({ \
2282+ int __e; \
2283 might_fault(); \
2284- __put_user_check(x, p); \
2285+ pax_open_userland(); \
2286+ __e = __put_user_check((x), (p)); \
2287+ pax_close_userland(); \
2288+ __e; \
2289 })
2290
2291 #else /* CONFIG_MMU */
2292@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2293
2294 #endif /* CONFIG_MMU */
2295
2296+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
2297 #define access_ok(type, addr, size) (__range_ok(addr, size) == 0)
2298
2299 #define user_addr_max() \
2300@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2301 #define __get_user(x, ptr) \
2302 ({ \
2303 long __gu_err = 0; \
2304+ pax_open_userland(); \
2305 __get_user_err((x), (ptr), __gu_err); \
2306+ pax_close_userland(); \
2307 __gu_err; \
2308 })
2309
2310 #define __get_user_error(x, ptr, err) \
2311 ({ \
2312+ pax_open_userland(); \
2313 __get_user_err((x), (ptr), err); \
2314+ pax_close_userland(); \
2315 (void) 0; \
2316 })
2317
2318@@ -368,13 +409,17 @@ do { \
2319 #define __put_user(x, ptr) \
2320 ({ \
2321 long __pu_err = 0; \
2322+ pax_open_userland(); \
2323 __put_user_err((x), (ptr), __pu_err); \
2324+ pax_close_userland(); \
2325 __pu_err; \
2326 })
2327
2328 #define __put_user_error(x, ptr, err) \
2329 ({ \
2330+ pax_open_userland(); \
2331 __put_user_err((x), (ptr), err); \
2332+ pax_close_userland(); \
2333 (void) 0; \
2334 })
2335
2336@@ -474,11 +519,44 @@ do { \
2337
2338
2339 #ifdef CONFIG_MMU
2340-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2341-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2342+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2343+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2344+
2345+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2346+{
2347+ unsigned long ret;
2348+
2349+ check_object_size(to, n, false);
2350+ pax_open_userland();
2351+ ret = ___copy_from_user(to, from, n);
2352+ pax_close_userland();
2353+ return ret;
2354+}
2355+
2356+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2357+{
2358+ unsigned long ret;
2359+
2360+ check_object_size(from, n, true);
2361+ pax_open_userland();
2362+ ret = ___copy_to_user(to, from, n);
2363+ pax_close_userland();
2364+ return ret;
2365+}
2366+
2367 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2368-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2369+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2370 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2371+
2372+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2373+{
2374+ unsigned long ret;
2375+ pax_open_userland();
2376+ ret = ___clear_user(addr, n);
2377+ pax_close_userland();
2378+ return ret;
2379+}
2380+
2381 #else
2382 #define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
2383 #define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
2384@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2385
2386 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2387 {
2388+ if ((long)n < 0)
2389+ return n;
2390+
2391 if (access_ok(VERIFY_READ, from, n))
2392 n = __copy_from_user(to, from, n);
2393 else /* security hole - plug it */
2394@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2395
2396 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2397 {
2398+ if ((long)n < 0)
2399+ return n;
2400+
2401 if (access_ok(VERIFY_WRITE, to, n))
2402 n = __copy_to_user(to, from, n);
2403 return n;
2404diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2405index 5af0ed1..cea83883 100644
2406--- a/arch/arm/include/uapi/asm/ptrace.h
2407+++ b/arch/arm/include/uapi/asm/ptrace.h
2408@@ -92,7 +92,7 @@
2409 * ARMv7 groups of PSR bits
2410 */
2411 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2412-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2413+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2414 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2415 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2416
2417diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2418index a88671c..1cc895e 100644
2419--- a/arch/arm/kernel/armksyms.c
2420+++ b/arch/arm/kernel/armksyms.c
2421@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2422
2423 /* networking */
2424 EXPORT_SYMBOL(csum_partial);
2425-EXPORT_SYMBOL(csum_partial_copy_from_user);
2426+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2427 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2428 EXPORT_SYMBOL(__csum_ipv6_magic);
2429
2430@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2431 #ifdef CONFIG_MMU
2432 EXPORT_SYMBOL(copy_page);
2433
2434-EXPORT_SYMBOL(__copy_from_user);
2435-EXPORT_SYMBOL(__copy_to_user);
2436-EXPORT_SYMBOL(__clear_user);
2437+EXPORT_SYMBOL(___copy_from_user);
2438+EXPORT_SYMBOL(___copy_to_user);
2439+EXPORT_SYMBOL(___clear_user);
2440
2441 EXPORT_SYMBOL(__get_user_1);
2442 EXPORT_SYMBOL(__get_user_2);
2443diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
2444index 318da33..373689f 100644
2445--- a/arch/arm/kernel/cpuidle.c
2446+++ b/arch/arm/kernel/cpuidle.c
2447@@ -19,7 +19,7 @@ extern struct of_cpuidle_method __cpuidle_method_of_table[];
2448 static const struct of_cpuidle_method __cpuidle_method_of_table_sentinel
2449 __used __section(__cpuidle_method_of_table_end);
2450
2451-static struct cpuidle_ops cpuidle_ops[NR_CPUS];
2452+static struct cpuidle_ops cpuidle_ops[NR_CPUS] __read_only;
2453
2454 /**
2455 * arm_cpuidle_simple_enter() - a wrapper to cpu_do_idle()
2456diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2457index 570306c..c87f193 100644
2458--- a/arch/arm/kernel/entry-armv.S
2459+++ b/arch/arm/kernel/entry-armv.S
2460@@ -48,6 +48,87 @@
2461 9997:
2462 .endm
2463
2464+ .macro pax_enter_kernel
2465+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2466+ @ make aligned space for saved DACR
2467+ sub sp, sp, #8
2468+ @ save regs
2469+ stmdb sp!, {r1, r2}
2470+ @ read DACR from cpu_domain into r1
2471+ mov r2, sp
2472+ @ assume 8K pages, since we have to split the immediate in two
2473+ bic r2, r2, #(0x1fc0)
2474+ bic r2, r2, #(0x3f)
2475+ ldr r1, [r2, #TI_CPU_DOMAIN]
2476+ @ store old DACR on stack
2477+ str r1, [sp, #8]
2478+#ifdef CONFIG_PAX_KERNEXEC
2479+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2480+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2481+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2482+#endif
2483+#ifdef CONFIG_PAX_MEMORY_UDEREF
2484+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2485+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2486+#endif
2487+ @ write r1 to current_thread_info()->cpu_domain
2488+ str r1, [r2, #TI_CPU_DOMAIN]
2489+ @ write r1 to DACR
2490+ mcr p15, 0, r1, c3, c0, 0
2491+ @ instruction sync
2492+ instr_sync
2493+ @ restore regs
2494+ ldmia sp!, {r1, r2}
2495+#endif
2496+ .endm
2497+
2498+ .macro pax_open_userland
2499+#ifdef CONFIG_PAX_MEMORY_UDEREF
2500+ @ save regs
2501+ stmdb sp!, {r0, r1}
2502+ @ read DACR from cpu_domain into r1
2503+ mov r0, sp
2504+ @ assume 8K pages, since we have to split the immediate in two
2505+ bic r0, r0, #(0x1fc0)
2506+ bic r0, r0, #(0x3f)
2507+ ldr r1, [r0, #TI_CPU_DOMAIN]
2508+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2509+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2510+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2511+ @ write r1 to current_thread_info()->cpu_domain
2512+ str r1, [r0, #TI_CPU_DOMAIN]
2513+ @ write r1 to DACR
2514+ mcr p15, 0, r1, c3, c0, 0
2515+ @ instruction sync
2516+ instr_sync
2517+ @ restore regs
2518+ ldmia sp!, {r0, r1}
2519+#endif
2520+ .endm
2521+
2522+ .macro pax_close_userland
2523+#ifdef CONFIG_PAX_MEMORY_UDEREF
2524+ @ save regs
2525+ stmdb sp!, {r0, r1}
2526+ @ read DACR from cpu_domain into r1
2527+ mov r0, sp
2528+ @ assume 8K pages, since we have to split the immediate in two
2529+ bic r0, r0, #(0x1fc0)
2530+ bic r0, r0, #(0x3f)
2531+ ldr r1, [r0, #TI_CPU_DOMAIN]
2532+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2533+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2534+ @ write r1 to current_thread_info()->cpu_domain
2535+ str r1, [r0, #TI_CPU_DOMAIN]
2536+ @ write r1 to DACR
2537+ mcr p15, 0, r1, c3, c0, 0
2538+ @ instruction sync
2539+ instr_sync
2540+ @ restore regs
2541+ ldmia sp!, {r0, r1}
2542+#endif
2543+ .endm
2544+
2545 .macro pabt_helper
2546 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2547 #ifdef MULTI_PABORT
2548@@ -90,11 +171,15 @@
2549 * Invalid mode handlers
2550 */
2551 .macro inv_entry, reason
2552+
2553+ pax_enter_kernel
2554+
2555 sub sp, sp, #S_FRAME_SIZE
2556 ARM( stmib sp, {r1 - lr} )
2557 THUMB( stmia sp, {r0 - r12} )
2558 THUMB( str sp, [sp, #S_SP] )
2559 THUMB( str lr, [sp, #S_LR] )
2560+
2561 mov r1, #\reason
2562 .endm
2563
2564@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
2565 .macro svc_entry, stack_hole=0, trace=1
2566 UNWIND(.fnstart )
2567 UNWIND(.save {r0 - pc} )
2568+
2569+ pax_enter_kernel
2570+
2571 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2572+
2573 #ifdef CONFIG_THUMB2_KERNEL
2574 SPFIX( str r0, [sp] ) @ temporarily saved
2575 SPFIX( mov r0, sp )
2576@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
2577 ldmia r0, {r3 - r5}
2578 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2579 mov r6, #-1 @ "" "" "" ""
2580+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2581+ @ offset sp by 8 as done in pax_enter_kernel
2582+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2583+#else
2584 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2585+#endif
2586 SPFIX( addeq r2, r2, #4 )
2587 str r3, [sp, #-4]! @ save the "real" r0 copied
2588 @ from the exception stack
2589@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
2590 .macro usr_entry, trace=1
2591 UNWIND(.fnstart )
2592 UNWIND(.cantunwind ) @ don't unwind the user space
2593+
2594+ pax_enter_kernel_user
2595+
2596 sub sp, sp, #S_FRAME_SIZE
2597 ARM( stmib sp, {r1 - r12} )
2598 THUMB( stmia sp, {r0 - r12} )
2599@@ -479,7 +576,9 @@ __und_usr:
2600 tst r3, #PSR_T_BIT @ Thumb mode?
2601 bne __und_usr_thumb
2602 sub r4, r2, #4 @ ARM instr at LR - 4
2603+ pax_open_userland
2604 1: ldrt r0, [r4]
2605+ pax_close_userland
2606 ARM_BE8(rev r0, r0) @ little endian instruction
2607
2608 @ r0 = 32-bit ARM instruction which caused the exception
2609@@ -513,11 +612,15 @@ __und_usr_thumb:
2610 */
2611 .arch armv6t2
2612 #endif
2613+ pax_open_userland
2614 2: ldrht r5, [r4]
2615+ pax_close_userland
2616 ARM_BE8(rev16 r5, r5) @ little endian instruction
2617 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2618 blo __und_usr_fault_16 @ 16bit undefined instruction
2619+ pax_open_userland
2620 3: ldrht r0, [r2]
2621+ pax_close_userland
2622 ARM_BE8(rev16 r0, r0) @ little endian instruction
2623 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2624 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2625@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
2626 */
2627 .pushsection .text.fixup, "ax"
2628 .align 2
2629-4: str r4, [sp, #S_PC] @ retry current instruction
2630+4: pax_close_userland
2631+ str r4, [sp, #S_PC] @ retry current instruction
2632 ret r9
2633 .popsection
2634 .pushsection __ex_table,"a"
2635@@ -767,7 +871,7 @@ ENTRY(__switch_to)
2636 THUMB( str lr, [ip], #4 )
2637 ldr r4, [r2, #TI_TP_VALUE]
2638 ldr r5, [r2, #TI_TP_VALUE + 4]
2639-#ifdef CONFIG_CPU_USE_DOMAINS
2640+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2641 ldr r6, [r2, #TI_CPU_DOMAIN]
2642 #endif
2643 switch_tls r1, r4, r5, r3, r7
2644@@ -776,7 +880,7 @@ ENTRY(__switch_to)
2645 ldr r8, =__stack_chk_guard
2646 ldr r7, [r7, #TSK_STACK_CANARY]
2647 #endif
2648-#ifdef CONFIG_CPU_USE_DOMAINS
2649+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2650 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2651 #endif
2652 mov r5, r0
2653diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2654index 4e7f40c..0f9ee2c 100644
2655--- a/arch/arm/kernel/entry-common.S
2656+++ b/arch/arm/kernel/entry-common.S
2657@@ -11,18 +11,46 @@
2658 #include <asm/assembler.h>
2659 #include <asm/unistd.h>
2660 #include <asm/ftrace.h>
2661+#include <asm/domain.h>
2662 #include <asm/unwind.h>
2663
2664+#include "entry-header.S"
2665+
2666 #ifdef CONFIG_NEED_RET_TO_USER
2667 #include <mach/entry-macro.S>
2668 #else
2669 .macro arch_ret_to_user, tmp1, tmp2
2670+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2671+ @ save regs
2672+ stmdb sp!, {r1, r2}
2673+ @ read DACR from cpu_domain into r1
2674+ mov r2, sp
2675+ @ assume 8K pages, since we have to split the immediate in two
2676+ bic r2, r2, #(0x1fc0)
2677+ bic r2, r2, #(0x3f)
2678+ ldr r1, [r2, #TI_CPU_DOMAIN]
2679+#ifdef CONFIG_PAX_KERNEXEC
2680+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2681+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2682+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2683+#endif
2684+#ifdef CONFIG_PAX_MEMORY_UDEREF
2685+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2686+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2687+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2688+#endif
2689+ @ write r1 to current_thread_info()->cpu_domain
2690+ str r1, [r2, #TI_CPU_DOMAIN]
2691+ @ write r1 to DACR
2692+ mcr p15, 0, r1, c3, c0, 0
2693+ @ instruction sync
2694+ instr_sync
2695+ @ restore regs
2696+ ldmia sp!, {r1, r2}
2697+#endif
2698 .endm
2699 #endif
2700
2701-#include "entry-header.S"
2702-
2703-
2704 .align 5
2705 /*
2706 * This is the fast syscall return path. We do as little as
2707@@ -173,6 +201,12 @@ ENTRY(vector_swi)
2708 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2709 #endif
2710
2711+ /*
2712+ * do this here to avoid a performance hit of wrapping the code above
2713+ * that directly dereferences userland to parse the SWI instruction
2714+ */
2715+ pax_enter_kernel_user
2716+
2717 adr tbl, sys_call_table @ load syscall table pointer
2718
2719 #if defined(CONFIG_OABI_COMPAT)
2720diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2721index 1a0045a..9b4f34d 100644
2722--- a/arch/arm/kernel/entry-header.S
2723+++ b/arch/arm/kernel/entry-header.S
2724@@ -196,6 +196,60 @@
2725 msr cpsr_c, \rtemp @ switch back to the SVC mode
2726 .endm
2727
2728+ .macro pax_enter_kernel_user
2729+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2730+ @ save regs
2731+ stmdb sp!, {r0, r1}
2732+ @ read DACR from cpu_domain into r1
2733+ mov r0, sp
2734+ @ assume 8K pages, since we have to split the immediate in two
2735+ bic r0, r0, #(0x1fc0)
2736+ bic r0, r0, #(0x3f)
2737+ ldr r1, [r0, #TI_CPU_DOMAIN]
2738+#ifdef CONFIG_PAX_MEMORY_UDEREF
2739+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2740+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2741+#endif
2742+#ifdef CONFIG_PAX_KERNEXEC
2743+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2744+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2745+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2746+#endif
2747+ @ write r1 to current_thread_info()->cpu_domain
2748+ str r1, [r0, #TI_CPU_DOMAIN]
2749+ @ write r1 to DACR
2750+ mcr p15, 0, r1, c3, c0, 0
2751+ @ instruction sync
2752+ instr_sync
2753+ @ restore regs
2754+ ldmia sp!, {r0, r1}
2755+#endif
2756+ .endm
2757+
2758+ .macro pax_exit_kernel
2759+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2760+ @ save regs
2761+ stmdb sp!, {r0, r1}
2762+ @ read old DACR from stack into r1
2763+ ldr r1, [sp, #(8 + S_SP)]
2764+ sub r1, r1, #8
2765+ ldr r1, [r1]
2766+
2767+ @ write r1 to current_thread_info()->cpu_domain
2768+ mov r0, sp
2769+ @ assume 8K pages, since we have to split the immediate in two
2770+ bic r0, r0, #(0x1fc0)
2771+ bic r0, r0, #(0x3f)
2772+ str r1, [r0, #TI_CPU_DOMAIN]
2773+ @ write r1 to DACR
2774+ mcr p15, 0, r1, c3, c0, 0
2775+ @ instruction sync
2776+ instr_sync
2777+ @ restore regs
2778+ ldmia sp!, {r0, r1}
2779+#endif
2780+ .endm
2781+
2782 #ifndef CONFIG_THUMB2_KERNEL
2783 .macro svc_exit, rpsr, irq = 0
2784 .if \irq != 0
2785@@ -215,6 +269,9 @@
2786 blne trace_hardirqs_off
2787 #endif
2788 .endif
2789+
2790+ pax_exit_kernel
2791+
2792 msr spsr_cxsf, \rpsr
2793 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2794 @ We must avoid clrex due to Cortex-A15 erratum #830321
2795@@ -291,6 +348,9 @@
2796 blne trace_hardirqs_off
2797 #endif
2798 .endif
2799+
2800+ pax_exit_kernel
2801+
2802 ldr lr, [sp, #S_SP] @ top of the stack
2803 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2804
2805diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2806index 059c3da..8e45cfc 100644
2807--- a/arch/arm/kernel/fiq.c
2808+++ b/arch/arm/kernel/fiq.c
2809@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2810 void *base = vectors_page;
2811 unsigned offset = FIQ_OFFSET;
2812
2813+ pax_open_kernel();
2814 memcpy(base + offset, start, length);
2815+ pax_close_kernel();
2816+
2817 if (!cache_is_vipt_nonaliasing())
2818 flush_icache_range((unsigned long)base + offset, offset +
2819 length);
2820diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2821index 3637973..cb29657 100644
2822--- a/arch/arm/kernel/head.S
2823+++ b/arch/arm/kernel/head.S
2824@@ -444,7 +444,7 @@ __enable_mmu:
2825 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2826 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2827 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2828- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2829+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2830 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2831 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2832 #endif
2833diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2834index af791f4..3ff9821 100644
2835--- a/arch/arm/kernel/module.c
2836+++ b/arch/arm/kernel/module.c
2837@@ -38,12 +38,39 @@
2838 #endif
2839
2840 #ifdef CONFIG_MMU
2841-void *module_alloc(unsigned long size)
2842+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2843 {
2844+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2845+ return NULL;
2846 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2847- GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
2848+ GFP_KERNEL, prot, 0, NUMA_NO_NODE,
2849 __builtin_return_address(0));
2850 }
2851+
2852+void *module_alloc(unsigned long size)
2853+{
2854+
2855+#ifdef CONFIG_PAX_KERNEXEC
2856+ return __module_alloc(size, PAGE_KERNEL);
2857+#else
2858+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2859+#endif
2860+
2861+}
2862+
2863+#ifdef CONFIG_PAX_KERNEXEC
2864+void module_memfree_exec(void *module_region)
2865+{
2866+ module_memfree(module_region);
2867+}
2868+EXPORT_SYMBOL(module_memfree_exec);
2869+
2870+void *module_alloc_exec(unsigned long size)
2871+{
2872+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2873+}
2874+EXPORT_SYMBOL(module_alloc_exec);
2875+#endif
2876 #endif
2877
2878 int
2879diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2880index 69bda1a..755113a 100644
2881--- a/arch/arm/kernel/patch.c
2882+++ b/arch/arm/kernel/patch.c
2883@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2884 else
2885 __acquire(&patch_lock);
2886
2887+ pax_open_kernel();
2888 if (thumb2 && __opcode_is_thumb16(insn)) {
2889 *(u16 *)waddr = __opcode_to_mem_thumb16(insn);
2890 size = sizeof(u16);
2891@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2892 *(u32 *)waddr = insn;
2893 size = sizeof(u32);
2894 }
2895+ pax_close_kernel();
2896
2897 if (waddr != addr) {
2898 flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
2899diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2900index f192a2a..1a40523 100644
2901--- a/arch/arm/kernel/process.c
2902+++ b/arch/arm/kernel/process.c
2903@@ -105,8 +105,8 @@ void __show_regs(struct pt_regs *regs)
2904
2905 show_regs_print_info(KERN_DEFAULT);
2906
2907- print_symbol("PC is at %s\n", instruction_pointer(regs));
2908- print_symbol("LR is at %s\n", regs->ARM_lr);
2909+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2910+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2911 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2912 "sp : %08lx ip : %08lx fp : %08lx\n",
2913 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2914@@ -283,12 +283,6 @@ unsigned long get_wchan(struct task_struct *p)
2915 return 0;
2916 }
2917
2918-unsigned long arch_randomize_brk(struct mm_struct *mm)
2919-{
2920- unsigned long range_end = mm->brk + 0x02000000;
2921- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2922-}
2923-
2924 #ifdef CONFIG_MMU
2925 #ifdef CONFIG_KUSER_HELPERS
2926 /*
2927@@ -304,7 +298,7 @@ static struct vm_area_struct gate_vma = {
2928
2929 static int __init gate_vma_init(void)
2930 {
2931- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2932+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2933 return 0;
2934 }
2935 arch_initcall(gate_vma_init);
2936@@ -333,91 +327,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2937 return is_gate_vma(vma) ? "[vectors]" : NULL;
2938 }
2939
2940-/* If possible, provide a placement hint at a random offset from the
2941- * stack for the sigpage and vdso pages.
2942- */
2943-static unsigned long sigpage_addr(const struct mm_struct *mm,
2944- unsigned int npages)
2945-{
2946- unsigned long offset;
2947- unsigned long first;
2948- unsigned long last;
2949- unsigned long addr;
2950- unsigned int slots;
2951-
2952- first = PAGE_ALIGN(mm->start_stack);
2953-
2954- last = TASK_SIZE - (npages << PAGE_SHIFT);
2955-
2956- /* No room after stack? */
2957- if (first > last)
2958- return 0;
2959-
2960- /* Just enough room? */
2961- if (first == last)
2962- return first;
2963-
2964- slots = ((last - first) >> PAGE_SHIFT) + 1;
2965-
2966- offset = get_random_int() % slots;
2967-
2968- addr = first + (offset << PAGE_SHIFT);
2969-
2970- return addr;
2971-}
2972-
2973-static struct page *signal_page;
2974-extern struct page *get_signal_page(void);
2975-
2976-static const struct vm_special_mapping sigpage_mapping = {
2977- .name = "[sigpage]",
2978- .pages = &signal_page,
2979-};
2980-
2981 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2982 {
2983 struct mm_struct *mm = current->mm;
2984- struct vm_area_struct *vma;
2985- unsigned long npages;
2986- unsigned long addr;
2987- unsigned long hint;
2988- int ret = 0;
2989-
2990- if (!signal_page)
2991- signal_page = get_signal_page();
2992- if (!signal_page)
2993- return -ENOMEM;
2994-
2995- npages = 1; /* for sigpage */
2996- npages += vdso_total_pages;
2997
2998 down_write(&mm->mmap_sem);
2999- hint = sigpage_addr(mm, npages);
3000- addr = get_unmapped_area(NULL, hint, npages << PAGE_SHIFT, 0, 0);
3001- if (IS_ERR_VALUE(addr)) {
3002- ret = addr;
3003- goto up_fail;
3004- }
3005-
3006- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
3007- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
3008- &sigpage_mapping);
3009-
3010- if (IS_ERR(vma)) {
3011- ret = PTR_ERR(vma);
3012- goto up_fail;
3013- }
3014-
3015- mm->context.sigpage = addr;
3016-
3017- /* Unlike the sigpage, failure to install the vdso is unlikely
3018- * to be fatal to the process, so no error check needed
3019- * here.
3020- */
3021- arm_install_vdso(mm, addr + PAGE_SIZE);
3022-
3023- up_fail:
3024+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
3025 up_write(&mm->mmap_sem);
3026- return ret;
3027+ return 0;
3028 }
3029 #endif
3030diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
3031index f90fdf4..24e8c84 100644
3032--- a/arch/arm/kernel/psci.c
3033+++ b/arch/arm/kernel/psci.c
3034@@ -26,7 +26,7 @@
3035 #include <asm/psci.h>
3036 #include <asm/system_misc.h>
3037
3038-struct psci_operations psci_ops;
3039+struct psci_operations psci_ops __read_only;
3040
3041 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3042 typedef int (*psci_initcall_t)(const struct device_node *);
3043diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3044index ef9119f..31995a3 100644
3045--- a/arch/arm/kernel/ptrace.c
3046+++ b/arch/arm/kernel/ptrace.c
3047@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3048 regs->ARM_ip = ip;
3049 }
3050
3051+#ifdef CONFIG_GRKERNSEC_SETXID
3052+extern void gr_delayed_cred_worker(void);
3053+#endif
3054+
3055 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3056 {
3057 current_thread_info()->syscall = scno;
3058
3059+#ifdef CONFIG_GRKERNSEC_SETXID
3060+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3061+ gr_delayed_cred_worker();
3062+#endif
3063+
3064 /* Do the secure computing check first; failures should be fast. */
3065 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3066 if (secure_computing() == -1)
3067diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
3068index 1a4d232..2677169 100644
3069--- a/arch/arm/kernel/reboot.c
3070+++ b/arch/arm/kernel/reboot.c
3071@@ -122,6 +122,7 @@ void machine_power_off(void)
3072
3073 if (pm_power_off)
3074 pm_power_off();
3075+ while (1);
3076 }
3077
3078 /*
3079diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3080index 6c777e9..3d2d0ca 100644
3081--- a/arch/arm/kernel/setup.c
3082+++ b/arch/arm/kernel/setup.c
3083@@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
3084 unsigned int elf_hwcap2 __read_mostly;
3085 EXPORT_SYMBOL(elf_hwcap2);
3086
3087+pteval_t __supported_pte_mask __read_only;
3088+pmdval_t __supported_pmd_mask __read_only;
3089
3090 #ifdef MULTI_CPU
3091-struct processor processor __read_mostly;
3092+struct processor processor __read_only;
3093 #endif
3094 #ifdef MULTI_TLB
3095-struct cpu_tlb_fns cpu_tlb __read_mostly;
3096+struct cpu_tlb_fns cpu_tlb __read_only;
3097 #endif
3098 #ifdef MULTI_USER
3099-struct cpu_user_fns cpu_user __read_mostly;
3100+struct cpu_user_fns cpu_user __read_only;
3101 #endif
3102 #ifdef MULTI_CACHE
3103-struct cpu_cache_fns cpu_cache __read_mostly;
3104+struct cpu_cache_fns cpu_cache __read_only;
3105 #endif
3106 #ifdef CONFIG_OUTER_CACHE
3107-struct outer_cache_fns outer_cache __read_mostly;
3108+struct outer_cache_fns outer_cache __read_only;
3109 EXPORT_SYMBOL(outer_cache);
3110 #endif
3111
3112@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3113 * Register 0 and check for VMSAv7 or PMSAv7 */
3114 unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
3115 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3116- (mmfr0 & 0x000000f0) >= 0x00000030)
3117+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3118 cpu_arch = CPU_ARCH_ARMv7;
3119- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3120+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3121+ __supported_pte_mask |= L_PTE_PXN;
3122+ __supported_pmd_mask |= PMD_PXNTABLE;
3123+ }
3124+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3125 (mmfr0 & 0x000000f0) == 0x00000020)
3126 cpu_arch = CPU_ARCH_ARMv6;
3127 else
3128diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3129index 423663e..bfeb0ff 100644
3130--- a/arch/arm/kernel/signal.c
3131+++ b/arch/arm/kernel/signal.c
3132@@ -24,8 +24,6 @@
3133
3134 extern const unsigned long sigreturn_codes[7];
3135
3136-static unsigned long signal_return_offset;
3137-
3138 #ifdef CONFIG_CRUNCH
3139 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3140 {
3141@@ -385,8 +383,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3142 * except when the MPU has protected the vectors
3143 * page from PL0
3144 */
3145- retcode = mm->context.sigpage + signal_return_offset +
3146- (idx << 2) + thumb;
3147+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3148 } else
3149 #endif
3150 {
3151@@ -592,33 +589,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3152 } while (thread_flags & _TIF_WORK_MASK);
3153 return 0;
3154 }
3155-
3156-struct page *get_signal_page(void)
3157-{
3158- unsigned long ptr;
3159- unsigned offset;
3160- struct page *page;
3161- void *addr;
3162-
3163- page = alloc_pages(GFP_KERNEL, 0);
3164-
3165- if (!page)
3166- return NULL;
3167-
3168- addr = page_address(page);
3169-
3170- /* Give the signal return code some randomness */
3171- offset = 0x200 + (get_random_int() & 0x7fc);
3172- signal_return_offset = offset;
3173-
3174- /*
3175- * Copy signal return handlers into the vector page, and
3176- * set sigreturn to be a pointer to these.
3177- */
3178- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3179-
3180- ptr = (unsigned long)addr + offset;
3181- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3182-
3183- return page;
3184-}
3185diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3186index f11d825..bbe686f 100644
3187--- a/arch/arm/kernel/smp.c
3188+++ b/arch/arm/kernel/smp.c
3189@@ -76,7 +76,7 @@ enum ipi_msg_type {
3190
3191 static DECLARE_COMPLETION(cpu_running);
3192
3193-static struct smp_operations smp_ops;
3194+static struct smp_operations smp_ops __read_only;
3195
3196 void __init smp_set_ops(struct smp_operations *ops)
3197 {
3198diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3199index 7a3be1d..b00c7de 100644
3200--- a/arch/arm/kernel/tcm.c
3201+++ b/arch/arm/kernel/tcm.c
3202@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3203 .virtual = ITCM_OFFSET,
3204 .pfn = __phys_to_pfn(ITCM_OFFSET),
3205 .length = 0,
3206- .type = MT_MEMORY_RWX_ITCM,
3207+ .type = MT_MEMORY_RX_ITCM,
3208 }
3209 };
3210
3211@@ -267,7 +267,9 @@ no_dtcm:
3212 start = &__sitcm_text;
3213 end = &__eitcm_text;
3214 ram = &__itcm_start;
3215+ pax_open_kernel();
3216 memcpy(start, ram, itcm_code_sz);
3217+ pax_close_kernel();
3218 pr_debug("CPU ITCM: copied code from %p - %p\n",
3219 start, end);
3220 itcm_present = true;
3221diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3222index 3dce1a3..60e857f 100644
3223--- a/arch/arm/kernel/traps.c
3224+++ b/arch/arm/kernel/traps.c
3225@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3226 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3227 {
3228 #ifdef CONFIG_KALLSYMS
3229- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3230+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3231 #else
3232 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3233 #endif
3234@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3235 static int die_owner = -1;
3236 static unsigned int die_nest_count;
3237
3238+extern void gr_handle_kernel_exploit(void);
3239+
3240 static unsigned long oops_begin(void)
3241 {
3242 int cpu;
3243@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3244 panic("Fatal exception in interrupt");
3245 if (panic_on_oops)
3246 panic("Fatal exception");
3247+
3248+ gr_handle_kernel_exploit();
3249+
3250 if (signr)
3251 do_exit(signr);
3252 }
3253@@ -878,7 +883,11 @@ void __init early_trap_init(void *vectors_base)
3254 kuser_init(vectors_base);
3255
3256 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3257- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3258+
3259+#ifndef CONFIG_PAX_MEMORY_UDEREF
3260+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3261+#endif
3262+
3263 #else /* ifndef CONFIG_CPU_V7M */
3264 /*
3265 * on V7-M there is no need to copy the vector table to a dedicated
3266diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3267index 8b60fde..8d986dd 100644
3268--- a/arch/arm/kernel/vmlinux.lds.S
3269+++ b/arch/arm/kernel/vmlinux.lds.S
3270@@ -37,7 +37,7 @@
3271 #endif
3272
3273 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3274- defined(CONFIG_GENERIC_BUG)
3275+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3276 #define ARM_EXIT_KEEP(x) x
3277 #define ARM_EXIT_DISCARD(x)
3278 #else
3279@@ -120,6 +120,8 @@ SECTIONS
3280 #ifdef CONFIG_DEBUG_RODATA
3281 . = ALIGN(1<<SECTION_SHIFT);
3282 #endif
3283+ _etext = .; /* End of text section */
3284+
3285 RO_DATA(PAGE_SIZE)
3286
3287 . = ALIGN(4);
3288@@ -150,8 +152,6 @@ SECTIONS
3289
3290 NOTES
3291
3292- _etext = .; /* End of text and rodata section */
3293-
3294 #ifndef CONFIG_XIP_KERNEL
3295 # ifdef CONFIG_ARM_KERNMEM_PERMS
3296 . = ALIGN(1<<SECTION_SHIFT);
3297diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3298index d9631ec..b0c966c 100644
3299--- a/arch/arm/kvm/arm.c
3300+++ b/arch/arm/kvm/arm.c
3301@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3302 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3303
3304 /* The VMID used in the VTTBR */
3305-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3306+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3307 static u8 kvm_next_vmid;
3308 static DEFINE_SPINLOCK(kvm_vmid_lock);
3309
3310@@ -373,7 +373,7 @@ void force_vm_exit(const cpumask_t *mask)
3311 */
3312 static bool need_new_vmid_gen(struct kvm *kvm)
3313 {
3314- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3315+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3316 }
3317
3318 /**
3319@@ -406,7 +406,7 @@ static void update_vttbr(struct kvm *kvm)
3320
3321 /* First user of a new VMID generation? */
3322 if (unlikely(kvm_next_vmid == 0)) {
3323- atomic64_inc(&kvm_vmid_gen);
3324+ atomic64_inc_unchecked(&kvm_vmid_gen);
3325 kvm_next_vmid = 1;
3326
3327 /*
3328@@ -423,7 +423,7 @@ static void update_vttbr(struct kvm *kvm)
3329 kvm_call_hyp(__kvm_flush_vm_context);
3330 }
3331
3332- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3333+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3334 kvm->arch.vmid = kvm_next_vmid;
3335 kvm_next_vmid++;
3336
3337@@ -1098,7 +1098,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
3338 /**
3339 * Initialize Hyp-mode and memory mappings on all CPUs.
3340 */
3341-int kvm_arch_init(void *opaque)
3342+int kvm_arch_init(const void *opaque)
3343 {
3344 int err;
3345 int ret, cpu;
3346diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3347index 1710fd7..ec3e014 100644
3348--- a/arch/arm/lib/clear_user.S
3349+++ b/arch/arm/lib/clear_user.S
3350@@ -12,14 +12,14 @@
3351
3352 .text
3353
3354-/* Prototype: int __clear_user(void *addr, size_t sz)
3355+/* Prototype: int ___clear_user(void *addr, size_t sz)
3356 * Purpose : clear some user memory
3357 * Params : addr - user memory address to clear
3358 * : sz - number of bytes to clear
3359 * Returns : number of bytes NOT cleared
3360 */
3361 ENTRY(__clear_user_std)
3362-WEAK(__clear_user)
3363+WEAK(___clear_user)
3364 stmfd sp!, {r1, lr}
3365 mov r2, #0
3366 cmp r1, #4
3367@@ -44,7 +44,7 @@ WEAK(__clear_user)
3368 USER( strnebt r2, [r0])
3369 mov r0, #0
3370 ldmfd sp!, {r1, pc}
3371-ENDPROC(__clear_user)
3372+ENDPROC(___clear_user)
3373 ENDPROC(__clear_user_std)
3374
3375 .pushsection .text.fixup,"ax"
3376diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3377index 7a235b9..73a0556 100644
3378--- a/arch/arm/lib/copy_from_user.S
3379+++ b/arch/arm/lib/copy_from_user.S
3380@@ -17,7 +17,7 @@
3381 /*
3382 * Prototype:
3383 *
3384- * size_t __copy_from_user(void *to, const void *from, size_t n)
3385+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3386 *
3387 * Purpose:
3388 *
3389@@ -89,11 +89,11 @@
3390
3391 .text
3392
3393-ENTRY(__copy_from_user)
3394+ENTRY(___copy_from_user)
3395
3396 #include "copy_template.S"
3397
3398-ENDPROC(__copy_from_user)
3399+ENDPROC(___copy_from_user)
3400
3401 .pushsection .fixup,"ax"
3402 .align 0
3403diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3404index 6ee2f67..d1cce76 100644
3405--- a/arch/arm/lib/copy_page.S
3406+++ b/arch/arm/lib/copy_page.S
3407@@ -10,6 +10,7 @@
3408 * ASM optimised string functions
3409 */
3410 #include <linux/linkage.h>
3411+#include <linux/const.h>
3412 #include <asm/assembler.h>
3413 #include <asm/asm-offsets.h>
3414 #include <asm/cache.h>
3415diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3416index 9648b06..19c333c 100644
3417--- a/arch/arm/lib/copy_to_user.S
3418+++ b/arch/arm/lib/copy_to_user.S
3419@@ -17,7 +17,7 @@
3420 /*
3421 * Prototype:
3422 *
3423- * size_t __copy_to_user(void *to, const void *from, size_t n)
3424+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3425 *
3426 * Purpose:
3427 *
3428@@ -93,11 +93,11 @@
3429 .text
3430
3431 ENTRY(__copy_to_user_std)
3432-WEAK(__copy_to_user)
3433+WEAK(___copy_to_user)
3434
3435 #include "copy_template.S"
3436
3437-ENDPROC(__copy_to_user)
3438+ENDPROC(___copy_to_user)
3439 ENDPROC(__copy_to_user_std)
3440
3441 .pushsection .text.fixup,"ax"
3442diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3443index 1d0957e..f708846 100644
3444--- a/arch/arm/lib/csumpartialcopyuser.S
3445+++ b/arch/arm/lib/csumpartialcopyuser.S
3446@@ -57,8 +57,8 @@
3447 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3448 */
3449
3450-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3451-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3452+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3453+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3454
3455 #include "csumpartialcopygeneric.S"
3456
3457diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3458index 8044591..c9b2609 100644
3459--- a/arch/arm/lib/delay.c
3460+++ b/arch/arm/lib/delay.c
3461@@ -29,7 +29,7 @@
3462 /*
3463 * Default to the loop-based delay implementation.
3464 */
3465-struct arm_delay_ops arm_delay_ops = {
3466+struct arm_delay_ops arm_delay_ops __read_only = {
3467 .delay = __loop_delay,
3468 .const_udelay = __loop_const_udelay,
3469 .udelay = __loop_udelay,
3470diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3471index 3e58d71..029817c 100644
3472--- a/arch/arm/lib/uaccess_with_memcpy.c
3473+++ b/arch/arm/lib/uaccess_with_memcpy.c
3474@@ -136,7 +136,7 @@ out:
3475 }
3476
3477 unsigned long
3478-__copy_to_user(void __user *to, const void *from, unsigned long n)
3479+___copy_to_user(void __user *to, const void *from, unsigned long n)
3480 {
3481 /*
3482 * This test is stubbed out of the main function above to keep
3483@@ -190,7 +190,7 @@ out:
3484 return n;
3485 }
3486
3487-unsigned long __clear_user(void __user *addr, unsigned long n)
3488+unsigned long ___clear_user(void __user *addr, unsigned long n)
3489 {
3490 /* See rational for this in __copy_to_user() above. */
3491 if (n < 64)
3492diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3493index 7d23ce0..5ef383a 100644
3494--- a/arch/arm/mach-exynos/suspend.c
3495+++ b/arch/arm/mach-exynos/suspend.c
3496@@ -738,8 +738,10 @@ void __init exynos_pm_init(void)
3497 tmp |= pm_data->wake_disable_mask;
3498 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3499
3500- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3501- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3502+ pax_open_kernel();
3503+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3504+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3505+ pax_close_kernel();
3506
3507 register_syscore_ops(&exynos_pm_syscore_ops);
3508 suspend_set_ops(&exynos_suspend_ops);
3509diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3510index 0662087..004d163 100644
3511--- a/arch/arm/mach-keystone/keystone.c
3512+++ b/arch/arm/mach-keystone/keystone.c
3513@@ -27,7 +27,7 @@
3514
3515 #include "keystone.h"
3516
3517-static struct notifier_block platform_nb;
3518+static notifier_block_no_const platform_nb;
3519 static unsigned long keystone_dma_pfn_offset __read_mostly;
3520
3521 static int keystone_platform_notifier(struct notifier_block *nb,
3522diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3523index e46e9ea..9141c83 100644
3524--- a/arch/arm/mach-mvebu/coherency.c
3525+++ b/arch/arm/mach-mvebu/coherency.c
3526@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3527
3528 /*
3529 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3530- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3531+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3532 * is needed as a workaround for a deadlock issue between the PCIe
3533 * interface and the cache controller.
3534 */
3535@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3536 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3537
3538 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3539- mtype = MT_UNCACHED;
3540+ mtype = MT_UNCACHED_RW;
3541
3542 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3543 }
3544diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3545index b6443a4..20a0b74 100644
3546--- a/arch/arm/mach-omap2/board-n8x0.c
3547+++ b/arch/arm/mach-omap2/board-n8x0.c
3548@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3549 }
3550 #endif
3551
3552-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3553+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3554 .late_init = n8x0_menelaus_late_init,
3555 };
3556
3557diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3558index 79f49d9..70bf184 100644
3559--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3560+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3561@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3562 void (*resume)(void);
3563 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3564 void (*hotplug_restart)(void);
3565-};
3566+} __no_const;
3567
3568 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3569 static struct powerdomain *mpuss_pd;
3570@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3571 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3572 {}
3573
3574-struct cpu_pm_ops omap_pm_ops = {
3575+static struct cpu_pm_ops omap_pm_ops __read_only = {
3576 .finish_suspend = default_finish_suspend,
3577 .resume = dummy_cpu_resume,
3578 .scu_prepare = dummy_scu_prepare,
3579diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3580index 5305ec7..6d74045 100644
3581--- a/arch/arm/mach-omap2/omap-smp.c
3582+++ b/arch/arm/mach-omap2/omap-smp.c
3583@@ -19,6 +19,7 @@
3584 #include <linux/device.h>
3585 #include <linux/smp.h>
3586 #include <linux/io.h>
3587+#include <linux/irq.h>
3588 #include <linux/irqchip/arm-gic.h>
3589
3590 #include <asm/smp_scu.h>
3591diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3592index 3b56722..33ac281 100644
3593--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3594+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3595@@ -330,7 +330,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3596 return NOTIFY_OK;
3597 }
3598
3599-static struct notifier_block __refdata irq_hotplug_notifier = {
3600+static struct notifier_block irq_hotplug_notifier = {
3601 .notifier_call = irq_cpu_hotplug_notify,
3602 };
3603
3604diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3605index 166b18f..f985f04 100644
3606--- a/arch/arm/mach-omap2/omap_device.c
3607+++ b/arch/arm/mach-omap2/omap_device.c
3608@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3609 struct platform_device __init *omap_device_build(const char *pdev_name,
3610 int pdev_id,
3611 struct omap_hwmod *oh,
3612- void *pdata, int pdata_len)
3613+ const void *pdata, int pdata_len)
3614 {
3615 struct omap_hwmod *ohs[] = { oh };
3616
3617@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3618 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3619 int pdev_id,
3620 struct omap_hwmod **ohs,
3621- int oh_cnt, void *pdata,
3622+ int oh_cnt, const void *pdata,
3623 int pdata_len)
3624 {
3625 int ret = -ENOMEM;
3626diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3627index 78c02b3..c94109a 100644
3628--- a/arch/arm/mach-omap2/omap_device.h
3629+++ b/arch/arm/mach-omap2/omap_device.h
3630@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3631 /* Core code interface */
3632
3633 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3634- struct omap_hwmod *oh, void *pdata,
3635+ struct omap_hwmod *oh, const void *pdata,
3636 int pdata_len);
3637
3638 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3639 struct omap_hwmod **oh, int oh_cnt,
3640- void *pdata, int pdata_len);
3641+ const void *pdata, int pdata_len);
3642
3643 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3644 struct omap_hwmod **ohs, int oh_cnt);
3645diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3646index 5286e77..fdd234c 100644
3647--- a/arch/arm/mach-omap2/omap_hwmod.c
3648+++ b/arch/arm/mach-omap2/omap_hwmod.c
3649@@ -199,10 +199,10 @@ struct omap_hwmod_soc_ops {
3650 int (*init_clkdm)(struct omap_hwmod *oh);
3651 void (*update_context_lost)(struct omap_hwmod *oh);
3652 int (*get_context_lost)(struct omap_hwmod *oh);
3653-};
3654+} __no_const;
3655
3656 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3657-static struct omap_hwmod_soc_ops soc_ops;
3658+static struct omap_hwmod_soc_ops soc_ops __read_only;
3659
3660 /* omap_hwmod_list contains all registered struct omap_hwmods */
3661 static LIST_HEAD(omap_hwmod_list);
3662diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3663index 95fee54..cfa9cf1 100644
3664--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3665+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3666@@ -10,6 +10,7 @@
3667
3668 #include <linux/kernel.h>
3669 #include <linux/init.h>
3670+#include <asm/pgtable.h>
3671
3672 #include "powerdomain.h"
3673
3674@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3675
3676 void __init am43xx_powerdomains_init(void)
3677 {
3678- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3679+ pax_open_kernel();
3680+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3681+ pax_close_kernel();
3682 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3683 pwrdm_register_pwrdms(powerdomains_am43xx);
3684 pwrdm_complete_init();
3685diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3686index ff0a68c..b312aa0 100644
3687--- a/arch/arm/mach-omap2/wd_timer.c
3688+++ b/arch/arm/mach-omap2/wd_timer.c
3689@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3690 struct omap_hwmod *oh;
3691 char *oh_name = "wd_timer2";
3692 char *dev_name = "omap_wdt";
3693- struct omap_wd_timer_platform_data pdata;
3694+ static struct omap_wd_timer_platform_data pdata = {
3695+ .read_reset_sources = prm_read_reset_sources
3696+ };
3697
3698 if (!cpu_class_is_omap2() || of_have_populated_dt())
3699 return 0;
3700@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3701 return -EINVAL;
3702 }
3703
3704- pdata.read_reset_sources = prm_read_reset_sources;
3705-
3706 pdev = omap_device_build(dev_name, id, oh, &pdata,
3707 sizeof(struct omap_wd_timer_platform_data));
3708 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3709diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3710index 7469347..1ecc350 100644
3711--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3712+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3713@@ -177,7 +177,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3714 bool entered_lp2 = false;
3715
3716 if (tegra_pending_sgi())
3717- ACCESS_ONCE(abort_flag) = true;
3718+ ACCESS_ONCE_RW(abort_flag) = true;
3719
3720 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3721
3722diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3723index 3b9098d..15b390f 100644
3724--- a/arch/arm/mach-tegra/irq.c
3725+++ b/arch/arm/mach-tegra/irq.c
3726@@ -20,6 +20,7 @@
3727 #include <linux/cpu_pm.h>
3728 #include <linux/interrupt.h>
3729 #include <linux/io.h>
3730+#include <linux/irq.h>
3731 #include <linux/irqchip/arm-gic.h>
3732 #include <linux/irq.h>
3733 #include <linux/kernel.h>
3734diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3735index 2cb587b..6ddfebf 100644
3736--- a/arch/arm/mach-ux500/pm.c
3737+++ b/arch/arm/mach-ux500/pm.c
3738@@ -10,6 +10,7 @@
3739 */
3740
3741 #include <linux/kernel.h>
3742+#include <linux/irq.h>
3743 #include <linux/irqchip/arm-gic.h>
3744 #include <linux/delay.h>
3745 #include <linux/io.h>
3746diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3747index 2dea8b5..6499da2 100644
3748--- a/arch/arm/mach-ux500/setup.h
3749+++ b/arch/arm/mach-ux500/setup.h
3750@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3751 .type = MT_DEVICE, \
3752 }
3753
3754-#define __MEM_DEV_DESC(x, sz) { \
3755- .virtual = IO_ADDRESS(x), \
3756- .pfn = __phys_to_pfn(x), \
3757- .length = sz, \
3758- .type = MT_MEMORY_RWX, \
3759-}
3760-
3761 extern struct smp_operations ux500_smp_ops;
3762 extern void ux500_cpu_die(unsigned int cpu);
3763
3764diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3765index 52d768f..5f93180 100644
3766--- a/arch/arm/mach-zynq/platsmp.c
3767+++ b/arch/arm/mach-zynq/platsmp.c
3768@@ -24,6 +24,7 @@
3769 #include <linux/io.h>
3770 #include <asm/cacheflush.h>
3771 #include <asm/smp_scu.h>
3772+#include <linux/irq.h>
3773 #include <linux/irqchip/arm-gic.h>
3774 #include "common.h"
3775
3776diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3777index b4f92b9..ffefea9 100644
3778--- a/arch/arm/mm/Kconfig
3779+++ b/arch/arm/mm/Kconfig
3780@@ -446,6 +446,7 @@ config CPU_32v5
3781
3782 config CPU_32v6
3783 bool
3784+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3785 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3786
3787 config CPU_32v6K
3788@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3789
3790 config CPU_USE_DOMAINS
3791 bool
3792+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3793 help
3794 This option enables or disables the use of domain switching
3795 via the set_fs() function.
3796@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3797
3798 config KUSER_HELPERS
3799 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3800- depends on MMU
3801+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3802 default y
3803 help
3804 Warning: disabling this option may break user programs.
3805@@ -812,7 +814,7 @@ config KUSER_HELPERS
3806 See Documentation/arm/kernel_user_helpers.txt for details.
3807
3808 However, the fixed address nature of these helpers can be used
3809- by ROP (return orientated programming) authors when creating
3810+ by ROP (Return Oriented Programming) authors when creating
3811 exploits.
3812
3813 If all of the binaries and libraries which run on your platform
3814diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3815index 9769f1e..16aaa55 100644
3816--- a/arch/arm/mm/alignment.c
3817+++ b/arch/arm/mm/alignment.c
3818@@ -216,10 +216,12 @@ union offset_union {
3819 #define __get16_unaligned_check(ins,val,addr) \
3820 do { \
3821 unsigned int err = 0, v, a = addr; \
3822+ pax_open_userland(); \
3823 __get8_unaligned_check(ins,v,a,err); \
3824 val = v << ((BE) ? 8 : 0); \
3825 __get8_unaligned_check(ins,v,a,err); \
3826 val |= v << ((BE) ? 0 : 8); \
3827+ pax_close_userland(); \
3828 if (err) \
3829 goto fault; \
3830 } while (0)
3831@@ -233,6 +235,7 @@ union offset_union {
3832 #define __get32_unaligned_check(ins,val,addr) \
3833 do { \
3834 unsigned int err = 0, v, a = addr; \
3835+ pax_open_userland(); \
3836 __get8_unaligned_check(ins,v,a,err); \
3837 val = v << ((BE) ? 24 : 0); \
3838 __get8_unaligned_check(ins,v,a,err); \
3839@@ -241,6 +244,7 @@ union offset_union {
3840 val |= v << ((BE) ? 8 : 16); \
3841 __get8_unaligned_check(ins,v,a,err); \
3842 val |= v << ((BE) ? 0 : 24); \
3843+ pax_close_userland(); \
3844 if (err) \
3845 goto fault; \
3846 } while (0)
3847@@ -254,6 +258,7 @@ union offset_union {
3848 #define __put16_unaligned_check(ins,val,addr) \
3849 do { \
3850 unsigned int err = 0, v = val, a = addr; \
3851+ pax_open_userland(); \
3852 __asm__( FIRST_BYTE_16 \
3853 ARM( "1: "ins" %1, [%2], #1\n" ) \
3854 THUMB( "1: "ins" %1, [%2]\n" ) \
3855@@ -273,6 +278,7 @@ union offset_union {
3856 " .popsection\n" \
3857 : "=r" (err), "=&r" (v), "=&r" (a) \
3858 : "0" (err), "1" (v), "2" (a)); \
3859+ pax_close_userland(); \
3860 if (err) \
3861 goto fault; \
3862 } while (0)
3863@@ -286,6 +292,7 @@ union offset_union {
3864 #define __put32_unaligned_check(ins,val,addr) \
3865 do { \
3866 unsigned int err = 0, v = val, a = addr; \
3867+ pax_open_userland(); \
3868 __asm__( FIRST_BYTE_32 \
3869 ARM( "1: "ins" %1, [%2], #1\n" ) \
3870 THUMB( "1: "ins" %1, [%2]\n" ) \
3871@@ -315,6 +322,7 @@ union offset_union {
3872 " .popsection\n" \
3873 : "=r" (err), "=&r" (v), "=&r" (a) \
3874 : "0" (err), "1" (v), "2" (a)); \
3875+ pax_close_userland(); \
3876 if (err) \
3877 goto fault; \
3878 } while (0)
3879diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3880index e309c8f..f8965e8 100644
3881--- a/arch/arm/mm/cache-l2x0.c
3882+++ b/arch/arm/mm/cache-l2x0.c
3883@@ -43,7 +43,7 @@ struct l2c_init_data {
3884 void (*save)(void __iomem *);
3885 void (*configure)(void __iomem *);
3886 struct outer_cache_fns outer_cache;
3887-};
3888+} __do_const;
3889
3890 #define CACHE_LINE_SIZE 32
3891
3892diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3893index 845769e..4278fd7 100644
3894--- a/arch/arm/mm/context.c
3895+++ b/arch/arm/mm/context.c
3896@@ -43,7 +43,7 @@
3897 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3898
3899 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3900-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3901+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3902 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3903
3904 static DEFINE_PER_CPU(atomic64_t, active_asids);
3905@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3906 {
3907 static u32 cur_idx = 1;
3908 u64 asid = atomic64_read(&mm->context.id);
3909- u64 generation = atomic64_read(&asid_generation);
3910+ u64 generation = atomic64_read_unchecked(&asid_generation);
3911
3912 if (asid != 0) {
3913 /*
3914@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3915 */
3916 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3917 if (asid == NUM_USER_ASIDS) {
3918- generation = atomic64_add_return(ASID_FIRST_VERSION,
3919+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3920 &asid_generation);
3921 flush_context(cpu);
3922 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3923@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3924 cpu_set_reserved_ttbr0();
3925
3926 asid = atomic64_read(&mm->context.id);
3927- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3928+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3929 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3930 goto switch_mm_fastpath;
3931
3932 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3933 /* Check that our ASID belongs to the current generation. */
3934 asid = atomic64_read(&mm->context.id);
3935- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3936+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3937 asid = new_context(mm, cpu);
3938 atomic64_set(&mm->context.id, asid);
3939 }
3940diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3941index 6333d9c..3bb19f2 100644
3942--- a/arch/arm/mm/fault.c
3943+++ b/arch/arm/mm/fault.c
3944@@ -25,6 +25,7 @@
3945 #include <asm/system_misc.h>
3946 #include <asm/system_info.h>
3947 #include <asm/tlbflush.h>
3948+#include <asm/sections.h>
3949
3950 #include "fault.h"
3951
3952@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3953 if (fixup_exception(regs))
3954 return;
3955
3956+#ifdef CONFIG_PAX_MEMORY_UDEREF
3957+ if (addr < TASK_SIZE) {
3958+ if (current->signal->curr_ip)
3959+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3960+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3961+ else
3962+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3963+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3964+ }
3965+#endif
3966+
3967+#ifdef CONFIG_PAX_KERNEXEC
3968+ if ((fsr & FSR_WRITE) &&
3969+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3970+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3971+ {
3972+ if (current->signal->curr_ip)
3973+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3974+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3975+ else
3976+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3977+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3978+ }
3979+#endif
3980+
3981 /*
3982 * No handler, we'll have to terminate things with extreme prejudice.
3983 */
3984@@ -173,6 +199,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3985 }
3986 #endif
3987
3988+#ifdef CONFIG_PAX_PAGEEXEC
3989+ if (fsr & FSR_LNX_PF) {
3990+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3991+ do_group_exit(SIGKILL);
3992+ }
3993+#endif
3994+
3995 tsk->thread.address = addr;
3996 tsk->thread.error_code = fsr;
3997 tsk->thread.trap_no = 14;
3998@@ -400,6 +433,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3999 }
4000 #endif /* CONFIG_MMU */
4001
4002+#ifdef CONFIG_PAX_PAGEEXEC
4003+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4004+{
4005+ long i;
4006+
4007+ printk(KERN_ERR "PAX: bytes at PC: ");
4008+ for (i = 0; i < 20; i++) {
4009+ unsigned char c;
4010+ if (get_user(c, (__force unsigned char __user *)pc+i))
4011+ printk(KERN_CONT "?? ");
4012+ else
4013+ printk(KERN_CONT "%02x ", c);
4014+ }
4015+ printk("\n");
4016+
4017+ printk(KERN_ERR "PAX: bytes at SP-4: ");
4018+ for (i = -1; i < 20; i++) {
4019+ unsigned long c;
4020+ if (get_user(c, (__force unsigned long __user *)sp+i))
4021+ printk(KERN_CONT "???????? ");
4022+ else
4023+ printk(KERN_CONT "%08lx ", c);
4024+ }
4025+ printk("\n");
4026+}
4027+#endif
4028+
4029 /*
4030 * First Level Translation Fault Handler
4031 *
4032@@ -547,9 +607,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4033 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4034 struct siginfo info;
4035
4036+#ifdef CONFIG_PAX_MEMORY_UDEREF
4037+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4038+ if (current->signal->curr_ip)
4039+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4040+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4041+ else
4042+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4043+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4044+ goto die;
4045+ }
4046+#endif
4047+
4048 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4049 return;
4050
4051+die:
4052 pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4053 inf->name, fsr, addr);
4054 show_pte(current->mm, addr);
4055@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4056 ifsr_info[nr].name = name;
4057 }
4058
4059+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4060+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4061+
4062 asmlinkage void __exception
4063 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4064 {
4065 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4066 struct siginfo info;
4067+ unsigned long pc = instruction_pointer(regs);
4068+
4069+ if (user_mode(regs)) {
4070+ unsigned long sigpage = current->mm->context.sigpage;
4071+
4072+ if (sigpage <= pc && pc < sigpage + 7*4) {
4073+ if (pc < sigpage + 3*4)
4074+ sys_sigreturn(regs);
4075+ else
4076+ sys_rt_sigreturn(regs);
4077+ return;
4078+ }
4079+ if (pc == 0xffff0f60UL) {
4080+ /*
4081+ * PaX: __kuser_cmpxchg64 emulation
4082+ */
4083+ // TODO
4084+ //regs->ARM_pc = regs->ARM_lr;
4085+ //return;
4086+ }
4087+ if (pc == 0xffff0fa0UL) {
4088+ /*
4089+ * PaX: __kuser_memory_barrier emulation
4090+ */
4091+ // dmb(); implied by the exception
4092+ regs->ARM_pc = regs->ARM_lr;
4093+ return;
4094+ }
4095+ if (pc == 0xffff0fc0UL) {
4096+ /*
4097+ * PaX: __kuser_cmpxchg emulation
4098+ */
4099+ // TODO
4100+ //long new;
4101+ //int op;
4102+
4103+ //op = FUTEX_OP_SET << 28;
4104+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4105+ //regs->ARM_r0 = old != new;
4106+ //regs->ARM_pc = regs->ARM_lr;
4107+ //return;
4108+ }
4109+ if (pc == 0xffff0fe0UL) {
4110+ /*
4111+ * PaX: __kuser_get_tls emulation
4112+ */
4113+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4114+ regs->ARM_pc = regs->ARM_lr;
4115+ return;
4116+ }
4117+ }
4118+
4119+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4120+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4121+ if (current->signal->curr_ip)
4122+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4123+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4124+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4125+ else
4126+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4127+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4128+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4129+ goto die;
4130+ }
4131+#endif
4132+
4133+#ifdef CONFIG_PAX_REFCOUNT
4134+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4135+#ifdef CONFIG_THUMB2_KERNEL
4136+ unsigned short bkpt;
4137+
4138+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4139+#else
4140+ unsigned int bkpt;
4141+
4142+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4143+#endif
4144+ current->thread.error_code = ifsr;
4145+ current->thread.trap_no = 0;
4146+ pax_report_refcount_overflow(regs);
4147+ fixup_exception(regs);
4148+ return;
4149+ }
4150+ }
4151+#endif
4152
4153 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4154 return;
4155
4156+die:
4157 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4158 inf->name, ifsr, addr);
4159
4160diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4161index cf08bdf..772656c 100644
4162--- a/arch/arm/mm/fault.h
4163+++ b/arch/arm/mm/fault.h
4164@@ -3,6 +3,7 @@
4165
4166 /*
4167 * Fault status register encodings. We steal bit 31 for our own purposes.
4168+ * Set when the FSR value is from an instruction fault.
4169 */
4170 #define FSR_LNX_PF (1 << 31)
4171 #define FSR_WRITE (1 << 11)
4172@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4173 }
4174 #endif
4175
4176+/* valid for LPAE and !LPAE */
4177+static inline int is_xn_fault(unsigned int fsr)
4178+{
4179+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4180+}
4181+
4182+static inline int is_domain_fault(unsigned int fsr)
4183+{
4184+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4185+}
4186+
4187 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4188 unsigned long search_exception_table(unsigned long addr);
4189
4190diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4191index be92fa0..5252d7e 100644
4192--- a/arch/arm/mm/init.c
4193+++ b/arch/arm/mm/init.c
4194@@ -709,7 +709,46 @@ void free_tcmmem(void)
4195 {
4196 #ifdef CONFIG_HAVE_TCM
4197 extern char __tcm_start, __tcm_end;
4198+#endif
4199
4200+#ifdef CONFIG_PAX_KERNEXEC
4201+ unsigned long addr;
4202+ pgd_t *pgd;
4203+ pud_t *pud;
4204+ pmd_t *pmd;
4205+ int cpu_arch = cpu_architecture();
4206+ unsigned int cr = get_cr();
4207+
4208+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4209+ /* make pages tables, etc before .text NX */
4210+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4211+ pgd = pgd_offset_k(addr);
4212+ pud = pud_offset(pgd, addr);
4213+ pmd = pmd_offset(pud, addr);
4214+ __section_update(pmd, addr, PMD_SECT_XN);
4215+ }
4216+ /* make init NX */
4217+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4218+ pgd = pgd_offset_k(addr);
4219+ pud = pud_offset(pgd, addr);
4220+ pmd = pmd_offset(pud, addr);
4221+ __section_update(pmd, addr, PMD_SECT_XN);
4222+ }
4223+ /* make kernel code/rodata RX */
4224+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4225+ pgd = pgd_offset_k(addr);
4226+ pud = pud_offset(pgd, addr);
4227+ pmd = pmd_offset(pud, addr);
4228+#ifdef CONFIG_ARM_LPAE
4229+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4230+#else
4231+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4232+#endif
4233+ }
4234+ }
4235+#endif
4236+
4237+#ifdef CONFIG_HAVE_TCM
4238 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4239 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4240 #endif
4241diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4242index d1e5ad7..84dcbf2 100644
4243--- a/arch/arm/mm/ioremap.c
4244+++ b/arch/arm/mm/ioremap.c
4245@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4246 unsigned int mtype;
4247
4248 if (cached)
4249- mtype = MT_MEMORY_RWX;
4250+ mtype = MT_MEMORY_RX;
4251 else
4252- mtype = MT_MEMORY_RWX_NONCACHED;
4253+ mtype = MT_MEMORY_RX_NONCACHED;
4254
4255 return __arm_ioremap_caller(phys_addr, size, mtype,
4256 __builtin_return_address(0));
4257diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4258index 407dc78..047ce9d 100644
4259--- a/arch/arm/mm/mmap.c
4260+++ b/arch/arm/mm/mmap.c
4261@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4262 struct vm_area_struct *vma;
4263 int do_align = 0;
4264 int aliasing = cache_is_vipt_aliasing();
4265+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4266 struct vm_unmapped_area_info info;
4267
4268 /*
4269@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4270 if (len > TASK_SIZE)
4271 return -ENOMEM;
4272
4273+#ifdef CONFIG_PAX_RANDMMAP
4274+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4275+#endif
4276+
4277 if (addr) {
4278 if (do_align)
4279 addr = COLOUR_ALIGN(addr, pgoff);
4280@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4281 addr = PAGE_ALIGN(addr);
4282
4283 vma = find_vma(mm, addr);
4284- if (TASK_SIZE - len >= addr &&
4285- (!vma || addr + len <= vma->vm_start))
4286+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4287 return addr;
4288 }
4289
4290@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4291 info.high_limit = TASK_SIZE;
4292 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4293 info.align_offset = pgoff << PAGE_SHIFT;
4294+ info.threadstack_offset = offset;
4295 return vm_unmapped_area(&info);
4296 }
4297
4298@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4299 unsigned long addr = addr0;
4300 int do_align = 0;
4301 int aliasing = cache_is_vipt_aliasing();
4302+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4303 struct vm_unmapped_area_info info;
4304
4305 /*
4306@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4307 return addr;
4308 }
4309
4310+#ifdef CONFIG_PAX_RANDMMAP
4311+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4312+#endif
4313+
4314 /* requesting a specific address */
4315 if (addr) {
4316 if (do_align)
4317@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4318 else
4319 addr = PAGE_ALIGN(addr);
4320 vma = find_vma(mm, addr);
4321- if (TASK_SIZE - len >= addr &&
4322- (!vma || addr + len <= vma->vm_start))
4323+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4324 return addr;
4325 }
4326
4327@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4328 info.high_limit = mm->mmap_base;
4329 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4330 info.align_offset = pgoff << PAGE_SHIFT;
4331+ info.threadstack_offset = offset;
4332 addr = vm_unmapped_area(&info);
4333
4334 /*
4335@@ -183,14 +193,30 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4336 {
4337 unsigned long random_factor = 0UL;
4338
4339+#ifdef CONFIG_PAX_RANDMMAP
4340+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4341+#endif
4342+
4343 if (current->flags & PF_RANDOMIZE)
4344 random_factor = arch_mmap_rnd();
4345
4346 if (mmap_is_legacy()) {
4347 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4348+
4349+#ifdef CONFIG_PAX_RANDMMAP
4350+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4351+ mm->mmap_base += mm->delta_mmap;
4352+#endif
4353+
4354 mm->get_unmapped_area = arch_get_unmapped_area;
4355 } else {
4356 mm->mmap_base = mmap_base(random_factor);
4357+
4358+#ifdef CONFIG_PAX_RANDMMAP
4359+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4360+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4361+#endif
4362+
4363 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4364 }
4365 }
4366diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4367index 7186382..0c145cf 100644
4368--- a/arch/arm/mm/mmu.c
4369+++ b/arch/arm/mm/mmu.c
4370@@ -41,6 +41,22 @@
4371 #include "mm.h"
4372 #include "tcm.h"
4373
4374+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4375+void modify_domain(unsigned int dom, unsigned int type)
4376+{
4377+ struct thread_info *thread = current_thread_info();
4378+ unsigned int domain = thread->cpu_domain;
4379+ /*
4380+ * DOMAIN_MANAGER might be defined to some other value,
4381+ * use the arch-defined constant
4382+ */
4383+ domain &= ~domain_val(dom, 3);
4384+ thread->cpu_domain = domain | domain_val(dom, type);
4385+ set_domain(thread->cpu_domain);
4386+}
4387+EXPORT_SYMBOL(modify_domain);
4388+#endif
4389+
4390 /*
4391 * empty_zero_page is a special page that is used for
4392 * zero-initialized data and COW.
4393@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4394 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4395 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4396
4397-static struct mem_type mem_types[] = {
4398+#ifdef CONFIG_PAX_KERNEXEC
4399+#define L_PTE_KERNEXEC L_PTE_RDONLY
4400+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4401+#else
4402+#define L_PTE_KERNEXEC L_PTE_DIRTY
4403+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4404+#endif
4405+
4406+static struct mem_type mem_types[] __read_only = {
4407 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4408 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4409 L_PTE_SHARED,
4410@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4411 .prot_sect = PROT_SECT_DEVICE,
4412 .domain = DOMAIN_IO,
4413 },
4414- [MT_UNCACHED] = {
4415+ [MT_UNCACHED_RW] = {
4416 .prot_pte = PROT_PTE_DEVICE,
4417 .prot_l1 = PMD_TYPE_TABLE,
4418 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4419 .domain = DOMAIN_IO,
4420 },
4421- [MT_CACHECLEAN] = {
4422- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4423+ [MT_CACHECLEAN_RO] = {
4424+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4425 .domain = DOMAIN_KERNEL,
4426 },
4427 #ifndef CONFIG_ARM_LPAE
4428- [MT_MINICLEAN] = {
4429- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4430+ [MT_MINICLEAN_RO] = {
4431+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4432 .domain = DOMAIN_KERNEL,
4433 },
4434 #endif
4435@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4436 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4437 L_PTE_RDONLY,
4438 .prot_l1 = PMD_TYPE_TABLE,
4439- .domain = DOMAIN_USER,
4440+ .domain = DOMAIN_VECTORS,
4441 },
4442 [MT_HIGH_VECTORS] = {
4443 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4444 L_PTE_USER | L_PTE_RDONLY,
4445 .prot_l1 = PMD_TYPE_TABLE,
4446- .domain = DOMAIN_USER,
4447+ .domain = DOMAIN_VECTORS,
4448 },
4449- [MT_MEMORY_RWX] = {
4450+ [__MT_MEMORY_RWX] = {
4451 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4452 .prot_l1 = PMD_TYPE_TABLE,
4453 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4454@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4455 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4456 .domain = DOMAIN_KERNEL,
4457 },
4458- [MT_ROM] = {
4459- .prot_sect = PMD_TYPE_SECT,
4460+ [MT_MEMORY_RX] = {
4461+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4462+ .prot_l1 = PMD_TYPE_TABLE,
4463+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4464+ .domain = DOMAIN_KERNEL,
4465+ },
4466+ [MT_ROM_RX] = {
4467+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4468 .domain = DOMAIN_KERNEL,
4469 },
4470- [MT_MEMORY_RWX_NONCACHED] = {
4471+ [MT_MEMORY_RW_NONCACHED] = {
4472 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4473 L_PTE_MT_BUFFERABLE,
4474 .prot_l1 = PMD_TYPE_TABLE,
4475 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4476 .domain = DOMAIN_KERNEL,
4477 },
4478+ [MT_MEMORY_RX_NONCACHED] = {
4479+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4480+ L_PTE_MT_BUFFERABLE,
4481+ .prot_l1 = PMD_TYPE_TABLE,
4482+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4483+ .domain = DOMAIN_KERNEL,
4484+ },
4485 [MT_MEMORY_RW_DTCM] = {
4486 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4487 L_PTE_XN,
4488@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4489 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4490 .domain = DOMAIN_KERNEL,
4491 },
4492- [MT_MEMORY_RWX_ITCM] = {
4493- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4494+ [MT_MEMORY_RX_ITCM] = {
4495+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4496 .prot_l1 = PMD_TYPE_TABLE,
4497+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4498 .domain = DOMAIN_KERNEL,
4499 },
4500 [MT_MEMORY_RW_SO] = {
4501@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4502 * Mark cache clean areas and XIP ROM read only
4503 * from SVC mode and no access from userspace.
4504 */
4505- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4506- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4507- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4508+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4509+#ifdef CONFIG_PAX_KERNEXEC
4510+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4511+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4512+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4513+#endif
4514+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4515+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4516 #endif
4517
4518 /*
4519@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4520 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4521 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4522 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4523- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4524- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4525+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4526+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4527 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4528 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4529+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4530+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4531 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4532- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4533- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4534+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4535+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4536+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4537+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4538 }
4539 }
4540
4541@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4542 if (cpu_arch >= CPU_ARCH_ARMv6) {
4543 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4544 /* Non-cacheable Normal is XCB = 001 */
4545- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4546+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4547+ PMD_SECT_BUFFERED;
4548+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4549 PMD_SECT_BUFFERED;
4550 } else {
4551 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4552- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4553+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4554+ PMD_SECT_TEX(1);
4555+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4556 PMD_SECT_TEX(1);
4557 }
4558 } else {
4559- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4560+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4561+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4562 }
4563
4564 #ifdef CONFIG_ARM_LPAE
4565@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4566 user_pgprot |= PTE_EXT_PXN;
4567 #endif
4568
4569+ user_pgprot |= __supported_pte_mask;
4570+
4571 for (i = 0; i < 16; i++) {
4572 pteval_t v = pgprot_val(protection_map[i]);
4573 protection_map[i] = __pgprot(v | user_pgprot);
4574@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4575
4576 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4577 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4578- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4579- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4580+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4581+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4582 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4583 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4584+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4585+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4586 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4587- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4588- mem_types[MT_ROM].prot_sect |= cp->pmd;
4589+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4590+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4591+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4592
4593 switch (cp->pmd) {
4594 case PMD_SECT_WT:
4595- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4596+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4597 break;
4598 case PMD_SECT_WB:
4599 case PMD_SECT_WBWA:
4600- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4601+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4602 break;
4603 }
4604 pr_info("Memory policy: %sData cache %s\n",
4605@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4606 return;
4607 }
4608
4609- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4610+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4611 md->virtual >= PAGE_OFFSET &&
4612 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4613 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4614@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4615 * called function. This means you can't use any function or debugging
4616 * method which may touch any device, otherwise the kernel _will_ crash.
4617 */
4618+
4619+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4620+
4621 static void __init devicemaps_init(const struct machine_desc *mdesc)
4622 {
4623 struct map_desc map;
4624 unsigned long addr;
4625- void *vectors;
4626
4627- /*
4628- * Allocate the vector page early.
4629- */
4630- vectors = early_alloc(PAGE_SIZE * 2);
4631-
4632- early_trap_init(vectors);
4633+ early_trap_init(&vectors);
4634
4635 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4636 pmd_clear(pmd_off_k(addr));
4637@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4638 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4639 map.virtual = MODULES_VADDR;
4640 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4641- map.type = MT_ROM;
4642+ map.type = MT_ROM_RX;
4643 create_mapping(&map);
4644 #endif
4645
4646@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4647 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4648 map.virtual = FLUSH_BASE;
4649 map.length = SZ_1M;
4650- map.type = MT_CACHECLEAN;
4651+ map.type = MT_CACHECLEAN_RO;
4652 create_mapping(&map);
4653 #endif
4654 #ifdef FLUSH_BASE_MINICACHE
4655 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4656 map.virtual = FLUSH_BASE_MINICACHE;
4657 map.length = SZ_1M;
4658- map.type = MT_MINICLEAN;
4659+ map.type = MT_MINICLEAN_RO;
4660 create_mapping(&map);
4661 #endif
4662
4663@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4664 * location (0xffff0000). If we aren't using high-vectors, also
4665 * create a mapping at the low-vectors virtual address.
4666 */
4667- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4668+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4669 map.virtual = 0xffff0000;
4670 map.length = PAGE_SIZE;
4671 #ifdef CONFIG_KUSER_HELPERS
4672@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4673 static void __init map_lowmem(void)
4674 {
4675 struct memblock_region *reg;
4676+#ifndef CONFIG_PAX_KERNEXEC
4677 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4678 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4679+#endif
4680
4681 /* Map all the lowmem memory banks. */
4682 for_each_memblock(memory, reg) {
4683@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4684 if (start >= end)
4685 break;
4686
4687+#ifdef CONFIG_PAX_KERNEXEC
4688+ map.pfn = __phys_to_pfn(start);
4689+ map.virtual = __phys_to_virt(start);
4690+ map.length = end - start;
4691+
4692+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4693+ struct map_desc kernel;
4694+ struct map_desc initmap;
4695+
4696+ /* when freeing initmem we will make this RW */
4697+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4698+ initmap.virtual = (unsigned long)__init_begin;
4699+ initmap.length = _sdata - __init_begin;
4700+ initmap.type = __MT_MEMORY_RWX;
4701+ create_mapping(&initmap);
4702+
4703+ /* when freeing initmem we will make this RX */
4704+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4705+ kernel.virtual = (unsigned long)_stext;
4706+ kernel.length = __init_begin - _stext;
4707+ kernel.type = __MT_MEMORY_RWX;
4708+ create_mapping(&kernel);
4709+
4710+ if (map.virtual < (unsigned long)_stext) {
4711+ map.length = (unsigned long)_stext - map.virtual;
4712+ map.type = __MT_MEMORY_RWX;
4713+ create_mapping(&map);
4714+ }
4715+
4716+ map.pfn = __phys_to_pfn(__pa(_sdata));
4717+ map.virtual = (unsigned long)_sdata;
4718+ map.length = end - __pa(_sdata);
4719+ }
4720+
4721+ map.type = MT_MEMORY_RW;
4722+ create_mapping(&map);
4723+#else
4724 if (end < kernel_x_start) {
4725 map.pfn = __phys_to_pfn(start);
4726 map.virtual = __phys_to_virt(start);
4727 map.length = end - start;
4728- map.type = MT_MEMORY_RWX;
4729+ map.type = __MT_MEMORY_RWX;
4730
4731 create_mapping(&map);
4732 } else if (start >= kernel_x_end) {
4733@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4734 map.pfn = __phys_to_pfn(kernel_x_start);
4735 map.virtual = __phys_to_virt(kernel_x_start);
4736 map.length = kernel_x_end - kernel_x_start;
4737- map.type = MT_MEMORY_RWX;
4738+ map.type = __MT_MEMORY_RWX;
4739
4740 create_mapping(&map);
4741
4742@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4743 create_mapping(&map);
4744 }
4745 }
4746+#endif
4747 }
4748 }
4749
4750diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4751index e0e2358..96c6791 100644
4752--- a/arch/arm/net/bpf_jit_32.c
4753+++ b/arch/arm/net/bpf_jit_32.c
4754@@ -20,6 +20,7 @@
4755 #include <asm/cacheflush.h>
4756 #include <asm/hwcap.h>
4757 #include <asm/opcodes.h>
4758+#include <asm/pgtable.h>
4759
4760 #include "bpf_jit_32.h"
4761
4762@@ -72,7 +73,11 @@ struct jit_ctx {
4763 #endif
4764 };
4765
4766+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4767+int bpf_jit_enable __read_only;
4768+#else
4769 int bpf_jit_enable __read_mostly;
4770+#endif
4771
4772 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4773 {
4774@@ -179,8 +184,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4775 {
4776 u32 *ptr;
4777 /* We are guaranteed to have aligned memory. */
4778+ pax_open_kernel();
4779 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4780 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4781+ pax_close_kernel();
4782 }
4783
4784 static void build_prologue(struct jit_ctx *ctx)
4785@@ -547,7 +554,7 @@ load_common:
4786 emit(ARM_SUB_I(r_scratch, r_skb_hl,
4787 1 << load_order), ctx);
4788 emit(ARM_CMP_R(r_scratch, r_off), ctx);
4789- condt = ARM_COND_HS;
4790+ condt = ARM_COND_GE;
4791 } else {
4792 emit(ARM_CMP_R(r_skb_hl, r_off), ctx);
4793 condt = ARM_COND_HI;
4794@@ -860,9 +867,11 @@ b_epilogue:
4795 off = offsetof(struct sk_buff, vlan_tci);
4796 emit(ARM_LDRH_I(r_A, r_skb, off), ctx);
4797 if (code == (BPF_ANC | SKF_AD_VLAN_TAG))
4798- OP_IMM3(ARM_AND, r_A, r_A, VLAN_VID_MASK, ctx);
4799- else
4800- OP_IMM3(ARM_AND, r_A, r_A, VLAN_TAG_PRESENT, ctx);
4801+ OP_IMM3(ARM_AND, r_A, r_A, ~VLAN_TAG_PRESENT, ctx);
4802+ else {
4803+ OP_IMM3(ARM_LSR, r_A, r_A, 12, ctx);
4804+ OP_IMM3(ARM_AND, r_A, r_A, 0x1, ctx);
4805+ }
4806 break;
4807 case BPF_ANC | SKF_AD_QUEUE:
4808 ctx->seen |= SEEN_SKB;
4809diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4810index 5b217f4..c23f40e 100644
4811--- a/arch/arm/plat-iop/setup.c
4812+++ b/arch/arm/plat-iop/setup.c
4813@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4814 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4815 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4816 .length = IOP3XX_PERIPHERAL_SIZE,
4817- .type = MT_UNCACHED,
4818+ .type = MT_UNCACHED_RW,
4819 },
4820 };
4821
4822diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4823index a5bc92d..0bb4730 100644
4824--- a/arch/arm/plat-omap/sram.c
4825+++ b/arch/arm/plat-omap/sram.c
4826@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4827 * Looks like we need to preserve some bootloader code at the
4828 * beginning of SRAM for jumping to flash for reboot to work...
4829 */
4830+ pax_open_kernel();
4831 memset_io(omap_sram_base + omap_sram_skip, 0,
4832 omap_sram_size - omap_sram_skip);
4833+ pax_close_kernel();
4834 }
4835diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4836index 7047051..44e8675 100644
4837--- a/arch/arm64/include/asm/atomic.h
4838+++ b/arch/arm64/include/asm/atomic.h
4839@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4840 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4841 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4842
4843+#define atomic64_read_unchecked(v) atomic64_read(v)
4844+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4845+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4846+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4847+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4848+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4849+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4850+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4851+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4852+
4853 #endif
4854 #endif
4855diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4856index 71f19c4..2b13cfe 100644
4857--- a/arch/arm64/include/asm/barrier.h
4858+++ b/arch/arm64/include/asm/barrier.h
4859@@ -44,7 +44,7 @@
4860 do { \
4861 compiletime_assert_atomic_type(*p); \
4862 barrier(); \
4863- ACCESS_ONCE(*p) = (v); \
4864+ ACCESS_ONCE_RW(*p) = (v); \
4865 } while (0)
4866
4867 #define smp_load_acquire(p) \
4868diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4869index 4fde8c1..441f84f 100644
4870--- a/arch/arm64/include/asm/percpu.h
4871+++ b/arch/arm64/include/asm/percpu.h
4872@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4873 {
4874 switch (size) {
4875 case 1:
4876- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4877+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4878 break;
4879 case 2:
4880- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4881+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4882 break;
4883 case 4:
4884- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4885+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4886 break;
4887 case 8:
4888- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4889+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4890 break;
4891 default:
4892 BUILD_BUG();
4893diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4894index 7642056..bffc904 100644
4895--- a/arch/arm64/include/asm/pgalloc.h
4896+++ b/arch/arm64/include/asm/pgalloc.h
4897@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4898 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4899 }
4900
4901+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4902+{
4903+ pud_populate(mm, pud, pmd);
4904+}
4905+
4906 #endif /* CONFIG_PGTABLE_LEVELS > 2 */
4907
4908 #if CONFIG_PGTABLE_LEVELS > 3
4909diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4910index 07e1ba44..ec8cbbb 100644
4911--- a/arch/arm64/include/asm/uaccess.h
4912+++ b/arch/arm64/include/asm/uaccess.h
4913@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4914 flag; \
4915 })
4916
4917+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4918 #define access_ok(type, addr, size) __range_ok(addr, size)
4919 #define user_addr_max get_fs
4920
4921diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
4922index b0bd4e5..54e82f6 100644
4923--- a/arch/arm64/mm/dma-mapping.c
4924+++ b/arch/arm64/mm/dma-mapping.c
4925@@ -134,7 +134,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
4926 phys_to_page(paddr),
4927 size >> PAGE_SHIFT);
4928 if (!freed)
4929- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
4930+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
4931 }
4932
4933 static void *__dma_alloc(struct device *dev, size_t size,
4934diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4935index c3a58a1..78fbf54 100644
4936--- a/arch/avr32/include/asm/cache.h
4937+++ b/arch/avr32/include/asm/cache.h
4938@@ -1,8 +1,10 @@
4939 #ifndef __ASM_AVR32_CACHE_H
4940 #define __ASM_AVR32_CACHE_H
4941
4942+#include <linux/const.h>
4943+
4944 #define L1_CACHE_SHIFT 5
4945-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4946+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4947
4948 /*
4949 * Memory returned by kmalloc() may be used for DMA, so we must make
4950diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4951index 0388ece..87c8df1 100644
4952--- a/arch/avr32/include/asm/elf.h
4953+++ b/arch/avr32/include/asm/elf.h
4954@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4955 the loader. We need to make sure that it is out of the way of the program
4956 that it will "exec", and that there is sufficient room for the brk. */
4957
4958-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4959+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4960
4961+#ifdef CONFIG_PAX_ASLR
4962+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4963+
4964+#define PAX_DELTA_MMAP_LEN 15
4965+#define PAX_DELTA_STACK_LEN 15
4966+#endif
4967
4968 /* This yields a mask that user programs can use to figure out what
4969 instruction set this CPU supports. This could be done in user space,
4970diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4971index 479330b..53717a8 100644
4972--- a/arch/avr32/include/asm/kmap_types.h
4973+++ b/arch/avr32/include/asm/kmap_types.h
4974@@ -2,9 +2,9 @@
4975 #define __ASM_AVR32_KMAP_TYPES_H
4976
4977 #ifdef CONFIG_DEBUG_HIGHMEM
4978-# define KM_TYPE_NR 29
4979+# define KM_TYPE_NR 30
4980 #else
4981-# define KM_TYPE_NR 14
4982+# define KM_TYPE_NR 15
4983 #endif
4984
4985 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4986diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4987index d223a8b..69c5210 100644
4988--- a/arch/avr32/mm/fault.c
4989+++ b/arch/avr32/mm/fault.c
4990@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4991
4992 int exception_trace = 1;
4993
4994+#ifdef CONFIG_PAX_PAGEEXEC
4995+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4996+{
4997+ unsigned long i;
4998+
4999+ printk(KERN_ERR "PAX: bytes at PC: ");
5000+ for (i = 0; i < 20; i++) {
5001+ unsigned char c;
5002+ if (get_user(c, (unsigned char *)pc+i))
5003+ printk(KERN_CONT "???????? ");
5004+ else
5005+ printk(KERN_CONT "%02x ", c);
5006+ }
5007+ printk("\n");
5008+}
5009+#endif
5010+
5011 /*
5012 * This routine handles page faults. It determines the address and the
5013 * problem, and then passes it off to one of the appropriate routines.
5014@@ -178,6 +195,16 @@ bad_area:
5015 up_read(&mm->mmap_sem);
5016
5017 if (user_mode(regs)) {
5018+
5019+#ifdef CONFIG_PAX_PAGEEXEC
5020+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
5021+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
5022+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
5023+ do_group_exit(SIGKILL);
5024+ }
5025+ }
5026+#endif
5027+
5028 if (exception_trace && printk_ratelimit())
5029 printk("%s%s[%d]: segfault at %08lx pc %08lx "
5030 "sp %08lx ecr %lu\n",
5031diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
5032index 568885a..f8008df 100644
5033--- a/arch/blackfin/include/asm/cache.h
5034+++ b/arch/blackfin/include/asm/cache.h
5035@@ -7,6 +7,7 @@
5036 #ifndef __ARCH_BLACKFIN_CACHE_H
5037 #define __ARCH_BLACKFIN_CACHE_H
5038
5039+#include <linux/const.h>
5040 #include <linux/linkage.h> /* for asmlinkage */
5041
5042 /*
5043@@ -14,7 +15,7 @@
5044 * Blackfin loads 32 bytes for cache
5045 */
5046 #define L1_CACHE_SHIFT 5
5047-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5048+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5049 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5050
5051 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5052diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
5053index aea2718..3639a60 100644
5054--- a/arch/cris/include/arch-v10/arch/cache.h
5055+++ b/arch/cris/include/arch-v10/arch/cache.h
5056@@ -1,8 +1,9 @@
5057 #ifndef _ASM_ARCH_CACHE_H
5058 #define _ASM_ARCH_CACHE_H
5059
5060+#include <linux/const.h>
5061 /* Etrax 100LX have 32-byte cache-lines. */
5062-#define L1_CACHE_BYTES 32
5063 #define L1_CACHE_SHIFT 5
5064+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5065
5066 #endif /* _ASM_ARCH_CACHE_H */
5067diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
5068index 7caf25d..ee65ac5 100644
5069--- a/arch/cris/include/arch-v32/arch/cache.h
5070+++ b/arch/cris/include/arch-v32/arch/cache.h
5071@@ -1,11 +1,12 @@
5072 #ifndef _ASM_CRIS_ARCH_CACHE_H
5073 #define _ASM_CRIS_ARCH_CACHE_H
5074
5075+#include <linux/const.h>
5076 #include <arch/hwregs/dma.h>
5077
5078 /* A cache-line is 32 bytes. */
5079-#define L1_CACHE_BYTES 32
5080 #define L1_CACHE_SHIFT 5
5081+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5082
5083 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5084
5085diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5086index 102190a..5334cea 100644
5087--- a/arch/frv/include/asm/atomic.h
5088+++ b/arch/frv/include/asm/atomic.h
5089@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5090 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5091 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5092
5093+#define atomic64_read_unchecked(v) atomic64_read(v)
5094+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5095+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5096+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5097+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5098+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5099+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5100+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5101+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5102+
5103 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5104 {
5105 int c, old;
5106diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5107index 2797163..c2a401df9 100644
5108--- a/arch/frv/include/asm/cache.h
5109+++ b/arch/frv/include/asm/cache.h
5110@@ -12,10 +12,11 @@
5111 #ifndef __ASM_CACHE_H
5112 #define __ASM_CACHE_H
5113
5114+#include <linux/const.h>
5115
5116 /* bytes per L1 cache line */
5117 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5118-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5119+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5120
5121 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5122 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5123diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5124index 43901f2..0d8b865 100644
5125--- a/arch/frv/include/asm/kmap_types.h
5126+++ b/arch/frv/include/asm/kmap_types.h
5127@@ -2,6 +2,6 @@
5128 #ifndef _ASM_KMAP_TYPES_H
5129 #define _ASM_KMAP_TYPES_H
5130
5131-#define KM_TYPE_NR 17
5132+#define KM_TYPE_NR 18
5133
5134 #endif
5135diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5136index 836f147..4cf23f5 100644
5137--- a/arch/frv/mm/elf-fdpic.c
5138+++ b/arch/frv/mm/elf-fdpic.c
5139@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5140 {
5141 struct vm_area_struct *vma;
5142 struct vm_unmapped_area_info info;
5143+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5144
5145 if (len > TASK_SIZE)
5146 return -ENOMEM;
5147@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5148 if (addr) {
5149 addr = PAGE_ALIGN(addr);
5150 vma = find_vma(current->mm, addr);
5151- if (TASK_SIZE - len >= addr &&
5152- (!vma || addr + len <= vma->vm_start))
5153+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5154 goto success;
5155 }
5156
5157@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5158 info.high_limit = (current->mm->start_stack - 0x00200000);
5159 info.align_mask = 0;
5160 info.align_offset = 0;
5161+ info.threadstack_offset = offset;
5162 addr = vm_unmapped_area(&info);
5163 if (!(addr & ~PAGE_MASK))
5164 goto success;
5165diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5166index 69952c18..4fa2908 100644
5167--- a/arch/hexagon/include/asm/cache.h
5168+++ b/arch/hexagon/include/asm/cache.h
5169@@ -21,9 +21,11 @@
5170 #ifndef __ASM_CACHE_H
5171 #define __ASM_CACHE_H
5172
5173+#include <linux/const.h>
5174+
5175 /* Bytes per L1 cache line */
5176-#define L1_CACHE_SHIFT (5)
5177-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5178+#define L1_CACHE_SHIFT 5
5179+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5180
5181 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5182
5183diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5184index 76d25b2..d3793a0f 100644
5185--- a/arch/ia64/Kconfig
5186+++ b/arch/ia64/Kconfig
5187@@ -541,6 +541,7 @@ source "drivers/sn/Kconfig"
5188 config KEXEC
5189 bool "kexec system call"
5190 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5191+ depends on !GRKERNSEC_KMEM
5192 help
5193 kexec is a system call that implements the ability to shutdown your
5194 current kernel, and to start another kernel. It is like a reboot
5195diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5196index 970d0bd..e750b9b 100644
5197--- a/arch/ia64/Makefile
5198+++ b/arch/ia64/Makefile
5199@@ -98,5 +98,6 @@ endef
5200 archprepare: make_nr_irqs_h FORCE
5201 PHONY += make_nr_irqs_h FORCE
5202
5203+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5204 make_nr_irqs_h: FORCE
5205 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5206diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5207index 0bf0350..2ad1957 100644
5208--- a/arch/ia64/include/asm/atomic.h
5209+++ b/arch/ia64/include/asm/atomic.h
5210@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5211 #define atomic64_inc(v) atomic64_add(1, (v))
5212 #define atomic64_dec(v) atomic64_sub(1, (v))
5213
5214+#define atomic64_read_unchecked(v) atomic64_read(v)
5215+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5216+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5217+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5218+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5219+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5220+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5221+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5222+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5223+
5224 #endif /* _ASM_IA64_ATOMIC_H */
5225diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5226index f6769eb..1cdb590 100644
5227--- a/arch/ia64/include/asm/barrier.h
5228+++ b/arch/ia64/include/asm/barrier.h
5229@@ -66,7 +66,7 @@
5230 do { \
5231 compiletime_assert_atomic_type(*p); \
5232 barrier(); \
5233- ACCESS_ONCE(*p) = (v); \
5234+ ACCESS_ONCE_RW(*p) = (v); \
5235 } while (0)
5236
5237 #define smp_load_acquire(p) \
5238diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5239index 988254a..e1ee885 100644
5240--- a/arch/ia64/include/asm/cache.h
5241+++ b/arch/ia64/include/asm/cache.h
5242@@ -1,6 +1,7 @@
5243 #ifndef _ASM_IA64_CACHE_H
5244 #define _ASM_IA64_CACHE_H
5245
5246+#include <linux/const.h>
5247
5248 /*
5249 * Copyright (C) 1998-2000 Hewlett-Packard Co
5250@@ -9,7 +10,7 @@
5251
5252 /* Bytes per L1 (data) cache line. */
5253 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5254-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5255+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5256
5257 #ifdef CONFIG_SMP
5258 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5259diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5260index 5a83c5c..4d7f553 100644
5261--- a/arch/ia64/include/asm/elf.h
5262+++ b/arch/ia64/include/asm/elf.h
5263@@ -42,6 +42,13 @@
5264 */
5265 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5266
5267+#ifdef CONFIG_PAX_ASLR
5268+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5269+
5270+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5271+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5272+#endif
5273+
5274 #define PT_IA_64_UNWIND 0x70000001
5275
5276 /* IA-64 relocations: */
5277diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5278index f5e70e9..624fad5 100644
5279--- a/arch/ia64/include/asm/pgalloc.h
5280+++ b/arch/ia64/include/asm/pgalloc.h
5281@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5282 pgd_val(*pgd_entry) = __pa(pud);
5283 }
5284
5285+static inline void
5286+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5287+{
5288+ pgd_populate(mm, pgd_entry, pud);
5289+}
5290+
5291 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5292 {
5293 return quicklist_alloc(0, GFP_KERNEL, NULL);
5294@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5295 pud_val(*pud_entry) = __pa(pmd);
5296 }
5297
5298+static inline void
5299+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5300+{
5301+ pud_populate(mm, pud_entry, pmd);
5302+}
5303+
5304 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5305 {
5306 return quicklist_alloc(0, GFP_KERNEL, NULL);
5307diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5308index 9f3ed9e..c99b418 100644
5309--- a/arch/ia64/include/asm/pgtable.h
5310+++ b/arch/ia64/include/asm/pgtable.h
5311@@ -12,7 +12,7 @@
5312 * David Mosberger-Tang <davidm@hpl.hp.com>
5313 */
5314
5315-
5316+#include <linux/const.h>
5317 #include <asm/mman.h>
5318 #include <asm/page.h>
5319 #include <asm/processor.h>
5320@@ -139,6 +139,17 @@
5321 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5322 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5323 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5324+
5325+#ifdef CONFIG_PAX_PAGEEXEC
5326+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5327+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5328+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5329+#else
5330+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5331+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5332+# define PAGE_COPY_NOEXEC PAGE_COPY
5333+#endif
5334+
5335 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5336 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5337 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5338diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5339index 45698cd..e8e2dbc 100644
5340--- a/arch/ia64/include/asm/spinlock.h
5341+++ b/arch/ia64/include/asm/spinlock.h
5342@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5343 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5344
5345 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5346- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5347+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5348 }
5349
5350 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5351diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5352index 4f3fb6cc..254055e 100644
5353--- a/arch/ia64/include/asm/uaccess.h
5354+++ b/arch/ia64/include/asm/uaccess.h
5355@@ -70,6 +70,7 @@
5356 && ((segment).seg == KERNEL_DS.seg \
5357 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5358 })
5359+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5360 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5361
5362 /*
5363@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5364 static inline unsigned long
5365 __copy_to_user (void __user *to, const void *from, unsigned long count)
5366 {
5367+ if (count > INT_MAX)
5368+ return count;
5369+
5370+ if (!__builtin_constant_p(count))
5371+ check_object_size(from, count, true);
5372+
5373 return __copy_user(to, (__force void __user *) from, count);
5374 }
5375
5376 static inline unsigned long
5377 __copy_from_user (void *to, const void __user *from, unsigned long count)
5378 {
5379+ if (count > INT_MAX)
5380+ return count;
5381+
5382+ if (!__builtin_constant_p(count))
5383+ check_object_size(to, count, false);
5384+
5385 return __copy_user((__force void __user *) to, from, count);
5386 }
5387
5388@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5389 ({ \
5390 void __user *__cu_to = (to); \
5391 const void *__cu_from = (from); \
5392- long __cu_len = (n); \
5393+ unsigned long __cu_len = (n); \
5394 \
5395- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5396+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5397+ if (!__builtin_constant_p(n)) \
5398+ check_object_size(__cu_from, __cu_len, true); \
5399 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5400+ } \
5401 __cu_len; \
5402 })
5403
5404@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5405 ({ \
5406 void *__cu_to = (to); \
5407 const void __user *__cu_from = (from); \
5408- long __cu_len = (n); \
5409+ unsigned long __cu_len = (n); \
5410 \
5411 __chk_user_ptr(__cu_from); \
5412- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5413+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5414+ if (!__builtin_constant_p(n)) \
5415+ check_object_size(__cu_to, __cu_len, false); \
5416 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5417+ } \
5418 __cu_len; \
5419 })
5420
5421diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5422index 29754aa..06d2838 100644
5423--- a/arch/ia64/kernel/module.c
5424+++ b/arch/ia64/kernel/module.c
5425@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5426 }
5427
5428 static inline int
5429+in_init_rx (const struct module *mod, uint64_t addr)
5430+{
5431+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5432+}
5433+
5434+static inline int
5435+in_init_rw (const struct module *mod, uint64_t addr)
5436+{
5437+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5438+}
5439+
5440+static inline int
5441 in_init (const struct module *mod, uint64_t addr)
5442 {
5443- return addr - (uint64_t) mod->module_init < mod->init_size;
5444+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5445+}
5446+
5447+static inline int
5448+in_core_rx (const struct module *mod, uint64_t addr)
5449+{
5450+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5451+}
5452+
5453+static inline int
5454+in_core_rw (const struct module *mod, uint64_t addr)
5455+{
5456+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5457 }
5458
5459 static inline int
5460 in_core (const struct module *mod, uint64_t addr)
5461 {
5462- return addr - (uint64_t) mod->module_core < mod->core_size;
5463+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5464 }
5465
5466 static inline int
5467@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5468 break;
5469
5470 case RV_BDREL:
5471- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5472+ if (in_init_rx(mod, val))
5473+ val -= (uint64_t) mod->module_init_rx;
5474+ else if (in_init_rw(mod, val))
5475+ val -= (uint64_t) mod->module_init_rw;
5476+ else if (in_core_rx(mod, val))
5477+ val -= (uint64_t) mod->module_core_rx;
5478+ else if (in_core_rw(mod, val))
5479+ val -= (uint64_t) mod->module_core_rw;
5480 break;
5481
5482 case RV_LTV:
5483@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5484 * addresses have been selected...
5485 */
5486 uint64_t gp;
5487- if (mod->core_size > MAX_LTOFF)
5488+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5489 /*
5490 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5491 * at the end of the module.
5492 */
5493- gp = mod->core_size - MAX_LTOFF / 2;
5494+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5495 else
5496- gp = mod->core_size / 2;
5497- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5498+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5499+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5500 mod->arch.gp = gp;
5501 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5502 }
5503diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5504index c39c3cd..3c77738 100644
5505--- a/arch/ia64/kernel/palinfo.c
5506+++ b/arch/ia64/kernel/palinfo.c
5507@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5508 return NOTIFY_OK;
5509 }
5510
5511-static struct notifier_block __refdata palinfo_cpu_notifier =
5512+static struct notifier_block palinfo_cpu_notifier =
5513 {
5514 .notifier_call = palinfo_cpu_callback,
5515 .priority = 0,
5516diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5517index 41e33f8..65180b2a 100644
5518--- a/arch/ia64/kernel/sys_ia64.c
5519+++ b/arch/ia64/kernel/sys_ia64.c
5520@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5521 unsigned long align_mask = 0;
5522 struct mm_struct *mm = current->mm;
5523 struct vm_unmapped_area_info info;
5524+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5525
5526 if (len > RGN_MAP_LIMIT)
5527 return -ENOMEM;
5528@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5529 if (REGION_NUMBER(addr) == RGN_HPAGE)
5530 addr = 0;
5531 #endif
5532+
5533+#ifdef CONFIG_PAX_RANDMMAP
5534+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5535+ addr = mm->free_area_cache;
5536+ else
5537+#endif
5538+
5539 if (!addr)
5540 addr = TASK_UNMAPPED_BASE;
5541
5542@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5543 info.high_limit = TASK_SIZE;
5544 info.align_mask = align_mask;
5545 info.align_offset = 0;
5546+ info.threadstack_offset = offset;
5547 return vm_unmapped_area(&info);
5548 }
5549
5550diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5551index 84f8a52..7c76178 100644
5552--- a/arch/ia64/kernel/vmlinux.lds.S
5553+++ b/arch/ia64/kernel/vmlinux.lds.S
5554@@ -192,7 +192,7 @@ SECTIONS {
5555 /* Per-cpu data: */
5556 . = ALIGN(PERCPU_PAGE_SIZE);
5557 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5558- __phys_per_cpu_start = __per_cpu_load;
5559+ __phys_per_cpu_start = per_cpu_load;
5560 /*
5561 * ensure percpu data fits
5562 * into percpu page size
5563diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5564index ba5ba7a..36e9d3a 100644
5565--- a/arch/ia64/mm/fault.c
5566+++ b/arch/ia64/mm/fault.c
5567@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5568 return pte_present(pte);
5569 }
5570
5571+#ifdef CONFIG_PAX_PAGEEXEC
5572+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5573+{
5574+ unsigned long i;
5575+
5576+ printk(KERN_ERR "PAX: bytes at PC: ");
5577+ for (i = 0; i < 8; i++) {
5578+ unsigned int c;
5579+ if (get_user(c, (unsigned int *)pc+i))
5580+ printk(KERN_CONT "???????? ");
5581+ else
5582+ printk(KERN_CONT "%08x ", c);
5583+ }
5584+ printk("\n");
5585+}
5586+#endif
5587+
5588 # define VM_READ_BIT 0
5589 # define VM_WRITE_BIT 1
5590 # define VM_EXEC_BIT 2
5591@@ -151,8 +168,21 @@ retry:
5592 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5593 goto bad_area;
5594
5595- if ((vma->vm_flags & mask) != mask)
5596+ if ((vma->vm_flags & mask) != mask) {
5597+
5598+#ifdef CONFIG_PAX_PAGEEXEC
5599+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5600+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5601+ goto bad_area;
5602+
5603+ up_read(&mm->mmap_sem);
5604+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5605+ do_group_exit(SIGKILL);
5606+ }
5607+#endif
5608+
5609 goto bad_area;
5610+ }
5611
5612 /*
5613 * If for any reason at all we couldn't handle the fault, make
5614diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5615index 52b7604b..455cb85 100644
5616--- a/arch/ia64/mm/hugetlbpage.c
5617+++ b/arch/ia64/mm/hugetlbpage.c
5618@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5619 unsigned long pgoff, unsigned long flags)
5620 {
5621 struct vm_unmapped_area_info info;
5622+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5623
5624 if (len > RGN_MAP_LIMIT)
5625 return -ENOMEM;
5626@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5627 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5628 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5629 info.align_offset = 0;
5630+ info.threadstack_offset = offset;
5631 return vm_unmapped_area(&info);
5632 }
5633
5634diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5635index a9b65cf..49ae1cf 100644
5636--- a/arch/ia64/mm/init.c
5637+++ b/arch/ia64/mm/init.c
5638@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5639 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5640 vma->vm_end = vma->vm_start + PAGE_SIZE;
5641 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5642+
5643+#ifdef CONFIG_PAX_PAGEEXEC
5644+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5645+ vma->vm_flags &= ~VM_EXEC;
5646+
5647+#ifdef CONFIG_PAX_MPROTECT
5648+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5649+ vma->vm_flags &= ~VM_MAYEXEC;
5650+#endif
5651+
5652+ }
5653+#endif
5654+
5655 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5656 down_write(&current->mm->mmap_sem);
5657 if (insert_vm_struct(current->mm, vma)) {
5658@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5659 gate_vma.vm_start = FIXADDR_USER_START;
5660 gate_vma.vm_end = FIXADDR_USER_END;
5661 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5662- gate_vma.vm_page_prot = __P101;
5663+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5664
5665 return 0;
5666 }
5667diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5668index 40b3ee98..8c2c112 100644
5669--- a/arch/m32r/include/asm/cache.h
5670+++ b/arch/m32r/include/asm/cache.h
5671@@ -1,8 +1,10 @@
5672 #ifndef _ASM_M32R_CACHE_H
5673 #define _ASM_M32R_CACHE_H
5674
5675+#include <linux/const.h>
5676+
5677 /* L1 cache line size */
5678 #define L1_CACHE_SHIFT 4
5679-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5680+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5681
5682 #endif /* _ASM_M32R_CACHE_H */
5683diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5684index 82abd15..d95ae5d 100644
5685--- a/arch/m32r/lib/usercopy.c
5686+++ b/arch/m32r/lib/usercopy.c
5687@@ -14,6 +14,9 @@
5688 unsigned long
5689 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5690 {
5691+ if ((long)n < 0)
5692+ return n;
5693+
5694 prefetch(from);
5695 if (access_ok(VERIFY_WRITE, to, n))
5696 __copy_user(to,from,n);
5697@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5698 unsigned long
5699 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5700 {
5701+ if ((long)n < 0)
5702+ return n;
5703+
5704 prefetchw(to);
5705 if (access_ok(VERIFY_READ, from, n))
5706 __copy_user_zeroing(to,from,n);
5707diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5708index 0395c51..5f26031 100644
5709--- a/arch/m68k/include/asm/cache.h
5710+++ b/arch/m68k/include/asm/cache.h
5711@@ -4,9 +4,11 @@
5712 #ifndef __ARCH_M68K_CACHE_H
5713 #define __ARCH_M68K_CACHE_H
5714
5715+#include <linux/const.h>
5716+
5717 /* bytes per L1 cache line */
5718 #define L1_CACHE_SHIFT 4
5719-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5720+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5721
5722 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5723
5724diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5725index d703d8e..a8e2d70 100644
5726--- a/arch/metag/include/asm/barrier.h
5727+++ b/arch/metag/include/asm/barrier.h
5728@@ -90,7 +90,7 @@ static inline void fence(void)
5729 do { \
5730 compiletime_assert_atomic_type(*p); \
5731 smp_mb(); \
5732- ACCESS_ONCE(*p) = (v); \
5733+ ACCESS_ONCE_RW(*p) = (v); \
5734 } while (0)
5735
5736 #define smp_load_acquire(p) \
5737diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5738index 7ca80ac..794ba72 100644
5739--- a/arch/metag/mm/hugetlbpage.c
5740+++ b/arch/metag/mm/hugetlbpage.c
5741@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5742 info.high_limit = TASK_SIZE;
5743 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5744 info.align_offset = 0;
5745+ info.threadstack_offset = 0;
5746 return vm_unmapped_area(&info);
5747 }
5748
5749diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5750index 4efe96a..60e8699 100644
5751--- a/arch/microblaze/include/asm/cache.h
5752+++ b/arch/microblaze/include/asm/cache.h
5753@@ -13,11 +13,12 @@
5754 #ifndef _ASM_MICROBLAZE_CACHE_H
5755 #define _ASM_MICROBLAZE_CACHE_H
5756
5757+#include <linux/const.h>
5758 #include <asm/registers.h>
5759
5760 #define L1_CACHE_SHIFT 5
5761 /* word-granular cache in microblaze */
5762-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5763+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5764
5765 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5766
5767diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5768index a3b1ffe..7d61ca6 100644
5769--- a/arch/mips/Kconfig
5770+++ b/arch/mips/Kconfig
5771@@ -2586,6 +2586,7 @@ source "kernel/Kconfig.preempt"
5772
5773 config KEXEC
5774 bool "Kexec system call"
5775+ depends on !GRKERNSEC_KMEM
5776 help
5777 kexec is a system call that implements the ability to shutdown your
5778 current kernel, and to start another kernel. It is like a reboot
5779diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5780index d8960d4..77dbd31 100644
5781--- a/arch/mips/cavium-octeon/dma-octeon.c
5782+++ b/arch/mips/cavium-octeon/dma-octeon.c
5783@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5784 if (dma_release_from_coherent(dev, order, vaddr))
5785 return;
5786
5787- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5788+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5789 }
5790
5791 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5792diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5793index 26d4363..3c9a82e 100644
5794--- a/arch/mips/include/asm/atomic.h
5795+++ b/arch/mips/include/asm/atomic.h
5796@@ -22,15 +22,39 @@
5797 #include <asm/cmpxchg.h>
5798 #include <asm/war.h>
5799
5800+#ifdef CONFIG_GENERIC_ATOMIC64
5801+#include <asm-generic/atomic64.h>
5802+#endif
5803+
5804 #define ATOMIC_INIT(i) { (i) }
5805
5806+#ifdef CONFIG_64BIT
5807+#define _ASM_EXTABLE(from, to) \
5808+" .section __ex_table,\"a\"\n" \
5809+" .dword " #from ", " #to"\n" \
5810+" .previous\n"
5811+#else
5812+#define _ASM_EXTABLE(from, to) \
5813+" .section __ex_table,\"a\"\n" \
5814+" .word " #from ", " #to"\n" \
5815+" .previous\n"
5816+#endif
5817+
5818 /*
5819 * atomic_read - read atomic variable
5820 * @v: pointer of type atomic_t
5821 *
5822 * Atomically reads the value of @v.
5823 */
5824-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5825+static inline int atomic_read(const atomic_t *v)
5826+{
5827+ return ACCESS_ONCE(v->counter);
5828+}
5829+
5830+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5831+{
5832+ return ACCESS_ONCE(v->counter);
5833+}
5834
5835 /*
5836 * atomic_set - set atomic variable
5837@@ -39,47 +63,77 @@
5838 *
5839 * Atomically sets the value of @v to @i.
5840 */
5841-#define atomic_set(v, i) ((v)->counter = (i))
5842+static inline void atomic_set(atomic_t *v, int i)
5843+{
5844+ v->counter = i;
5845+}
5846
5847-#define ATOMIC_OP(op, c_op, asm_op) \
5848-static __inline__ void atomic_##op(int i, atomic_t * v) \
5849+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5850+{
5851+ v->counter = i;
5852+}
5853+
5854+#ifdef CONFIG_PAX_REFCOUNT
5855+#define __OVERFLOW_POST \
5856+ " b 4f \n" \
5857+ " .set noreorder \n" \
5858+ "3: b 5f \n" \
5859+ " move %0, %1 \n" \
5860+ " .set reorder \n"
5861+#define __OVERFLOW_EXTABLE \
5862+ "3:\n" \
5863+ _ASM_EXTABLE(2b, 3b)
5864+#else
5865+#define __OVERFLOW_POST
5866+#define __OVERFLOW_EXTABLE
5867+#endif
5868+
5869+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5870+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5871 { \
5872 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5873 int temp; \
5874 \
5875 __asm__ __volatile__( \
5876- " .set arch=r4000 \n" \
5877- "1: ll %0, %1 # atomic_" #op " \n" \
5878- " " #asm_op " %0, %2 \n" \
5879+ " .set mips3 \n" \
5880+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5881+ "2: " #asm_op " %0, %2 \n" \
5882 " sc %0, %1 \n" \
5883 " beqzl %0, 1b \n" \
5884+ extable \
5885 " .set mips0 \n" \
5886 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5887 : "Ir" (i)); \
5888 } else if (kernel_uses_llsc) { \
5889 int temp; \
5890 \
5891- do { \
5892- __asm__ __volatile__( \
5893- " .set "MIPS_ISA_LEVEL" \n" \
5894- " ll %0, %1 # atomic_" #op "\n" \
5895- " " #asm_op " %0, %2 \n" \
5896- " sc %0, %1 \n" \
5897- " .set mips0 \n" \
5898- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5899- : "Ir" (i)); \
5900- } while (unlikely(!temp)); \
5901+ __asm__ __volatile__( \
5902+ " .set "MIPS_ISA_LEVEL" \n" \
5903+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5904+ "2: " #asm_op " %0, %2 \n" \
5905+ " sc %0, %1 \n" \
5906+ " beqz %0, 1b \n" \
5907+ extable \
5908+ " .set mips0 \n" \
5909+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5910+ : "Ir" (i)); \
5911 } else { \
5912 unsigned long flags; \
5913 \
5914 raw_local_irq_save(flags); \
5915- v->counter c_op i; \
5916+ __asm__ __volatile__( \
5917+ "2: " #asm_op " %0, %1 \n" \
5918+ extable \
5919+ : "+r" (v->counter) : "Ir" (i)); \
5920 raw_local_irq_restore(flags); \
5921 } \
5922 }
5923
5924-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5925-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5926+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
5927+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
5928+
5929+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5930+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5931 { \
5932 int result; \
5933 \
5934@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5935 int temp; \
5936 \
5937 __asm__ __volatile__( \
5938- " .set arch=r4000 \n" \
5939- "1: ll %1, %2 # atomic_" #op "_return \n" \
5940- " " #asm_op " %0, %1, %3 \n" \
5941+ " .set mips3 \n" \
5942+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
5943+ "2: " #asm_op " %0, %1, %3 \n" \
5944 " sc %0, %2 \n" \
5945 " beqzl %0, 1b \n" \
5946- " " #asm_op " %0, %1, %3 \n" \
5947+ post_op \
5948+ extable \
5949+ "4: " #asm_op " %0, %1, %3 \n" \
5950+ "5: \n" \
5951 " .set mips0 \n" \
5952 : "=&r" (result), "=&r" (temp), \
5953 "+" GCC_OFF_SMALL_ASM() (v->counter) \
5954@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5955 } else if (kernel_uses_llsc) { \
5956 int temp; \
5957 \
5958- do { \
5959- __asm__ __volatile__( \
5960- " .set "MIPS_ISA_LEVEL" \n" \
5961- " ll %1, %2 # atomic_" #op "_return \n" \
5962- " " #asm_op " %0, %1, %3 \n" \
5963- " sc %0, %2 \n" \
5964- " .set mips0 \n" \
5965- : "=&r" (result), "=&r" (temp), \
5966- "+" GCC_OFF_SMALL_ASM() (v->counter) \
5967- : "Ir" (i)); \
5968- } while (unlikely(!result)); \
5969+ __asm__ __volatile__( \
5970+ " .set "MIPS_ISA_LEVEL" \n" \
5971+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5972+ "2: " #asm_op " %0, %1, %3 \n" \
5973+ " sc %0, %2 \n" \
5974+ post_op \
5975+ extable \
5976+ "4: " #asm_op " %0, %1, %3 \n" \
5977+ "5: \n" \
5978+ " .set mips0 \n" \
5979+ : "=&r" (result), "=&r" (temp), \
5980+ "+" GCC_OFF_SMALL_ASM() (v->counter) \
5981+ : "Ir" (i)); \
5982 \
5983 result = temp; result c_op i; \
5984 } else { \
5985 unsigned long flags; \
5986 \
5987 raw_local_irq_save(flags); \
5988- result = v->counter; \
5989- result c_op i; \
5990- v->counter = result; \
5991+ __asm__ __volatile__( \
5992+ " lw %0, %1 \n" \
5993+ "2: " #asm_op " %0, %1, %2 \n" \
5994+ " sw %0, %1 \n" \
5995+ "3: \n" \
5996+ extable \
5997+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5998+ : "Ir" (i)); \
5999 raw_local_irq_restore(flags); \
6000 } \
6001 \
6002@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
6003 return result; \
6004 }
6005
6006-#define ATOMIC_OPS(op, c_op, asm_op) \
6007- ATOMIC_OP(op, c_op, asm_op) \
6008- ATOMIC_OP_RETURN(op, c_op, asm_op)
6009+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6010+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6011
6012-ATOMIC_OPS(add, +=, addu)
6013-ATOMIC_OPS(sub, -=, subu)
6014+#define ATOMIC_OPS(op, asm_op) \
6015+ ATOMIC_OP(op, asm_op) \
6016+ ATOMIC_OP_RETURN(op, asm_op)
6017+
6018+ATOMIC_OPS(add, add)
6019+ATOMIC_OPS(sub, sub)
6020
6021 #undef ATOMIC_OPS
6022 #undef ATOMIC_OP_RETURN
6023+#undef __ATOMIC_OP_RETURN
6024 #undef ATOMIC_OP
6025+#undef __ATOMIC_OP
6026
6027 /*
6028 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
6029@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
6030 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6031 * The function returns the old value of @v minus @i.
6032 */
6033-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6034+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
6035 {
6036 int result;
6037
6038@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6039 int temp;
6040
6041 __asm__ __volatile__(
6042- " .set arch=r4000 \n"
6043+ " .set "MIPS_ISA_LEVEL" \n"
6044 "1: ll %1, %2 # atomic_sub_if_positive\n"
6045 " subu %0, %1, %3 \n"
6046 " bltz %0, 1f \n"
6047@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6048 return result;
6049 }
6050
6051-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
6052-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
6053+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
6054+{
6055+ return cmpxchg(&v->counter, old, new);
6056+}
6057+
6058+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
6059+ int new)
6060+{
6061+ return cmpxchg(&(v->counter), old, new);
6062+}
6063+
6064+static inline int atomic_xchg(atomic_t *v, int new)
6065+{
6066+ return xchg(&v->counter, new);
6067+}
6068+
6069+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6070+{
6071+ return xchg(&(v->counter), new);
6072+}
6073
6074 /**
6075 * __atomic_add_unless - add unless the number is a given value
6076@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6077
6078 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6079 #define atomic_inc_return(v) atomic_add_return(1, (v))
6080+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6081+{
6082+ return atomic_add_return_unchecked(1, v);
6083+}
6084
6085 /*
6086 * atomic_sub_and_test - subtract value from variable and test result
6087@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6088 * other cases.
6089 */
6090 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6091+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6092+{
6093+ return atomic_add_return_unchecked(1, v) == 0;
6094+}
6095
6096 /*
6097 * atomic_dec_and_test - decrement by 1 and test
6098@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6099 * Atomically increments @v by 1.
6100 */
6101 #define atomic_inc(v) atomic_add(1, (v))
6102+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6103+{
6104+ atomic_add_unchecked(1, v);
6105+}
6106
6107 /*
6108 * atomic_dec - decrement and test
6109@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6110 * Atomically decrements @v by 1.
6111 */
6112 #define atomic_dec(v) atomic_sub(1, (v))
6113+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6114+{
6115+ atomic_sub_unchecked(1, v);
6116+}
6117
6118 /*
6119 * atomic_add_negative - add and test if negative
6120@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6121 * @v: pointer of type atomic64_t
6122 *
6123 */
6124-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6125+static inline long atomic64_read(const atomic64_t *v)
6126+{
6127+ return ACCESS_ONCE(v->counter);
6128+}
6129+
6130+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6131+{
6132+ return ACCESS_ONCE(v->counter);
6133+}
6134
6135 /*
6136 * atomic64_set - set atomic variable
6137 * @v: pointer of type atomic64_t
6138 * @i: required value
6139 */
6140-#define atomic64_set(v, i) ((v)->counter = (i))
6141+static inline void atomic64_set(atomic64_t *v, long i)
6142+{
6143+ v->counter = i;
6144+}
6145
6146-#define ATOMIC64_OP(op, c_op, asm_op) \
6147-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6148+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6149+{
6150+ v->counter = i;
6151+}
6152+
6153+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6154+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6155 { \
6156 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6157 long temp; \
6158 \
6159 __asm__ __volatile__( \
6160- " .set arch=r4000 \n" \
6161- "1: lld %0, %1 # atomic64_" #op " \n" \
6162- " " #asm_op " %0, %2 \n" \
6163+ " .set "MIPS_ISA_LEVEL" \n" \
6164+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6165+ "2: " #asm_op " %0, %2 \n" \
6166 " scd %0, %1 \n" \
6167 " beqzl %0, 1b \n" \
6168+ extable \
6169 " .set mips0 \n" \
6170 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6171 : "Ir" (i)); \
6172 } else if (kernel_uses_llsc) { \
6173 long temp; \
6174 \
6175- do { \
6176- __asm__ __volatile__( \
6177- " .set "MIPS_ISA_LEVEL" \n" \
6178- " lld %0, %1 # atomic64_" #op "\n" \
6179- " " #asm_op " %0, %2 \n" \
6180- " scd %0, %1 \n" \
6181- " .set mips0 \n" \
6182- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6183- : "Ir" (i)); \
6184- } while (unlikely(!temp)); \
6185+ __asm__ __volatile__( \
6186+ " .set "MIPS_ISA_LEVEL" \n" \
6187+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6188+ "2: " #asm_op " %0, %2 \n" \
6189+ " scd %0, %1 \n" \
6190+ " beqz %0, 1b \n" \
6191+ extable \
6192+ " .set mips0 \n" \
6193+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6194+ : "Ir" (i)); \
6195 } else { \
6196 unsigned long flags; \
6197 \
6198 raw_local_irq_save(flags); \
6199- v->counter c_op i; \
6200+ __asm__ __volatile__( \
6201+ "2: " #asm_op " %0, %1 \n" \
6202+ extable \
6203+ : "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i)); \
6204 raw_local_irq_restore(flags); \
6205 } \
6206 }
6207
6208-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6209-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6210+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6211+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6212+
6213+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6214+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6215 { \
6216 long result; \
6217 \
6218@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6219 long temp; \
6220 \
6221 __asm__ __volatile__( \
6222- " .set arch=r4000 \n" \
6223+ " .set mips3 \n" \
6224 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6225- " " #asm_op " %0, %1, %3 \n" \
6226+ "2: " #asm_op " %0, %1, %3 \n" \
6227 " scd %0, %2 \n" \
6228 " beqzl %0, 1b \n" \
6229- " " #asm_op " %0, %1, %3 \n" \
6230+ post_op \
6231+ extable \
6232+ "4: " #asm_op " %0, %1, %3 \n" \
6233+ "5: \n" \
6234 " .set mips0 \n" \
6235 : "=&r" (result), "=&r" (temp), \
6236 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6237@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6238 } else if (kernel_uses_llsc) { \
6239 long temp; \
6240 \
6241- do { \
6242- __asm__ __volatile__( \
6243- " .set "MIPS_ISA_LEVEL" \n" \
6244- " lld %1, %2 # atomic64_" #op "_return\n" \
6245- " " #asm_op " %0, %1, %3 \n" \
6246- " scd %0, %2 \n" \
6247- " .set mips0 \n" \
6248- : "=&r" (result), "=&r" (temp), \
6249- "=" GCC_OFF_SMALL_ASM() (v->counter) \
6250- : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6251- : "memory"); \
6252- } while (unlikely(!result)); \
6253+ __asm__ __volatile__( \
6254+ " .set "MIPS_ISA_LEVEL" \n" \
6255+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6256+ "2: " #asm_op " %0, %1, %3 \n" \
6257+ " scd %0, %2 \n" \
6258+ " beqz %0, 1b \n" \
6259+ post_op \
6260+ extable \
6261+ "4: " #asm_op " %0, %1, %3 \n" \
6262+ "5: \n" \
6263+ " .set mips0 \n" \
6264+ : "=&r" (result), "=&r" (temp), \
6265+ "=" GCC_OFF_SMALL_ASM() (v->counter) \
6266+ : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6267+ : "memory"); \
6268 \
6269 result = temp; result c_op i; \
6270 } else { \
6271 unsigned long flags; \
6272 \
6273 raw_local_irq_save(flags); \
6274- result = v->counter; \
6275- result c_op i; \
6276- v->counter = result; \
6277+ __asm__ __volatile__( \
6278+ " ld %0, %1 \n" \
6279+ "2: " #asm_op " %0, %1, %2 \n" \
6280+ " sd %0, %1 \n" \
6281+ "3: \n" \
6282+ extable \
6283+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6284+ : "Ir" (i)); \
6285 raw_local_irq_restore(flags); \
6286 } \
6287 \
6288@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6289 return result; \
6290 }
6291
6292-#define ATOMIC64_OPS(op, c_op, asm_op) \
6293- ATOMIC64_OP(op, c_op, asm_op) \
6294- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6295+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6296+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6297
6298-ATOMIC64_OPS(add, +=, daddu)
6299-ATOMIC64_OPS(sub, -=, dsubu)
6300+#define ATOMIC64_OPS(op, asm_op) \
6301+ ATOMIC64_OP(op, asm_op) \
6302+ ATOMIC64_OP_RETURN(op, asm_op)
6303+
6304+ATOMIC64_OPS(add, dadd)
6305+ATOMIC64_OPS(sub, dsub)
6306
6307 #undef ATOMIC64_OPS
6308 #undef ATOMIC64_OP_RETURN
6309+#undef __ATOMIC64_OP_RETURN
6310 #undef ATOMIC64_OP
6311+#undef __ATOMIC64_OP
6312+#undef __OVERFLOW_EXTABLE
6313+#undef __OVERFLOW_POST
6314
6315 /*
6316 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6317@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6318 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6319 * The function returns the old value of @v minus @i.
6320 */
6321-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6322+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6323 {
6324 long result;
6325
6326@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6327 long temp;
6328
6329 __asm__ __volatile__(
6330- " .set arch=r4000 \n"
6331+ " .set "MIPS_ISA_LEVEL" \n"
6332 "1: lld %1, %2 # atomic64_sub_if_positive\n"
6333 " dsubu %0, %1, %3 \n"
6334 " bltz %0, 1f \n"
6335@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6336 return result;
6337 }
6338
6339-#define atomic64_cmpxchg(v, o, n) \
6340- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6341-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6342+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6343+{
6344+ return cmpxchg(&v->counter, old, new);
6345+}
6346+
6347+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6348+ long new)
6349+{
6350+ return cmpxchg(&(v->counter), old, new);
6351+}
6352+
6353+static inline long atomic64_xchg(atomic64_t *v, long new)
6354+{
6355+ return xchg(&v->counter, new);
6356+}
6357+
6358+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6359+{
6360+ return xchg(&(v->counter), new);
6361+}
6362
6363 /**
6364 * atomic64_add_unless - add unless the number is a given value
6365@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6366
6367 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6368 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6369+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6370
6371 /*
6372 * atomic64_sub_and_test - subtract value from variable and test result
6373@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6374 * other cases.
6375 */
6376 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6377+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6378
6379 /*
6380 * atomic64_dec_and_test - decrement by 1 and test
6381@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6382 * Atomically increments @v by 1.
6383 */
6384 #define atomic64_inc(v) atomic64_add(1, (v))
6385+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6386
6387 /*
6388 * atomic64_dec - decrement and test
6389@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6390 * Atomically decrements @v by 1.
6391 */
6392 #define atomic64_dec(v) atomic64_sub(1, (v))
6393+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6394
6395 /*
6396 * atomic64_add_negative - add and test if negative
6397diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6398index 2b8bbbc..4556df6 100644
6399--- a/arch/mips/include/asm/barrier.h
6400+++ b/arch/mips/include/asm/barrier.h
6401@@ -133,7 +133,7 @@
6402 do { \
6403 compiletime_assert_atomic_type(*p); \
6404 smp_mb(); \
6405- ACCESS_ONCE(*p) = (v); \
6406+ ACCESS_ONCE_RW(*p) = (v); \
6407 } while (0)
6408
6409 #define smp_load_acquire(p) \
6410diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6411index b4db69f..8f3b093 100644
6412--- a/arch/mips/include/asm/cache.h
6413+++ b/arch/mips/include/asm/cache.h
6414@@ -9,10 +9,11 @@
6415 #ifndef _ASM_CACHE_H
6416 #define _ASM_CACHE_H
6417
6418+#include <linux/const.h>
6419 #include <kmalloc.h>
6420
6421 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6422-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6423+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6424
6425 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6426 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6427diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6428index f19e890..a4f8177 100644
6429--- a/arch/mips/include/asm/elf.h
6430+++ b/arch/mips/include/asm/elf.h
6431@@ -417,6 +417,13 @@ extern const char *__elf_platform;
6432 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6433 #endif
6434
6435+#ifdef CONFIG_PAX_ASLR
6436+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6437+
6438+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6439+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6440+#endif
6441+
6442 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6443 struct linux_binprm;
6444 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6445diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6446index c1f6afa..38cc6e9 100644
6447--- a/arch/mips/include/asm/exec.h
6448+++ b/arch/mips/include/asm/exec.h
6449@@ -12,6 +12,6 @@
6450 #ifndef _ASM_EXEC_H
6451 #define _ASM_EXEC_H
6452
6453-extern unsigned long arch_align_stack(unsigned long sp);
6454+#define arch_align_stack(x) ((x) & ~0xfUL)
6455
6456 #endif /* _ASM_EXEC_H */
6457diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6458index 9e8ef59..1139d6b 100644
6459--- a/arch/mips/include/asm/hw_irq.h
6460+++ b/arch/mips/include/asm/hw_irq.h
6461@@ -10,7 +10,7 @@
6462
6463 #include <linux/atomic.h>
6464
6465-extern atomic_t irq_err_count;
6466+extern atomic_unchecked_t irq_err_count;
6467
6468 /*
6469 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6470diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6471index 8feaed6..1bd8a64 100644
6472--- a/arch/mips/include/asm/local.h
6473+++ b/arch/mips/include/asm/local.h
6474@@ -13,15 +13,25 @@ typedef struct
6475 atomic_long_t a;
6476 } local_t;
6477
6478+typedef struct {
6479+ atomic_long_unchecked_t a;
6480+} local_unchecked_t;
6481+
6482 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6483
6484 #define local_read(l) atomic_long_read(&(l)->a)
6485+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6486 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6487+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6488
6489 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6490+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6491 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6492+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6493 #define local_inc(l) atomic_long_inc(&(l)->a)
6494+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6495 #define local_dec(l) atomic_long_dec(&(l)->a)
6496+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6497
6498 /*
6499 * Same as above, but return the result value
6500@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6501 return result;
6502 }
6503
6504+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6505+{
6506+ unsigned long result;
6507+
6508+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6509+ unsigned long temp;
6510+
6511+ __asm__ __volatile__(
6512+ " .set mips3 \n"
6513+ "1:" __LL "%1, %2 # local_add_return \n"
6514+ " addu %0, %1, %3 \n"
6515+ __SC "%0, %2 \n"
6516+ " beqzl %0, 1b \n"
6517+ " addu %0, %1, %3 \n"
6518+ " .set mips0 \n"
6519+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6520+ : "Ir" (i), "m" (l->a.counter)
6521+ : "memory");
6522+ } else if (kernel_uses_llsc) {
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+ " beqz %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 {
6537+ unsigned long flags;
6538+
6539+ local_irq_save(flags);
6540+ result = l->a.counter;
6541+ result += i;
6542+ l->a.counter = result;
6543+ local_irq_restore(flags);
6544+ }
6545+
6546+ return result;
6547+}
6548+
6549 static __inline__ long local_sub_return(long i, local_t * l)
6550 {
6551 unsigned long result;
6552@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6553
6554 #define local_cmpxchg(l, o, n) \
6555 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6556+#define local_cmpxchg_unchecked(l, o, n) \
6557+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6558 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6559
6560 /**
6561diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6562index 89dd7fe..a123c97 100644
6563--- a/arch/mips/include/asm/page.h
6564+++ b/arch/mips/include/asm/page.h
6565@@ -118,7 +118,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6566 #ifdef CONFIG_CPU_MIPS32
6567 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6568 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6569- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6570+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6571 #else
6572 typedef struct { unsigned long long pte; } pte_t;
6573 #define pte_val(x) ((x).pte)
6574diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6575index b336037..5b874cc 100644
6576--- a/arch/mips/include/asm/pgalloc.h
6577+++ b/arch/mips/include/asm/pgalloc.h
6578@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6579 {
6580 set_pud(pud, __pud((unsigned long)pmd));
6581 }
6582+
6583+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6584+{
6585+ pud_populate(mm, pud, pmd);
6586+}
6587 #endif
6588
6589 /*
6590diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6591index 70f6e7f..11f4ada 100644
6592--- a/arch/mips/include/asm/pgtable.h
6593+++ b/arch/mips/include/asm/pgtable.h
6594@@ -20,6 +20,9 @@
6595 #include <asm/io.h>
6596 #include <asm/pgtable-bits.h>
6597
6598+#define ktla_ktva(addr) (addr)
6599+#define ktva_ktla(addr) (addr)
6600+
6601 struct mm_struct;
6602 struct vm_area_struct;
6603
6604diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6605index 9c0014e..5101ef5 100644
6606--- a/arch/mips/include/asm/thread_info.h
6607+++ b/arch/mips/include/asm/thread_info.h
6608@@ -100,6 +100,9 @@ static inline struct thread_info *current_thread_info(void)
6609 #define TIF_SECCOMP 4 /* secure computing */
6610 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6611 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6612+/* li takes a 32bit immediate */
6613+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6614+
6615 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6616 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6617 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6618@@ -135,14 +138,16 @@ static inline struct thread_info *current_thread_info(void)
6619 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6620 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6621 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6622+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6623
6624 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6625 _TIF_SYSCALL_AUDIT | \
6626- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6627+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6628+ _TIF_GRSEC_SETXID)
6629
6630 /* work to do in syscall_trace_leave() */
6631 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6632- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6633+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6634
6635 /* work to do on interrupt/exception return */
6636 #define _TIF_WORK_MASK \
6637@@ -150,7 +155,7 @@ static inline struct thread_info *current_thread_info(void)
6638 /* work to do on any return to u-space */
6639 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6640 _TIF_WORK_SYSCALL_EXIT | \
6641- _TIF_SYSCALL_TRACEPOINT)
6642+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6643
6644 /*
6645 * We stash processor id into a COP0 register to retrieve it fast
6646diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6647index bf8b324..cec5705 100644
6648--- a/arch/mips/include/asm/uaccess.h
6649+++ b/arch/mips/include/asm/uaccess.h
6650@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6651 __ok == 0; \
6652 })
6653
6654+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6655 #define access_ok(type, addr, size) \
6656 likely(__access_ok((addr), (size), __access_mask))
6657
6658diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6659index 1188e00..41cf144 100644
6660--- a/arch/mips/kernel/binfmt_elfn32.c
6661+++ b/arch/mips/kernel/binfmt_elfn32.c
6662@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6663 #undef ELF_ET_DYN_BASE
6664 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6665
6666+#ifdef CONFIG_PAX_ASLR
6667+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6668+
6669+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6670+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6671+#endif
6672+
6673 #include <asm/processor.h>
6674 #include <linux/module.h>
6675 #include <linux/elfcore.h>
6676diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6677index 9287678..f870e47 100644
6678--- a/arch/mips/kernel/binfmt_elfo32.c
6679+++ b/arch/mips/kernel/binfmt_elfo32.c
6680@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6681 #undef ELF_ET_DYN_BASE
6682 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6683
6684+#ifdef CONFIG_PAX_ASLR
6685+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6686+
6687+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6688+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6689+#endif
6690+
6691 #include <asm/processor.h>
6692
6693 #include <linux/module.h>
6694diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6695index a74ec3a..4f06f18 100644
6696--- a/arch/mips/kernel/i8259.c
6697+++ b/arch/mips/kernel/i8259.c
6698@@ -202,7 +202,7 @@ spurious_8259A_irq:
6699 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6700 spurious_irq_mask |= irqmask;
6701 }
6702- atomic_inc(&irq_err_count);
6703+ atomic_inc_unchecked(&irq_err_count);
6704 /*
6705 * Theoretically we do not have to handle this IRQ,
6706 * but in Linux this does not cause problems and is
6707diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6708index 44a1f79..2bd6aa3 100644
6709--- a/arch/mips/kernel/irq-gt641xx.c
6710+++ b/arch/mips/kernel/irq-gt641xx.c
6711@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6712 }
6713 }
6714
6715- atomic_inc(&irq_err_count);
6716+ atomic_inc_unchecked(&irq_err_count);
6717 }
6718
6719 void __init gt641xx_irq_init(void)
6720diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6721index 3c8a18a..b4929b6 100644
6722--- a/arch/mips/kernel/irq.c
6723+++ b/arch/mips/kernel/irq.c
6724@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6725 printk("unexpected IRQ # %d\n", irq);
6726 }
6727
6728-atomic_t irq_err_count;
6729+atomic_unchecked_t irq_err_count;
6730
6731 int arch_show_interrupts(struct seq_file *p, int prec)
6732 {
6733- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6734+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6735 return 0;
6736 }
6737
6738 asmlinkage void spurious_interrupt(void)
6739 {
6740- atomic_inc(&irq_err_count);
6741+ atomic_inc_unchecked(&irq_err_count);
6742 }
6743
6744 void __init init_IRQ(void)
6745@@ -110,6 +110,8 @@ void __init init_IRQ(void)
6746 }
6747
6748 #ifdef CONFIG_DEBUG_STACKOVERFLOW
6749+
6750+extern void gr_handle_kernel_exploit(void);
6751 static inline void check_stack_overflow(void)
6752 {
6753 unsigned long sp;
6754@@ -125,6 +127,7 @@ static inline void check_stack_overflow(void)
6755 printk("do_IRQ: stack overflow: %ld\n",
6756 sp - sizeof(struct thread_info));
6757 dump_stack();
6758+ gr_handle_kernel_exploit();
6759 }
6760 }
6761 #else
6762diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6763index 0614717..002fa43 100644
6764--- a/arch/mips/kernel/pm-cps.c
6765+++ b/arch/mips/kernel/pm-cps.c
6766@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6767 nc_core_ready_count = nc_addr;
6768
6769 /* Ensure ready_count is zero-initialised before the assembly runs */
6770- ACCESS_ONCE(*nc_core_ready_count) = 0;
6771+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6772 coupled_barrier(&per_cpu(pm_barrier, core), online);
6773
6774 /* Run the generated entry code */
6775diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6776index f2975d4..f61d355 100644
6777--- a/arch/mips/kernel/process.c
6778+++ b/arch/mips/kernel/process.c
6779@@ -541,18 +541,6 @@ out:
6780 return pc;
6781 }
6782
6783-/*
6784- * Don't forget that the stack pointer must be aligned on a 8 bytes
6785- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6786- */
6787-unsigned long arch_align_stack(unsigned long sp)
6788-{
6789- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6790- sp -= get_random_int() & ~PAGE_MASK;
6791-
6792- return sp & ALMASK;
6793-}
6794-
6795 static void arch_dump_stack(void *info)
6796 {
6797 struct pt_regs *regs;
6798diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6799index e933a30..0d02625 100644
6800--- a/arch/mips/kernel/ptrace.c
6801+++ b/arch/mips/kernel/ptrace.c
6802@@ -785,6 +785,10 @@ long arch_ptrace(struct task_struct *child, long request,
6803 return ret;
6804 }
6805
6806+#ifdef CONFIG_GRKERNSEC_SETXID
6807+extern void gr_delayed_cred_worker(void);
6808+#endif
6809+
6810 /*
6811 * Notification of system call entry/exit
6812 * - triggered by current->work.syscall_trace
6813@@ -803,6 +807,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6814 tracehook_report_syscall_entry(regs))
6815 ret = -1;
6816
6817+#ifdef CONFIG_GRKERNSEC_SETXID
6818+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6819+ gr_delayed_cred_worker();
6820+#endif
6821+
6822 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6823 trace_sys_enter(regs, regs->regs[2]);
6824
6825diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6826index 2242bdd..b284048 100644
6827--- a/arch/mips/kernel/sync-r4k.c
6828+++ b/arch/mips/kernel/sync-r4k.c
6829@@ -18,8 +18,8 @@
6830 #include <asm/mipsregs.h>
6831
6832 static atomic_t count_start_flag = ATOMIC_INIT(0);
6833-static atomic_t count_count_start = ATOMIC_INIT(0);
6834-static atomic_t count_count_stop = ATOMIC_INIT(0);
6835+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6836+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6837 static atomic_t count_reference = ATOMIC_INIT(0);
6838
6839 #define COUNTON 100
6840@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6841
6842 for (i = 0; i < NR_LOOPS; i++) {
6843 /* slaves loop on '!= 2' */
6844- while (atomic_read(&count_count_start) != 1)
6845+ while (atomic_read_unchecked(&count_count_start) != 1)
6846 mb();
6847- atomic_set(&count_count_stop, 0);
6848+ atomic_set_unchecked(&count_count_stop, 0);
6849 smp_wmb();
6850
6851 /* this lets the slaves write their count register */
6852- atomic_inc(&count_count_start);
6853+ atomic_inc_unchecked(&count_count_start);
6854
6855 /*
6856 * Everyone initialises count in the last loop:
6857@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6858 /*
6859 * Wait for all slaves to leave the synchronization point:
6860 */
6861- while (atomic_read(&count_count_stop) != 1)
6862+ while (atomic_read_unchecked(&count_count_stop) != 1)
6863 mb();
6864- atomic_set(&count_count_start, 0);
6865+ atomic_set_unchecked(&count_count_start, 0);
6866 smp_wmb();
6867- atomic_inc(&count_count_stop);
6868+ atomic_inc_unchecked(&count_count_stop);
6869 }
6870 /* Arrange for an interrupt in a short while */
6871 write_c0_compare(read_c0_count() + COUNTON);
6872@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6873 initcount = atomic_read(&count_reference);
6874
6875 for (i = 0; i < NR_LOOPS; i++) {
6876- atomic_inc(&count_count_start);
6877- while (atomic_read(&count_count_start) != 2)
6878+ atomic_inc_unchecked(&count_count_start);
6879+ while (atomic_read_unchecked(&count_count_start) != 2)
6880 mb();
6881
6882 /*
6883@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6884 if (i == NR_LOOPS-1)
6885 write_c0_count(initcount);
6886
6887- atomic_inc(&count_count_stop);
6888- while (atomic_read(&count_count_stop) != 2)
6889+ atomic_inc_unchecked(&count_count_stop);
6890+ while (atomic_read_unchecked(&count_count_stop) != 2)
6891 mb();
6892 }
6893 /* Arrange for an interrupt in a short while */
6894diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6895index 5f5f44e..cf10625 100644
6896--- a/arch/mips/kernel/traps.c
6897+++ b/arch/mips/kernel/traps.c
6898@@ -696,7 +696,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6899 siginfo_t info;
6900
6901 prev_state = exception_enter();
6902- die_if_kernel("Integer overflow", regs);
6903+ if (unlikely(!user_mode(regs))) {
6904+
6905+#ifdef CONFIG_PAX_REFCOUNT
6906+ if (fixup_exception(regs)) {
6907+ pax_report_refcount_overflow(regs);
6908+ exception_exit(prev_state);
6909+ return;
6910+ }
6911+#endif
6912+
6913+ die("Integer overflow", regs);
6914+ }
6915
6916 info.si_code = FPE_INTOVF;
6917 info.si_signo = SIGFPE;
6918diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6919index 52f205a..335927c 100644
6920--- a/arch/mips/kvm/mips.c
6921+++ b/arch/mips/kvm/mips.c
6922@@ -1013,7 +1013,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6923 return r;
6924 }
6925
6926-int kvm_arch_init(void *opaque)
6927+int kvm_arch_init(const void *opaque)
6928 {
6929 if (kvm_mips_callbacks) {
6930 kvm_err("kvm: module already exists\n");
6931diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6932index 7ff8637..6004edb 100644
6933--- a/arch/mips/mm/fault.c
6934+++ b/arch/mips/mm/fault.c
6935@@ -31,6 +31,23 @@
6936
6937 int show_unhandled_signals = 1;
6938
6939+#ifdef CONFIG_PAX_PAGEEXEC
6940+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6941+{
6942+ unsigned long i;
6943+
6944+ printk(KERN_ERR "PAX: bytes at PC: ");
6945+ for (i = 0; i < 5; i++) {
6946+ unsigned int c;
6947+ if (get_user(c, (unsigned int *)pc+i))
6948+ printk(KERN_CONT "???????? ");
6949+ else
6950+ printk(KERN_CONT "%08x ", c);
6951+ }
6952+ printk("\n");
6953+}
6954+#endif
6955+
6956 /*
6957 * This routine handles page faults. It determines the address,
6958 * and the problem, and then passes it off to one of the appropriate
6959@@ -206,6 +223,14 @@ bad_area:
6960 bad_area_nosemaphore:
6961 /* User mode accesses just cause a SIGSEGV */
6962 if (user_mode(regs)) {
6963+
6964+#ifdef CONFIG_PAX_PAGEEXEC
6965+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6966+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6967+ do_group_exit(SIGKILL);
6968+ }
6969+#endif
6970+
6971 tsk->thread.cp0_badvaddr = address;
6972 tsk->thread.error_code = write;
6973 if (show_unhandled_signals &&
6974diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6975index 5c81fdd..db158d3 100644
6976--- a/arch/mips/mm/mmap.c
6977+++ b/arch/mips/mm/mmap.c
6978@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6979 struct vm_area_struct *vma;
6980 unsigned long addr = addr0;
6981 int do_color_align;
6982+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6983 struct vm_unmapped_area_info info;
6984
6985 if (unlikely(len > TASK_SIZE))
6986@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6987 do_color_align = 1;
6988
6989 /* requesting a specific address */
6990+
6991+#ifdef CONFIG_PAX_RANDMMAP
6992+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6993+#endif
6994+
6995 if (addr) {
6996 if (do_color_align)
6997 addr = COLOUR_ALIGN(addr, pgoff);
6998@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6999 addr = PAGE_ALIGN(addr);
7000
7001 vma = find_vma(mm, addr);
7002- if (TASK_SIZE - len >= addr &&
7003- (!vma || addr + len <= vma->vm_start))
7004+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7005 return addr;
7006 }
7007
7008 info.length = len;
7009 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
7010 info.align_offset = pgoff << PAGE_SHIFT;
7011+ info.threadstack_offset = offset;
7012
7013 if (dir == DOWN) {
7014 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
7015@@ -160,45 +166,34 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7016 {
7017 unsigned long random_factor = 0UL;
7018
7019+#ifdef CONFIG_PAX_RANDMMAP
7020+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7021+#endif
7022+
7023 if (current->flags & PF_RANDOMIZE)
7024 random_factor = arch_mmap_rnd();
7025
7026 if (mmap_is_legacy()) {
7027 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7028+
7029+#ifdef CONFIG_PAX_RANDMMAP
7030+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7031+ mm->mmap_base += mm->delta_mmap;
7032+#endif
7033+
7034 mm->get_unmapped_area = arch_get_unmapped_area;
7035 } else {
7036 mm->mmap_base = mmap_base(random_factor);
7037+
7038+#ifdef CONFIG_PAX_RANDMMAP
7039+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7040+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7041+#endif
7042+
7043 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7044 }
7045 }
7046
7047-static inline unsigned long brk_rnd(void)
7048-{
7049- unsigned long rnd = get_random_int();
7050-
7051- rnd = rnd << PAGE_SHIFT;
7052- /* 8MB for 32bit, 256MB for 64bit */
7053- if (TASK_IS_32BIT_ADDR)
7054- rnd = rnd & 0x7ffffful;
7055- else
7056- rnd = rnd & 0xffffffful;
7057-
7058- return rnd;
7059-}
7060-
7061-unsigned long arch_randomize_brk(struct mm_struct *mm)
7062-{
7063- unsigned long base = mm->brk;
7064- unsigned long ret;
7065-
7066- ret = PAGE_ALIGN(base + brk_rnd());
7067-
7068- if (ret < mm->brk)
7069- return mm->brk;
7070-
7071- return ret;
7072-}
7073-
7074 int __virt_addr_valid(const volatile void *kaddr)
7075 {
7076 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7077diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7078index a2358b4..7cead4f 100644
7079--- a/arch/mips/sgi-ip27/ip27-nmi.c
7080+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7081@@ -187,9 +187,9 @@ void
7082 cont_nmi_dump(void)
7083 {
7084 #ifndef REAL_NMI_SIGNAL
7085- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7086+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7087
7088- atomic_inc(&nmied_cpus);
7089+ atomic_inc_unchecked(&nmied_cpus);
7090 #endif
7091 /*
7092 * Only allow 1 cpu to proceed
7093@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7094 udelay(10000);
7095 }
7096 #else
7097- while (atomic_read(&nmied_cpus) != num_online_cpus());
7098+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7099 #endif
7100
7101 /*
7102diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7103index a046b30..6799527 100644
7104--- a/arch/mips/sni/rm200.c
7105+++ b/arch/mips/sni/rm200.c
7106@@ -270,7 +270,7 @@ spurious_8259A_irq:
7107 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7108 spurious_irq_mask |= irqmask;
7109 }
7110- atomic_inc(&irq_err_count);
7111+ atomic_inc_unchecked(&irq_err_count);
7112 /*
7113 * Theoretically we do not have to handle this IRQ,
7114 * but in Linux this does not cause problems and is
7115diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7116index 41e873b..34d33a7 100644
7117--- a/arch/mips/vr41xx/common/icu.c
7118+++ b/arch/mips/vr41xx/common/icu.c
7119@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7120
7121 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7122
7123- atomic_inc(&irq_err_count);
7124+ atomic_inc_unchecked(&irq_err_count);
7125
7126 return -1;
7127 }
7128diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7129index ae0e4ee..e8f0692 100644
7130--- a/arch/mips/vr41xx/common/irq.c
7131+++ b/arch/mips/vr41xx/common/irq.c
7132@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7133 irq_cascade_t *cascade;
7134
7135 if (irq >= NR_IRQS) {
7136- atomic_inc(&irq_err_count);
7137+ atomic_inc_unchecked(&irq_err_count);
7138 return;
7139 }
7140
7141@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7142 ret = cascade->get_irq(irq);
7143 irq = ret;
7144 if (ret < 0)
7145- atomic_inc(&irq_err_count);
7146+ atomic_inc_unchecked(&irq_err_count);
7147 else
7148 irq_dispatch(irq);
7149 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7150diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7151index 967d144..db12197 100644
7152--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7153+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7154@@ -11,12 +11,14 @@
7155 #ifndef _ASM_PROC_CACHE_H
7156 #define _ASM_PROC_CACHE_H
7157
7158+#include <linux/const.h>
7159+
7160 /* L1 cache */
7161
7162 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7163 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7164-#define L1_CACHE_BYTES 16 /* bytes per entry */
7165 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7166+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7167 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7168
7169 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7170diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7171index bcb5df2..84fabd2 100644
7172--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7173+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7174@@ -16,13 +16,15 @@
7175 #ifndef _ASM_PROC_CACHE_H
7176 #define _ASM_PROC_CACHE_H
7177
7178+#include <linux/const.h>
7179+
7180 /*
7181 * L1 cache
7182 */
7183 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7184 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7185-#define L1_CACHE_BYTES 32 /* bytes per entry */
7186 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7187+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7188 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7189
7190 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7191diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7192index 4ce7a01..449202a 100644
7193--- a/arch/openrisc/include/asm/cache.h
7194+++ b/arch/openrisc/include/asm/cache.h
7195@@ -19,11 +19,13 @@
7196 #ifndef __ASM_OPENRISC_CACHE_H
7197 #define __ASM_OPENRISC_CACHE_H
7198
7199+#include <linux/const.h>
7200+
7201 /* FIXME: How can we replace these with values from the CPU...
7202 * they shouldn't be hard-coded!
7203 */
7204
7205-#define L1_CACHE_BYTES 16
7206 #define L1_CACHE_SHIFT 4
7207+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7208
7209 #endif /* __ASM_OPENRISC_CACHE_H */
7210diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7211index 226f8ca9..9d9b87d 100644
7212--- a/arch/parisc/include/asm/atomic.h
7213+++ b/arch/parisc/include/asm/atomic.h
7214@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7215 return dec;
7216 }
7217
7218+#define atomic64_read_unchecked(v) atomic64_read(v)
7219+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7220+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7221+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7222+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7223+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7224+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7225+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7226+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7227+
7228 #endif /* !CONFIG_64BIT */
7229
7230
7231diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7232index 47f11c7..3420df2 100644
7233--- a/arch/parisc/include/asm/cache.h
7234+++ b/arch/parisc/include/asm/cache.h
7235@@ -5,6 +5,7 @@
7236 #ifndef __ARCH_PARISC_CACHE_H
7237 #define __ARCH_PARISC_CACHE_H
7238
7239+#include <linux/const.h>
7240
7241 /*
7242 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7243@@ -15,13 +16,13 @@
7244 * just ruin performance.
7245 */
7246 #ifdef CONFIG_PA20
7247-#define L1_CACHE_BYTES 64
7248 #define L1_CACHE_SHIFT 6
7249 #else
7250-#define L1_CACHE_BYTES 32
7251 #define L1_CACHE_SHIFT 5
7252 #endif
7253
7254+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7255+
7256 #ifndef __ASSEMBLY__
7257
7258 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7259diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7260index 78c9fd3..42fa66a 100644
7261--- a/arch/parisc/include/asm/elf.h
7262+++ b/arch/parisc/include/asm/elf.h
7263@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7264
7265 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7266
7267+#ifdef CONFIG_PAX_ASLR
7268+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7269+
7270+#define PAX_DELTA_MMAP_LEN 16
7271+#define PAX_DELTA_STACK_LEN 16
7272+#endif
7273+
7274 /* This yields a mask that user programs can use to figure out what
7275 instruction set this CPU supports. This could be done in user space,
7276 but it's not easy, and we've already done it here. */
7277diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7278index 3edbb9f..08fef28 100644
7279--- a/arch/parisc/include/asm/pgalloc.h
7280+++ b/arch/parisc/include/asm/pgalloc.h
7281@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7282 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7283 }
7284
7285+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7286+{
7287+ pgd_populate(mm, pgd, pmd);
7288+}
7289+
7290 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7291 {
7292 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7293@@ -97,6 +102,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7294 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7295 #define pmd_free(mm, x) do { } while (0)
7296 #define pgd_populate(mm, pmd, pte) BUG()
7297+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7298
7299 #endif
7300
7301diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7302index f93c4a4..cfd5663 100644
7303--- a/arch/parisc/include/asm/pgtable.h
7304+++ b/arch/parisc/include/asm/pgtable.h
7305@@ -231,6 +231,17 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
7306 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7307 #define PAGE_COPY PAGE_EXECREAD
7308 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7309+
7310+#ifdef CONFIG_PAX_PAGEEXEC
7311+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7312+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7313+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7314+#else
7315+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7316+# define PAGE_COPY_NOEXEC PAGE_COPY
7317+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7318+#endif
7319+
7320 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7321 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7322 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7323diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7324index 0abdd4c..1af92f0 100644
7325--- a/arch/parisc/include/asm/uaccess.h
7326+++ b/arch/parisc/include/asm/uaccess.h
7327@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7328 const void __user *from,
7329 unsigned long n)
7330 {
7331- int sz = __compiletime_object_size(to);
7332+ size_t sz = __compiletime_object_size(to);
7333 int ret = -EFAULT;
7334
7335- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7336+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7337 ret = __copy_from_user(to, from, n);
7338 else
7339 copy_from_user_overflow();
7340diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7341index 3c63a82..b1d6ee9 100644
7342--- a/arch/parisc/kernel/module.c
7343+++ b/arch/parisc/kernel/module.c
7344@@ -98,16 +98,38 @@
7345
7346 /* three functions to determine where in the module core
7347 * or init pieces the location is */
7348+static inline int in_init_rx(struct module *me, void *loc)
7349+{
7350+ return (loc >= me->module_init_rx &&
7351+ loc < (me->module_init_rx + me->init_size_rx));
7352+}
7353+
7354+static inline int in_init_rw(struct module *me, void *loc)
7355+{
7356+ return (loc >= me->module_init_rw &&
7357+ loc < (me->module_init_rw + me->init_size_rw));
7358+}
7359+
7360 static inline int in_init(struct module *me, void *loc)
7361 {
7362- return (loc >= me->module_init &&
7363- loc <= (me->module_init + me->init_size));
7364+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7365+}
7366+
7367+static inline int in_core_rx(struct module *me, void *loc)
7368+{
7369+ return (loc >= me->module_core_rx &&
7370+ loc < (me->module_core_rx + me->core_size_rx));
7371+}
7372+
7373+static inline int in_core_rw(struct module *me, void *loc)
7374+{
7375+ return (loc >= me->module_core_rw &&
7376+ loc < (me->module_core_rw + me->core_size_rw));
7377 }
7378
7379 static inline int in_core(struct module *me, void *loc)
7380 {
7381- return (loc >= me->module_core &&
7382- loc <= (me->module_core + me->core_size));
7383+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7384 }
7385
7386 static inline int in_local(struct module *me, void *loc)
7387@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7388 }
7389
7390 /* align things a bit */
7391- me->core_size = ALIGN(me->core_size, 16);
7392- me->arch.got_offset = me->core_size;
7393- me->core_size += gots * sizeof(struct got_entry);
7394+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7395+ me->arch.got_offset = me->core_size_rw;
7396+ me->core_size_rw += gots * sizeof(struct got_entry);
7397
7398- me->core_size = ALIGN(me->core_size, 16);
7399- me->arch.fdesc_offset = me->core_size;
7400- me->core_size += fdescs * sizeof(Elf_Fdesc);
7401+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7402+ me->arch.fdesc_offset = me->core_size_rw;
7403+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7404
7405 me->arch.got_max = gots;
7406 me->arch.fdesc_max = fdescs;
7407@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7408
7409 BUG_ON(value == 0);
7410
7411- got = me->module_core + me->arch.got_offset;
7412+ got = me->module_core_rw + me->arch.got_offset;
7413 for (i = 0; got[i].addr; i++)
7414 if (got[i].addr == value)
7415 goto out;
7416@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7417 #ifdef CONFIG_64BIT
7418 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7419 {
7420- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7421+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7422
7423 if (!value) {
7424 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7425@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7426
7427 /* Create new one */
7428 fdesc->addr = value;
7429- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7430+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7431 return (Elf_Addr)fdesc;
7432 }
7433 #endif /* CONFIG_64BIT */
7434@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7435
7436 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7437 end = table + sechdrs[me->arch.unwind_section].sh_size;
7438- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7439+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7440
7441 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7442 me->arch.unwind_section, table, end, gp);
7443diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7444index 5aba01a..47cdd5a 100644
7445--- a/arch/parisc/kernel/sys_parisc.c
7446+++ b/arch/parisc/kernel/sys_parisc.c
7447@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7448 unsigned long task_size = TASK_SIZE;
7449 int do_color_align, last_mmap;
7450 struct vm_unmapped_area_info info;
7451+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7452
7453 if (len > task_size)
7454 return -ENOMEM;
7455@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7456 goto found_addr;
7457 }
7458
7459+#ifdef CONFIG_PAX_RANDMMAP
7460+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7461+#endif
7462+
7463 if (addr) {
7464 if (do_color_align && last_mmap)
7465 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7466@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7467 info.high_limit = mmap_upper_limit();
7468 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7469 info.align_offset = shared_align_offset(last_mmap, pgoff);
7470+ info.threadstack_offset = offset;
7471 addr = vm_unmapped_area(&info);
7472
7473 found_addr:
7474@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7475 unsigned long addr = addr0;
7476 int do_color_align, last_mmap;
7477 struct vm_unmapped_area_info info;
7478+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7479
7480 #ifdef CONFIG_64BIT
7481 /* This should only ever run for 32-bit processes. */
7482@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7483 }
7484
7485 /* requesting a specific address */
7486+#ifdef CONFIG_PAX_RANDMMAP
7487+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7488+#endif
7489+
7490 if (addr) {
7491 if (do_color_align && last_mmap)
7492 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7493@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7494 info.high_limit = mm->mmap_base;
7495 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7496 info.align_offset = shared_align_offset(last_mmap, pgoff);
7497+ info.threadstack_offset = offset;
7498 addr = vm_unmapped_area(&info);
7499 if (!(addr & ~PAGE_MASK))
7500 goto found_addr;
7501@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7502 mm->mmap_legacy_base = mmap_legacy_base();
7503 mm->mmap_base = mmap_upper_limit();
7504
7505+#ifdef CONFIG_PAX_RANDMMAP
7506+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7507+ mm->mmap_legacy_base += mm->delta_mmap;
7508+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7509+ }
7510+#endif
7511+
7512 if (mmap_is_legacy()) {
7513 mm->mmap_base = mm->mmap_legacy_base;
7514 mm->get_unmapped_area = arch_get_unmapped_area;
7515diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7516index 7f67c4c..d85c11d 100644
7517--- a/arch/parisc/kernel/traps.c
7518+++ b/arch/parisc/kernel/traps.c
7519@@ -722,9 +722,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7520
7521 down_read(&current->mm->mmap_sem);
7522 vma = find_vma(current->mm,regs->iaoq[0]);
7523- if (vma && (regs->iaoq[0] >= vma->vm_start)
7524- && (vma->vm_flags & VM_EXEC)) {
7525-
7526+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7527 fault_address = regs->iaoq[0];
7528 fault_space = regs->iasq[0];
7529
7530diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7531index e5120e6..8ddb5cc 100644
7532--- a/arch/parisc/mm/fault.c
7533+++ b/arch/parisc/mm/fault.c
7534@@ -15,6 +15,7 @@
7535 #include <linux/sched.h>
7536 #include <linux/interrupt.h>
7537 #include <linux/module.h>
7538+#include <linux/unistd.h>
7539
7540 #include <asm/uaccess.h>
7541 #include <asm/traps.h>
7542@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7543 static unsigned long
7544 parisc_acctyp(unsigned long code, unsigned int inst)
7545 {
7546- if (code == 6 || code == 16)
7547+ if (code == 6 || code == 7 || code == 16)
7548 return VM_EXEC;
7549
7550 switch (inst & 0xf0000000) {
7551@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7552 }
7553 #endif
7554
7555+#ifdef CONFIG_PAX_PAGEEXEC
7556+/*
7557+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7558+ *
7559+ * returns 1 when task should be killed
7560+ * 2 when rt_sigreturn trampoline was detected
7561+ * 3 when unpatched PLT trampoline was detected
7562+ */
7563+static int pax_handle_fetch_fault(struct pt_regs *regs)
7564+{
7565+
7566+#ifdef CONFIG_PAX_EMUPLT
7567+ int err;
7568+
7569+ do { /* PaX: unpatched PLT emulation */
7570+ unsigned int bl, depwi;
7571+
7572+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7573+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7574+
7575+ if (err)
7576+ break;
7577+
7578+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7579+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7580+
7581+ err = get_user(ldw, (unsigned int *)addr);
7582+ err |= get_user(bv, (unsigned int *)(addr+4));
7583+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7584+
7585+ if (err)
7586+ break;
7587+
7588+ if (ldw == 0x0E801096U &&
7589+ bv == 0xEAC0C000U &&
7590+ ldw2 == 0x0E881095U)
7591+ {
7592+ unsigned int resolver, map;
7593+
7594+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7595+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7596+ if (err)
7597+ break;
7598+
7599+ regs->gr[20] = instruction_pointer(regs)+8;
7600+ regs->gr[21] = map;
7601+ regs->gr[22] = resolver;
7602+ regs->iaoq[0] = resolver | 3UL;
7603+ regs->iaoq[1] = regs->iaoq[0] + 4;
7604+ return 3;
7605+ }
7606+ }
7607+ } while (0);
7608+#endif
7609+
7610+#ifdef CONFIG_PAX_EMUTRAMP
7611+
7612+#ifndef CONFIG_PAX_EMUSIGRT
7613+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7614+ return 1;
7615+#endif
7616+
7617+ do { /* PaX: rt_sigreturn emulation */
7618+ unsigned int ldi1, ldi2, bel, nop;
7619+
7620+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7621+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7622+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7623+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7624+
7625+ if (err)
7626+ break;
7627+
7628+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7629+ ldi2 == 0x3414015AU &&
7630+ bel == 0xE4008200U &&
7631+ nop == 0x08000240U)
7632+ {
7633+ regs->gr[25] = (ldi1 & 2) >> 1;
7634+ regs->gr[20] = __NR_rt_sigreturn;
7635+ regs->gr[31] = regs->iaoq[1] + 16;
7636+ regs->sr[0] = regs->iasq[1];
7637+ regs->iaoq[0] = 0x100UL;
7638+ regs->iaoq[1] = regs->iaoq[0] + 4;
7639+ regs->iasq[0] = regs->sr[2];
7640+ regs->iasq[1] = regs->sr[2];
7641+ return 2;
7642+ }
7643+ } while (0);
7644+#endif
7645+
7646+ return 1;
7647+}
7648+
7649+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7650+{
7651+ unsigned long i;
7652+
7653+ printk(KERN_ERR "PAX: bytes at PC: ");
7654+ for (i = 0; i < 5; i++) {
7655+ unsigned int c;
7656+ if (get_user(c, (unsigned int *)pc+i))
7657+ printk(KERN_CONT "???????? ");
7658+ else
7659+ printk(KERN_CONT "%08x ", c);
7660+ }
7661+ printk("\n");
7662+}
7663+#endif
7664+
7665 int fixup_exception(struct pt_regs *regs)
7666 {
7667 const struct exception_table_entry *fix;
7668@@ -234,8 +345,33 @@ retry:
7669
7670 good_area:
7671
7672- if ((vma->vm_flags & acc_type) != acc_type)
7673+ if ((vma->vm_flags & acc_type) != acc_type) {
7674+
7675+#ifdef CONFIG_PAX_PAGEEXEC
7676+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7677+ (address & ~3UL) == instruction_pointer(regs))
7678+ {
7679+ up_read(&mm->mmap_sem);
7680+ switch (pax_handle_fetch_fault(regs)) {
7681+
7682+#ifdef CONFIG_PAX_EMUPLT
7683+ case 3:
7684+ return;
7685+#endif
7686+
7687+#ifdef CONFIG_PAX_EMUTRAMP
7688+ case 2:
7689+ return;
7690+#endif
7691+
7692+ }
7693+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7694+ do_group_exit(SIGKILL);
7695+ }
7696+#endif
7697+
7698 goto bad_area;
7699+ }
7700
7701 /*
7702 * If for any reason at all we couldn't handle the fault, make
7703diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7704index 190cc48..48439ce 100644
7705--- a/arch/powerpc/Kconfig
7706+++ b/arch/powerpc/Kconfig
7707@@ -413,6 +413,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7708 config KEXEC
7709 bool "kexec system call"
7710 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7711+ depends on !GRKERNSEC_KMEM
7712 help
7713 kexec is a system call that implements the ability to shutdown your
7714 current kernel, and to start another kernel. It is like a reboot
7715diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7716index 512d278..d31fadd 100644
7717--- a/arch/powerpc/include/asm/atomic.h
7718+++ b/arch/powerpc/include/asm/atomic.h
7719@@ -12,6 +12,11 @@
7720
7721 #define ATOMIC_INIT(i) { (i) }
7722
7723+#define _ASM_EXTABLE(from, to) \
7724+" .section __ex_table,\"a\"\n" \
7725+ PPC_LONG" " #from ", " #to"\n" \
7726+" .previous\n"
7727+
7728 static __inline__ int atomic_read(const atomic_t *v)
7729 {
7730 int t;
7731@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7732 return t;
7733 }
7734
7735+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7736+{
7737+ int t;
7738+
7739+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7740+
7741+ return t;
7742+}
7743+
7744 static __inline__ void atomic_set(atomic_t *v, int i)
7745 {
7746 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7747 }
7748
7749-#define ATOMIC_OP(op, asm_op) \
7750-static __inline__ void atomic_##op(int a, atomic_t *v) \
7751+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7752+{
7753+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7754+}
7755+
7756+#ifdef CONFIG_PAX_REFCOUNT
7757+#define __REFCOUNT_OP(op) op##o.
7758+#define __OVERFLOW_PRE \
7759+ " mcrxr cr0\n"
7760+#define __OVERFLOW_POST \
7761+ " bf 4*cr0+so, 3f\n" \
7762+ "2: .long 0x00c00b00\n" \
7763+ "3:\n"
7764+#define __OVERFLOW_EXTABLE \
7765+ "\n4:\n"
7766+ _ASM_EXTABLE(2b, 4b)
7767+#else
7768+#define __REFCOUNT_OP(op) op
7769+#define __OVERFLOW_PRE
7770+#define __OVERFLOW_POST
7771+#define __OVERFLOW_EXTABLE
7772+#endif
7773+
7774+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7775+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7776 { \
7777 int t; \
7778 \
7779 __asm__ __volatile__( \
7780-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7781+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7782+ pre_op \
7783 #asm_op " %0,%2,%0\n" \
7784+ post_op \
7785 PPC405_ERR77(0,%3) \
7786 " stwcx. %0,0,%3 \n" \
7787 " bne- 1b\n" \
7788+ extable \
7789 : "=&r" (t), "+m" (v->counter) \
7790 : "r" (a), "r" (&v->counter) \
7791 : "cc"); \
7792 } \
7793
7794-#define ATOMIC_OP_RETURN(op, asm_op) \
7795-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7796+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7797+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7798+
7799+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7800+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7801 { \
7802 int t; \
7803 \
7804 __asm__ __volatile__( \
7805 PPC_ATOMIC_ENTRY_BARRIER \
7806-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7807+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7808+ pre_op \
7809 #asm_op " %0,%1,%0\n" \
7810+ post_op \
7811 PPC405_ERR77(0,%2) \
7812 " stwcx. %0,0,%2 \n" \
7813 " bne- 1b\n" \
7814+ extable \
7815 PPC_ATOMIC_EXIT_BARRIER \
7816 : "=&r" (t) \
7817 : "r" (a), "r" (&v->counter) \
7818@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7819 return t; \
7820 }
7821
7822+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7823+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7824+
7825 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7826
7827 ATOMIC_OPS(add, add)
7828@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7829
7830 #undef ATOMIC_OPS
7831 #undef ATOMIC_OP_RETURN
7832+#undef __ATOMIC_OP_RETURN
7833 #undef ATOMIC_OP
7834+#undef __ATOMIC_OP
7835
7836 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7837
7838-static __inline__ void atomic_inc(atomic_t *v)
7839-{
7840- int t;
7841+/*
7842+ * atomic_inc - increment atomic variable
7843+ * @v: pointer of type atomic_t
7844+ *
7845+ * Automatically increments @v by 1
7846+ */
7847+#define atomic_inc(v) atomic_add(1, (v))
7848+#define atomic_inc_return(v) atomic_add_return(1, (v))
7849
7850- __asm__ __volatile__(
7851-"1: lwarx %0,0,%2 # atomic_inc\n\
7852- addic %0,%0,1\n"
7853- PPC405_ERR77(0,%2)
7854-" stwcx. %0,0,%2 \n\
7855- bne- 1b"
7856- : "=&r" (t), "+m" (v->counter)
7857- : "r" (&v->counter)
7858- : "cc", "xer");
7859+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7860+{
7861+ atomic_add_unchecked(1, v);
7862 }
7863
7864-static __inline__ int atomic_inc_return(atomic_t *v)
7865+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7866 {
7867- int t;
7868-
7869- __asm__ __volatile__(
7870- PPC_ATOMIC_ENTRY_BARRIER
7871-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7872- addic %0,%0,1\n"
7873- PPC405_ERR77(0,%1)
7874-" stwcx. %0,0,%1 \n\
7875- bne- 1b"
7876- PPC_ATOMIC_EXIT_BARRIER
7877- : "=&r" (t)
7878- : "r" (&v->counter)
7879- : "cc", "xer", "memory");
7880-
7881- return t;
7882+ return atomic_add_return_unchecked(1, v);
7883 }
7884
7885 /*
7886@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7887 */
7888 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7889
7890-static __inline__ void atomic_dec(atomic_t *v)
7891+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7892 {
7893- int t;
7894-
7895- __asm__ __volatile__(
7896-"1: lwarx %0,0,%2 # atomic_dec\n\
7897- addic %0,%0,-1\n"
7898- PPC405_ERR77(0,%2)\
7899-" stwcx. %0,0,%2\n\
7900- bne- 1b"
7901- : "=&r" (t), "+m" (v->counter)
7902- : "r" (&v->counter)
7903- : "cc", "xer");
7904+ return atomic_add_return_unchecked(1, v) == 0;
7905 }
7906
7907-static __inline__ int atomic_dec_return(atomic_t *v)
7908+/*
7909+ * atomic_dec - decrement atomic variable
7910+ * @v: pointer of type atomic_t
7911+ *
7912+ * Atomically decrements @v by 1
7913+ */
7914+#define atomic_dec(v) atomic_sub(1, (v))
7915+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7916+
7917+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7918 {
7919- int t;
7920-
7921- __asm__ __volatile__(
7922- PPC_ATOMIC_ENTRY_BARRIER
7923-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7924- addic %0,%0,-1\n"
7925- PPC405_ERR77(0,%1)
7926-" stwcx. %0,0,%1\n\
7927- bne- 1b"
7928- PPC_ATOMIC_EXIT_BARRIER
7929- : "=&r" (t)
7930- : "r" (&v->counter)
7931- : "cc", "xer", "memory");
7932-
7933- return t;
7934+ atomic_sub_unchecked(1, v);
7935 }
7936
7937 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7938 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7939
7940+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7941+{
7942+ return cmpxchg(&(v->counter), old, new);
7943+}
7944+
7945+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7946+{
7947+ return xchg(&(v->counter), new);
7948+}
7949+
7950 /**
7951 * __atomic_add_unless - add unless the number is a given value
7952 * @v: pointer of type atomic_t
7953@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7954 PPC_ATOMIC_ENTRY_BARRIER
7955 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7956 cmpw 0,%0,%3 \n\
7957- beq- 2f \n\
7958- add %0,%2,%0 \n"
7959+ beq- 2f \n"
7960+
7961+#ifdef CONFIG_PAX_REFCOUNT
7962+" mcrxr cr0\n"
7963+" addo. %0,%2,%0\n"
7964+" bf 4*cr0+so, 4f\n"
7965+"3:.long " "0x00c00b00""\n"
7966+"4:\n"
7967+#else
7968+ "add %0,%2,%0 \n"
7969+#endif
7970+
7971 PPC405_ERR77(0,%2)
7972 " stwcx. %0,0,%1 \n\
7973 bne- 1b \n"
7974+"5:"
7975+
7976+#ifdef CONFIG_PAX_REFCOUNT
7977+ _ASM_EXTABLE(3b, 5b)
7978+#endif
7979+
7980 PPC_ATOMIC_EXIT_BARRIER
7981 " subf %0,%2,%0 \n\
7982 2:"
7983@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7984 }
7985 #define atomic_dec_if_positive atomic_dec_if_positive
7986
7987+#define smp_mb__before_atomic_dec() smp_mb()
7988+#define smp_mb__after_atomic_dec() smp_mb()
7989+#define smp_mb__before_atomic_inc() smp_mb()
7990+#define smp_mb__after_atomic_inc() smp_mb()
7991+
7992 #ifdef __powerpc64__
7993
7994 #define ATOMIC64_INIT(i) { (i) }
7995@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
7996 return t;
7997 }
7998
7999+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8000+{
8001+ long t;
8002+
8003+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8004+
8005+ return t;
8006+}
8007+
8008 static __inline__ void atomic64_set(atomic64_t *v, long i)
8009 {
8010 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8011 }
8012
8013-#define ATOMIC64_OP(op, asm_op) \
8014-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8015+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8016+{
8017+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8018+}
8019+
8020+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8021+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8022 { \
8023 long t; \
8024 \
8025 __asm__ __volatile__( \
8026 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8027+ pre_op \
8028 #asm_op " %0,%2,%0\n" \
8029+ post_op \
8030 " stdcx. %0,0,%3 \n" \
8031 " bne- 1b\n" \
8032+ extable \
8033 : "=&r" (t), "+m" (v->counter) \
8034 : "r" (a), "r" (&v->counter) \
8035 : "cc"); \
8036 }
8037
8038-#define ATOMIC64_OP_RETURN(op, asm_op) \
8039-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8040+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8041+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8042+
8043+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8044+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8045 { \
8046 long t; \
8047 \
8048 __asm__ __volatile__( \
8049 PPC_ATOMIC_ENTRY_BARRIER \
8050 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8051+ pre_op \
8052 #asm_op " %0,%1,%0\n" \
8053+ post_op \
8054 " stdcx. %0,0,%2 \n" \
8055 " bne- 1b\n" \
8056+ extable \
8057 PPC_ATOMIC_EXIT_BARRIER \
8058 : "=&r" (t) \
8059 : "r" (a), "r" (&v->counter) \
8060@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8061 return t; \
8062 }
8063
8064+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8065+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8066+
8067 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8068
8069 ATOMIC64_OPS(add, add)
8070@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8071
8072 #undef ATOMIC64_OPS
8073 #undef ATOMIC64_OP_RETURN
8074+#undef __ATOMIC64_OP_RETURN
8075 #undef ATOMIC64_OP
8076+#undef __ATOMIC64_OP
8077+#undef __OVERFLOW_EXTABLE
8078+#undef __OVERFLOW_POST
8079+#undef __OVERFLOW_PRE
8080+#undef __REFCOUNT_OP
8081
8082 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8083
8084-static __inline__ void atomic64_inc(atomic64_t *v)
8085-{
8086- long t;
8087+/*
8088+ * atomic64_inc - increment atomic variable
8089+ * @v: pointer of type atomic64_t
8090+ *
8091+ * Automatically increments @v by 1
8092+ */
8093+#define atomic64_inc(v) atomic64_add(1, (v))
8094+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8095
8096- __asm__ __volatile__(
8097-"1: ldarx %0,0,%2 # atomic64_inc\n\
8098- addic %0,%0,1\n\
8099- stdcx. %0,0,%2 \n\
8100- bne- 1b"
8101- : "=&r" (t), "+m" (v->counter)
8102- : "r" (&v->counter)
8103- : "cc", "xer");
8104+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8105+{
8106+ atomic64_add_unchecked(1, v);
8107 }
8108
8109-static __inline__ long atomic64_inc_return(atomic64_t *v)
8110+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8111 {
8112- long t;
8113-
8114- __asm__ __volatile__(
8115- PPC_ATOMIC_ENTRY_BARRIER
8116-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8117- addic %0,%0,1\n\
8118- stdcx. %0,0,%1 \n\
8119- bne- 1b"
8120- PPC_ATOMIC_EXIT_BARRIER
8121- : "=&r" (t)
8122- : "r" (&v->counter)
8123- : "cc", "xer", "memory");
8124-
8125- return t;
8126+ return atomic64_add_return_unchecked(1, v);
8127 }
8128
8129 /*
8130@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8131 */
8132 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8133
8134-static __inline__ void atomic64_dec(atomic64_t *v)
8135+/*
8136+ * atomic64_dec - decrement atomic variable
8137+ * @v: pointer of type atomic64_t
8138+ *
8139+ * Atomically decrements @v by 1
8140+ */
8141+#define atomic64_dec(v) atomic64_sub(1, (v))
8142+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8143+
8144+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8145 {
8146- long t;
8147-
8148- __asm__ __volatile__(
8149-"1: ldarx %0,0,%2 # atomic64_dec\n\
8150- addic %0,%0,-1\n\
8151- stdcx. %0,0,%2\n\
8152- bne- 1b"
8153- : "=&r" (t), "+m" (v->counter)
8154- : "r" (&v->counter)
8155- : "cc", "xer");
8156-}
8157-
8158-static __inline__ long atomic64_dec_return(atomic64_t *v)
8159-{
8160- long t;
8161-
8162- __asm__ __volatile__(
8163- PPC_ATOMIC_ENTRY_BARRIER
8164-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8165- addic %0,%0,-1\n\
8166- stdcx. %0,0,%1\n\
8167- bne- 1b"
8168- PPC_ATOMIC_EXIT_BARRIER
8169- : "=&r" (t)
8170- : "r" (&v->counter)
8171- : "cc", "xer", "memory");
8172-
8173- return t;
8174+ atomic64_sub_unchecked(1, v);
8175 }
8176
8177 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8178@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8179 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8180 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8181
8182+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8183+{
8184+ return cmpxchg(&(v->counter), old, new);
8185+}
8186+
8187+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8188+{
8189+ return xchg(&(v->counter), new);
8190+}
8191+
8192 /**
8193 * atomic64_add_unless - add unless the number is a given value
8194 * @v: pointer of type atomic64_t
8195@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8196
8197 __asm__ __volatile__ (
8198 PPC_ATOMIC_ENTRY_BARRIER
8199-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8200+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8201 cmpd 0,%0,%3 \n\
8202- beq- 2f \n\
8203- add %0,%2,%0 \n"
8204+ beq- 2f \n"
8205+
8206+#ifdef CONFIG_PAX_REFCOUNT
8207+" mcrxr cr0\n"
8208+" addo. %0,%2,%0\n"
8209+" bf 4*cr0+so, 4f\n"
8210+"3:.long " "0x00c00b00""\n"
8211+"4:\n"
8212+#else
8213+ "add %0,%2,%0 \n"
8214+#endif
8215+
8216 " stdcx. %0,0,%1 \n\
8217 bne- 1b \n"
8218 PPC_ATOMIC_EXIT_BARRIER
8219+"5:"
8220+
8221+#ifdef CONFIG_PAX_REFCOUNT
8222+ _ASM_EXTABLE(3b, 5b)
8223+#endif
8224+
8225 " subf %0,%2,%0 \n\
8226 2:"
8227 : "=&r" (t)
8228diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8229index a3bf5be..e03ba81 100644
8230--- a/arch/powerpc/include/asm/barrier.h
8231+++ b/arch/powerpc/include/asm/barrier.h
8232@@ -76,7 +76,7 @@
8233 do { \
8234 compiletime_assert_atomic_type(*p); \
8235 smp_lwsync(); \
8236- ACCESS_ONCE(*p) = (v); \
8237+ ACCESS_ONCE_RW(*p) = (v); \
8238 } while (0)
8239
8240 #define smp_load_acquire(p) \
8241diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8242index 0dc42c5..b80a3a1 100644
8243--- a/arch/powerpc/include/asm/cache.h
8244+++ b/arch/powerpc/include/asm/cache.h
8245@@ -4,6 +4,7 @@
8246 #ifdef __KERNEL__
8247
8248 #include <asm/reg.h>
8249+#include <linux/const.h>
8250
8251 /* bytes per L1 cache line */
8252 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8253@@ -23,7 +24,7 @@
8254 #define L1_CACHE_SHIFT 7
8255 #endif
8256
8257-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8258+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8259
8260 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8261
8262diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8263index ee46ffe..b36c98c 100644
8264--- a/arch/powerpc/include/asm/elf.h
8265+++ b/arch/powerpc/include/asm/elf.h
8266@@ -30,6 +30,18 @@
8267
8268 #define ELF_ET_DYN_BASE 0x20000000
8269
8270+#ifdef CONFIG_PAX_ASLR
8271+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8272+
8273+#ifdef __powerpc64__
8274+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8275+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8276+#else
8277+#define PAX_DELTA_MMAP_LEN 15
8278+#define PAX_DELTA_STACK_LEN 15
8279+#endif
8280+#endif
8281+
8282 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8283
8284 /*
8285diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8286index 8196e9c..d83a9f3 100644
8287--- a/arch/powerpc/include/asm/exec.h
8288+++ b/arch/powerpc/include/asm/exec.h
8289@@ -4,6 +4,6 @@
8290 #ifndef _ASM_POWERPC_EXEC_H
8291 #define _ASM_POWERPC_EXEC_H
8292
8293-extern unsigned long arch_align_stack(unsigned long sp);
8294+#define arch_align_stack(x) ((x) & ~0xfUL)
8295
8296 #endif /* _ASM_POWERPC_EXEC_H */
8297diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8298index 5acabbd..7ea14fa 100644
8299--- a/arch/powerpc/include/asm/kmap_types.h
8300+++ b/arch/powerpc/include/asm/kmap_types.h
8301@@ -10,7 +10,7 @@
8302 * 2 of the License, or (at your option) any later version.
8303 */
8304
8305-#define KM_TYPE_NR 16
8306+#define KM_TYPE_NR 17
8307
8308 #endif /* __KERNEL__ */
8309 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8310diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8311index b8da913..c02b593 100644
8312--- a/arch/powerpc/include/asm/local.h
8313+++ b/arch/powerpc/include/asm/local.h
8314@@ -9,21 +9,65 @@ typedef struct
8315 atomic_long_t a;
8316 } local_t;
8317
8318+typedef struct
8319+{
8320+ atomic_long_unchecked_t a;
8321+} local_unchecked_t;
8322+
8323 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8324
8325 #define local_read(l) atomic_long_read(&(l)->a)
8326+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8327 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8328+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8329
8330 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8331+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8332 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8333+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8334 #define local_inc(l) atomic_long_inc(&(l)->a)
8335+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8336 #define local_dec(l) atomic_long_dec(&(l)->a)
8337+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8338
8339 static __inline__ long local_add_return(long a, local_t *l)
8340 {
8341 long t;
8342
8343 __asm__ __volatile__(
8344+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8345+
8346+#ifdef CONFIG_PAX_REFCOUNT
8347+" mcrxr cr0\n"
8348+" addo. %0,%1,%0\n"
8349+" bf 4*cr0+so, 3f\n"
8350+"2:.long " "0x00c00b00""\n"
8351+#else
8352+" add %0,%1,%0\n"
8353+#endif
8354+
8355+"3:\n"
8356+ PPC405_ERR77(0,%2)
8357+ PPC_STLCX "%0,0,%2 \n\
8358+ bne- 1b"
8359+
8360+#ifdef CONFIG_PAX_REFCOUNT
8361+"\n4:\n"
8362+ _ASM_EXTABLE(2b, 4b)
8363+#endif
8364+
8365+ : "=&r" (t)
8366+ : "r" (a), "r" (&(l->a.counter))
8367+ : "cc", "memory");
8368+
8369+ return t;
8370+}
8371+
8372+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8373+{
8374+ long t;
8375+
8376+ __asm__ __volatile__(
8377 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8378 add %0,%1,%0\n"
8379 PPC405_ERR77(0,%2)
8380@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8381
8382 #define local_cmpxchg(l, o, n) \
8383 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8384+#define local_cmpxchg_unchecked(l, o, n) \
8385+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8386 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8387
8388 /**
8389diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8390index 8565c25..2865190 100644
8391--- a/arch/powerpc/include/asm/mman.h
8392+++ b/arch/powerpc/include/asm/mman.h
8393@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8394 }
8395 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8396
8397-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8398+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8399 {
8400 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8401 }
8402diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8403index 69c0598..2c56964 100644
8404--- a/arch/powerpc/include/asm/page.h
8405+++ b/arch/powerpc/include/asm/page.h
8406@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8407 * and needs to be executable. This means the whole heap ends
8408 * up being executable.
8409 */
8410-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8411- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8412+#define VM_DATA_DEFAULT_FLAGS32 \
8413+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8414+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8415
8416 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8417 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8418@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8419 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8420 #endif
8421
8422+#define ktla_ktva(addr) (addr)
8423+#define ktva_ktla(addr) (addr)
8424+
8425 #ifndef CONFIG_PPC_BOOK3S_64
8426 /*
8427 * Use the top bit of the higher-level page table entries to indicate whether
8428diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8429index d908a46..3753f71 100644
8430--- a/arch/powerpc/include/asm/page_64.h
8431+++ b/arch/powerpc/include/asm/page_64.h
8432@@ -172,15 +172,18 @@ do { \
8433 * stack by default, so in the absence of a PT_GNU_STACK program header
8434 * we turn execute permission off.
8435 */
8436-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8437- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8438+#define VM_STACK_DEFAULT_FLAGS32 \
8439+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8440+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8441
8442 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8443 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8444
8445+#ifndef CONFIG_PAX_PAGEEXEC
8446 #define VM_STACK_DEFAULT_FLAGS \
8447 (is_32bit_task() ? \
8448 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8449+#endif
8450
8451 #include <asm-generic/getorder.h>
8452
8453diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8454index 4b0be20..c15a27d 100644
8455--- a/arch/powerpc/include/asm/pgalloc-64.h
8456+++ b/arch/powerpc/include/asm/pgalloc-64.h
8457@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8458 #ifndef CONFIG_PPC_64K_PAGES
8459
8460 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8461+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8462
8463 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8464 {
8465@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8466 pud_set(pud, (unsigned long)pmd);
8467 }
8468
8469+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8470+{
8471+ pud_populate(mm, pud, pmd);
8472+}
8473+
8474 #define pmd_populate(mm, pmd, pte_page) \
8475 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8476 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8477@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8478 #endif
8479
8480 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8481+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8482
8483 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8484 pte_t *pte)
8485diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8486index 11a3863..108f194 100644
8487--- a/arch/powerpc/include/asm/pgtable.h
8488+++ b/arch/powerpc/include/asm/pgtable.h
8489@@ -2,6 +2,7 @@
8490 #define _ASM_POWERPC_PGTABLE_H
8491 #ifdef __KERNEL__
8492
8493+#include <linux/const.h>
8494 #ifndef __ASSEMBLY__
8495 #include <linux/mmdebug.h>
8496 #include <linux/mmzone.h>
8497diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8498index 62cfb0c..50c6402 100644
8499--- a/arch/powerpc/include/asm/pte-hash32.h
8500+++ b/arch/powerpc/include/asm/pte-hash32.h
8501@@ -20,6 +20,7 @@
8502 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8503 #define _PAGE_USER 0x004 /* usermode access allowed */
8504 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8505+#define _PAGE_EXEC _PAGE_GUARDED
8506 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8507 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8508 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8509diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8510index af56b5c..f86f3f6 100644
8511--- a/arch/powerpc/include/asm/reg.h
8512+++ b/arch/powerpc/include/asm/reg.h
8513@@ -253,6 +253,7 @@
8514 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8515 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8516 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8517+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8518 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8519 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8520 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8521diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8522index 825663c..f9e9134 100644
8523--- a/arch/powerpc/include/asm/smp.h
8524+++ b/arch/powerpc/include/asm/smp.h
8525@@ -51,7 +51,7 @@ struct smp_ops_t {
8526 int (*cpu_disable)(void);
8527 void (*cpu_die)(unsigned int nr);
8528 int (*cpu_bootable)(unsigned int nr);
8529-};
8530+} __no_const;
8531
8532 extern void smp_send_debugger_break(void);
8533 extern void start_secondary_resume(void);
8534diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8535index 4dbe072..b803275 100644
8536--- a/arch/powerpc/include/asm/spinlock.h
8537+++ b/arch/powerpc/include/asm/spinlock.h
8538@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8539 __asm__ __volatile__(
8540 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8541 __DO_SIGN_EXTEND
8542-" addic. %0,%0,1\n\
8543- ble- 2f\n"
8544+
8545+#ifdef CONFIG_PAX_REFCOUNT
8546+" mcrxr cr0\n"
8547+" addico. %0,%0,1\n"
8548+" bf 4*cr0+so, 3f\n"
8549+"2:.long " "0x00c00b00""\n"
8550+#else
8551+" addic. %0,%0,1\n"
8552+#endif
8553+
8554+"3:\n"
8555+ "ble- 4f\n"
8556 PPC405_ERR77(0,%1)
8557 " stwcx. %0,0,%1\n\
8558 bne- 1b\n"
8559 PPC_ACQUIRE_BARRIER
8560-"2:" : "=&r" (tmp)
8561+"4:"
8562+
8563+#ifdef CONFIG_PAX_REFCOUNT
8564+ _ASM_EXTABLE(2b,4b)
8565+#endif
8566+
8567+ : "=&r" (tmp)
8568 : "r" (&rw->lock)
8569 : "cr0", "xer", "memory");
8570
8571@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8572 __asm__ __volatile__(
8573 "# read_unlock\n\t"
8574 PPC_RELEASE_BARRIER
8575-"1: lwarx %0,0,%1\n\
8576- addic %0,%0,-1\n"
8577+"1: lwarx %0,0,%1\n"
8578+
8579+#ifdef CONFIG_PAX_REFCOUNT
8580+" mcrxr cr0\n"
8581+" addico. %0,%0,-1\n"
8582+" bf 4*cr0+so, 3f\n"
8583+"2:.long " "0x00c00b00""\n"
8584+#else
8585+" addic. %0,%0,-1\n"
8586+#endif
8587+
8588+"3:\n"
8589 PPC405_ERR77(0,%1)
8590 " stwcx. %0,0,%1\n\
8591 bne- 1b"
8592+
8593+#ifdef CONFIG_PAX_REFCOUNT
8594+"\n4:\n"
8595+ _ASM_EXTABLE(2b, 4b)
8596+#endif
8597+
8598 : "=&r"(tmp)
8599 : "r"(&rw->lock)
8600 : "cr0", "xer", "memory");
8601diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8602index 7efee4a..48d47cc 100644
8603--- a/arch/powerpc/include/asm/thread_info.h
8604+++ b/arch/powerpc/include/asm/thread_info.h
8605@@ -101,6 +101,8 @@ static inline struct thread_info *current_thread_info(void)
8606 #if defined(CONFIG_PPC64)
8607 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8608 #endif
8609+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8610+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8611
8612 /* as above, but as bit values */
8613 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8614@@ -119,9 +121,10 @@ static inline struct thread_info *current_thread_info(void)
8615 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8616 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8617 #define _TIF_NOHZ (1<<TIF_NOHZ)
8618+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8619 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8620 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8621- _TIF_NOHZ)
8622+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8623
8624 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8625 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8626diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8627index a0c071d..49cdc7f 100644
8628--- a/arch/powerpc/include/asm/uaccess.h
8629+++ b/arch/powerpc/include/asm/uaccess.h
8630@@ -58,6 +58,7 @@
8631
8632 #endif
8633
8634+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8635 #define access_ok(type, addr, size) \
8636 (__chk_user_ptr(addr), \
8637 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8638@@ -318,52 +319,6 @@ do { \
8639 extern unsigned long __copy_tofrom_user(void __user *to,
8640 const void __user *from, unsigned long size);
8641
8642-#ifndef __powerpc64__
8643-
8644-static inline unsigned long copy_from_user(void *to,
8645- const void __user *from, unsigned long n)
8646-{
8647- unsigned long over;
8648-
8649- if (access_ok(VERIFY_READ, from, n))
8650- return __copy_tofrom_user((__force void __user *)to, from, n);
8651- if ((unsigned long)from < TASK_SIZE) {
8652- over = (unsigned long)from + n - TASK_SIZE;
8653- return __copy_tofrom_user((__force void __user *)to, from,
8654- n - over) + over;
8655- }
8656- return n;
8657-}
8658-
8659-static inline unsigned long copy_to_user(void __user *to,
8660- const void *from, unsigned long n)
8661-{
8662- unsigned long over;
8663-
8664- if (access_ok(VERIFY_WRITE, to, n))
8665- return __copy_tofrom_user(to, (__force void __user *)from, n);
8666- if ((unsigned long)to < TASK_SIZE) {
8667- over = (unsigned long)to + n - TASK_SIZE;
8668- return __copy_tofrom_user(to, (__force void __user *)from,
8669- n - over) + over;
8670- }
8671- return n;
8672-}
8673-
8674-#else /* __powerpc64__ */
8675-
8676-#define __copy_in_user(to, from, size) \
8677- __copy_tofrom_user((to), (from), (size))
8678-
8679-extern unsigned long copy_from_user(void *to, const void __user *from,
8680- unsigned long n);
8681-extern unsigned long copy_to_user(void __user *to, const void *from,
8682- unsigned long n);
8683-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8684- unsigned long n);
8685-
8686-#endif /* __powerpc64__ */
8687-
8688 static inline unsigned long __copy_from_user_inatomic(void *to,
8689 const void __user *from, unsigned long n)
8690 {
8691@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8692 if (ret == 0)
8693 return 0;
8694 }
8695+
8696+ if (!__builtin_constant_p(n))
8697+ check_object_size(to, n, false);
8698+
8699 return __copy_tofrom_user((__force void __user *)to, from, n);
8700 }
8701
8702@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8703 if (ret == 0)
8704 return 0;
8705 }
8706+
8707+ if (!__builtin_constant_p(n))
8708+ check_object_size(from, n, true);
8709+
8710 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8711 }
8712
8713@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8714 return __copy_to_user_inatomic(to, from, size);
8715 }
8716
8717+#ifndef __powerpc64__
8718+
8719+static inline unsigned long __must_check copy_from_user(void *to,
8720+ const void __user *from, unsigned long n)
8721+{
8722+ unsigned long over;
8723+
8724+ if ((long)n < 0)
8725+ return n;
8726+
8727+ if (access_ok(VERIFY_READ, from, n)) {
8728+ if (!__builtin_constant_p(n))
8729+ check_object_size(to, n, false);
8730+ return __copy_tofrom_user((__force void __user *)to, from, n);
8731+ }
8732+ if ((unsigned long)from < TASK_SIZE) {
8733+ over = (unsigned long)from + n - TASK_SIZE;
8734+ if (!__builtin_constant_p(n - over))
8735+ check_object_size(to, n - over, false);
8736+ return __copy_tofrom_user((__force void __user *)to, from,
8737+ n - over) + over;
8738+ }
8739+ return n;
8740+}
8741+
8742+static inline unsigned long __must_check copy_to_user(void __user *to,
8743+ const void *from, unsigned long n)
8744+{
8745+ unsigned long over;
8746+
8747+ if ((long)n < 0)
8748+ return n;
8749+
8750+ if (access_ok(VERIFY_WRITE, to, n)) {
8751+ if (!__builtin_constant_p(n))
8752+ check_object_size(from, n, true);
8753+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8754+ }
8755+ if ((unsigned long)to < TASK_SIZE) {
8756+ over = (unsigned long)to + n - TASK_SIZE;
8757+ if (!__builtin_constant_p(n))
8758+ check_object_size(from, n - over, true);
8759+ return __copy_tofrom_user(to, (__force void __user *)from,
8760+ n - over) + over;
8761+ }
8762+ return n;
8763+}
8764+
8765+#else /* __powerpc64__ */
8766+
8767+#define __copy_in_user(to, from, size) \
8768+ __copy_tofrom_user((to), (from), (size))
8769+
8770+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8771+{
8772+ if ((long)n < 0 || n > INT_MAX)
8773+ return n;
8774+
8775+ if (!__builtin_constant_p(n))
8776+ check_object_size(to, n, false);
8777+
8778+ if (likely(access_ok(VERIFY_READ, from, n)))
8779+ n = __copy_from_user(to, from, n);
8780+ else
8781+ memset(to, 0, n);
8782+ return n;
8783+}
8784+
8785+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8786+{
8787+ if ((long)n < 0 || n > INT_MAX)
8788+ return n;
8789+
8790+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8791+ if (!__builtin_constant_p(n))
8792+ check_object_size(from, n, true);
8793+ n = __copy_to_user(to, from, n);
8794+ }
8795+ return n;
8796+}
8797+
8798+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8799+ unsigned long n);
8800+
8801+#endif /* __powerpc64__ */
8802+
8803 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8804
8805 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8806diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8807index c1ebbda..fd8a98d 100644
8808--- a/arch/powerpc/kernel/Makefile
8809+++ b/arch/powerpc/kernel/Makefile
8810@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8811 CFLAGS_btext.o += -fPIC
8812 endif
8813
8814+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8815+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8816+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8817+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8818+
8819 ifdef CONFIG_FUNCTION_TRACER
8820 # Do not trace early boot code
8821 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8822@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8823 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8824 endif
8825
8826+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8827+
8828 obj-y := cputable.o ptrace.o syscalls.o \
8829 irq.o align.o signal_32.o pmc.o vdso.o \
8830 process.o systbl.o idle.o \
8831diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8832index 3e68d1c..72a5ee6 100644
8833--- a/arch/powerpc/kernel/exceptions-64e.S
8834+++ b/arch/powerpc/kernel/exceptions-64e.S
8835@@ -1010,6 +1010,7 @@ storage_fault_common:
8836 std r14,_DAR(r1)
8837 std r15,_DSISR(r1)
8838 addi r3,r1,STACK_FRAME_OVERHEAD
8839+ bl save_nvgprs
8840 mr r4,r14
8841 mr r5,r15
8842 ld r14,PACA_EXGEN+EX_R14(r13)
8843@@ -1018,8 +1019,7 @@ storage_fault_common:
8844 cmpdi r3,0
8845 bne- 1f
8846 b ret_from_except_lite
8847-1: bl save_nvgprs
8848- mr r5,r3
8849+1: mr r5,r3
8850 addi r3,r1,STACK_FRAME_OVERHEAD
8851 ld r4,_DAR(r1)
8852 bl bad_page_fault
8853diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8854index 9519e6b..13f6c38 100644
8855--- a/arch/powerpc/kernel/exceptions-64s.S
8856+++ b/arch/powerpc/kernel/exceptions-64s.S
8857@@ -1599,10 +1599,10 @@ handle_page_fault:
8858 11: ld r4,_DAR(r1)
8859 ld r5,_DSISR(r1)
8860 addi r3,r1,STACK_FRAME_OVERHEAD
8861+ bl save_nvgprs
8862 bl do_page_fault
8863 cmpdi r3,0
8864 beq+ 12f
8865- bl save_nvgprs
8866 mr r5,r3
8867 addi r3,r1,STACK_FRAME_OVERHEAD
8868 lwz r4,_DAR(r1)
8869diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8870index 4509603..cdb491f 100644
8871--- a/arch/powerpc/kernel/irq.c
8872+++ b/arch/powerpc/kernel/irq.c
8873@@ -460,6 +460,8 @@ void migrate_irqs(void)
8874 }
8875 #endif
8876
8877+extern void gr_handle_kernel_exploit(void);
8878+
8879 static inline void check_stack_overflow(void)
8880 {
8881 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8882@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8883 pr_err("do_IRQ: stack overflow: %ld\n",
8884 sp - sizeof(struct thread_info));
8885 dump_stack();
8886+ gr_handle_kernel_exploit();
8887 }
8888 #endif
8889 }
8890diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8891index c94d2e0..992a9ce 100644
8892--- a/arch/powerpc/kernel/module_32.c
8893+++ b/arch/powerpc/kernel/module_32.c
8894@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8895 me->arch.core_plt_section = i;
8896 }
8897 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8898- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8899+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8900 return -ENOEXEC;
8901 }
8902
8903@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8904
8905 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8906 /* Init, or core PLT? */
8907- if (location >= mod->module_core
8908- && location < mod->module_core + mod->core_size)
8909+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8910+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8911 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8912- else
8913+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8914+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8915 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8916+ else {
8917+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8918+ return ~0UL;
8919+ }
8920
8921 /* Find this entry, or if that fails, the next avail. entry */
8922 while (entry->jump[0]) {
8923@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8924 }
8925 #ifdef CONFIG_DYNAMIC_FTRACE
8926 module->arch.tramp =
8927- do_plt_call(module->module_core,
8928+ do_plt_call(module->module_core_rx,
8929 (unsigned long)ftrace_caller,
8930 sechdrs, module);
8931 #endif
8932diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8933index febb50d..bb10020 100644
8934--- a/arch/powerpc/kernel/process.c
8935+++ b/arch/powerpc/kernel/process.c
8936@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
8937 * Lookup NIP late so we have the best change of getting the
8938 * above info out without failing
8939 */
8940- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8941- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8942+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8943+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8944 #endif
8945 show_stack(current, (unsigned long *) regs->gpr[1]);
8946 if (!user_mode(regs))
8947@@ -1554,10 +1554,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8948 newsp = stack[0];
8949 ip = stack[STACK_FRAME_LR_SAVE];
8950 if (!firstframe || ip != lr) {
8951- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8952+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8953 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8954 if ((ip == rth) && curr_frame >= 0) {
8955- printk(" (%pS)",
8956+ printk(" (%pA)",
8957 (void *)current->ret_stack[curr_frame].ret);
8958 curr_frame--;
8959 }
8960@@ -1577,7 +1577,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8961 struct pt_regs *regs = (struct pt_regs *)
8962 (sp + STACK_FRAME_OVERHEAD);
8963 lr = regs->link;
8964- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8965+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8966 regs->trap, (void *)regs->nip, (void *)lr);
8967 firstframe = 1;
8968 }
8969@@ -1613,49 +1613,3 @@ void notrace __ppc64_runlatch_off(void)
8970 mtspr(SPRN_CTRLT, ctrl);
8971 }
8972 #endif /* CONFIG_PPC64 */
8973-
8974-unsigned long arch_align_stack(unsigned long sp)
8975-{
8976- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8977- sp -= get_random_int() & ~PAGE_MASK;
8978- return sp & ~0xf;
8979-}
8980-
8981-static inline unsigned long brk_rnd(void)
8982-{
8983- unsigned long rnd = 0;
8984-
8985- /* 8MB for 32bit, 1GB for 64bit */
8986- if (is_32bit_task())
8987- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8988- else
8989- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8990-
8991- return rnd << PAGE_SHIFT;
8992-}
8993-
8994-unsigned long arch_randomize_brk(struct mm_struct *mm)
8995-{
8996- unsigned long base = mm->brk;
8997- unsigned long ret;
8998-
8999-#ifdef CONFIG_PPC_STD_MMU_64
9000- /*
9001- * If we are using 1TB segments and we are allowed to randomise
9002- * the heap, we can put it above 1TB so it is backed by a 1TB
9003- * segment. Otherwise the heap will be in the bottom 1TB
9004- * which always uses 256MB segments and this may result in a
9005- * performance penalty.
9006- */
9007- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9008- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9009-#endif
9010-
9011- ret = PAGE_ALIGN(base + brk_rnd());
9012-
9013- if (ret < mm->brk)
9014- return mm->brk;
9015-
9016- return ret;
9017-}
9018-
9019diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9020index f21897b..28c0428 100644
9021--- a/arch/powerpc/kernel/ptrace.c
9022+++ b/arch/powerpc/kernel/ptrace.c
9023@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9024 return ret;
9025 }
9026
9027+#ifdef CONFIG_GRKERNSEC_SETXID
9028+extern void gr_delayed_cred_worker(void);
9029+#endif
9030+
9031 /*
9032 * We must return the syscall number to actually look up in the table.
9033 * This can be -1L to skip running any syscall at all.
9034@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9035
9036 secure_computing_strict(regs->gpr[0]);
9037
9038+#ifdef CONFIG_GRKERNSEC_SETXID
9039+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9040+ gr_delayed_cred_worker();
9041+#endif
9042+
9043 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9044 tracehook_report_syscall_entry(regs))
9045 /*
9046@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9047 {
9048 int step;
9049
9050+#ifdef CONFIG_GRKERNSEC_SETXID
9051+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9052+ gr_delayed_cred_worker();
9053+#endif
9054+
9055 audit_syscall_exit(regs);
9056
9057 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9058diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9059index da50e0c..5ff6307 100644
9060--- a/arch/powerpc/kernel/signal_32.c
9061+++ b/arch/powerpc/kernel/signal_32.c
9062@@ -1009,7 +1009,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9063 /* Save user registers on the stack */
9064 frame = &rt_sf->uc.uc_mcontext;
9065 addr = frame;
9066- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9067+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9068 sigret = 0;
9069 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9070 } else {
9071diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9072index c7c24d2..1bf7039 100644
9073--- a/arch/powerpc/kernel/signal_64.c
9074+++ b/arch/powerpc/kernel/signal_64.c
9075@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9076 current->thread.fp_state.fpscr = 0;
9077
9078 /* Set up to return from userspace. */
9079- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9080+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9081 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9082 } else {
9083 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9084diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9085index 19e4744..28a8d7b 100644
9086--- a/arch/powerpc/kernel/traps.c
9087+++ b/arch/powerpc/kernel/traps.c
9088@@ -36,6 +36,7 @@
9089 #include <linux/debugfs.h>
9090 #include <linux/ratelimit.h>
9091 #include <linux/context_tracking.h>
9092+#include <linux/uaccess.h>
9093
9094 #include <asm/emulated_ops.h>
9095 #include <asm/pgtable.h>
9096@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9097 return flags;
9098 }
9099
9100+extern void gr_handle_kernel_exploit(void);
9101+
9102 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9103 int signr)
9104 {
9105@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9106 panic("Fatal exception in interrupt");
9107 if (panic_on_oops)
9108 panic("Fatal exception");
9109+
9110+ gr_handle_kernel_exploit();
9111+
9112 do_exit(signr);
9113 }
9114
9115@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9116 enum ctx_state prev_state = exception_enter();
9117 unsigned int reason = get_reason(regs);
9118
9119+#ifdef CONFIG_PAX_REFCOUNT
9120+ unsigned int bkpt;
9121+ const struct exception_table_entry *entry;
9122+
9123+ if (reason & REASON_ILLEGAL) {
9124+ /* Check if PaX bad instruction */
9125+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9126+ current->thread.trap_nr = 0;
9127+ pax_report_refcount_overflow(regs);
9128+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9129+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9130+ regs->nip = entry->fixup;
9131+ return;
9132+ }
9133+ /* fixup_exception() could not handle */
9134+ goto bail;
9135+ }
9136+ }
9137+#endif
9138+
9139 /* We can now get here via a FP Unavailable exception if the core
9140 * has no FPU, in that case the reason flags will be 0 */
9141
9142diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9143index 305eb0d..accc5b40 100644
9144--- a/arch/powerpc/kernel/vdso.c
9145+++ b/arch/powerpc/kernel/vdso.c
9146@@ -34,6 +34,7 @@
9147 #include <asm/vdso.h>
9148 #include <asm/vdso_datapage.h>
9149 #include <asm/setup.h>
9150+#include <asm/mman.h>
9151
9152 #undef DEBUG
9153
9154@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9155 vdso_base = VDSO32_MBASE;
9156 #endif
9157
9158- current->mm->context.vdso_base = 0;
9159+ current->mm->context.vdso_base = ~0UL;
9160
9161 /* vDSO has a problem and was disabled, just don't "enable" it for the
9162 * process
9163@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9164 vdso_base = get_unmapped_area(NULL, vdso_base,
9165 (vdso_pages << PAGE_SHIFT) +
9166 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9167- 0, 0);
9168+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9169 if (IS_ERR_VALUE(vdso_base)) {
9170 rc = vdso_base;
9171 goto fail_mmapsem;
9172diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9173index ac3ddf1..9a54c76 100644
9174--- a/arch/powerpc/kvm/powerpc.c
9175+++ b/arch/powerpc/kvm/powerpc.c
9176@@ -1403,7 +1403,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9177 }
9178 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9179
9180-int kvm_arch_init(void *opaque)
9181+int kvm_arch_init(const void *opaque)
9182 {
9183 return 0;
9184 }
9185diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9186index 5eea6f3..5d10396 100644
9187--- a/arch/powerpc/lib/usercopy_64.c
9188+++ b/arch/powerpc/lib/usercopy_64.c
9189@@ -9,22 +9,6 @@
9190 #include <linux/module.h>
9191 #include <asm/uaccess.h>
9192
9193-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9194-{
9195- if (likely(access_ok(VERIFY_READ, from, n)))
9196- n = __copy_from_user(to, from, n);
9197- else
9198- memset(to, 0, n);
9199- return n;
9200-}
9201-
9202-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9203-{
9204- if (likely(access_ok(VERIFY_WRITE, to, n)))
9205- n = __copy_to_user(to, from, n);
9206- return n;
9207-}
9208-
9209 unsigned long copy_in_user(void __user *to, const void __user *from,
9210 unsigned long n)
9211 {
9212@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9213 return n;
9214 }
9215
9216-EXPORT_SYMBOL(copy_from_user);
9217-EXPORT_SYMBOL(copy_to_user);
9218 EXPORT_SYMBOL(copy_in_user);
9219
9220diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9221index b396868..3eb6b9f 100644
9222--- a/arch/powerpc/mm/fault.c
9223+++ b/arch/powerpc/mm/fault.c
9224@@ -33,6 +33,10 @@
9225 #include <linux/ratelimit.h>
9226 #include <linux/context_tracking.h>
9227 #include <linux/hugetlb.h>
9228+#include <linux/slab.h>
9229+#include <linux/pagemap.h>
9230+#include <linux/compiler.h>
9231+#include <linux/unistd.h>
9232
9233 #include <asm/firmware.h>
9234 #include <asm/page.h>
9235@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9236 }
9237 #endif
9238
9239+#ifdef CONFIG_PAX_PAGEEXEC
9240+/*
9241+ * PaX: decide what to do with offenders (regs->nip = fault address)
9242+ *
9243+ * returns 1 when task should be killed
9244+ */
9245+static int pax_handle_fetch_fault(struct pt_regs *regs)
9246+{
9247+ return 1;
9248+}
9249+
9250+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9251+{
9252+ unsigned long i;
9253+
9254+ printk(KERN_ERR "PAX: bytes at PC: ");
9255+ for (i = 0; i < 5; i++) {
9256+ unsigned int c;
9257+ if (get_user(c, (unsigned int __user *)pc+i))
9258+ printk(KERN_CONT "???????? ");
9259+ else
9260+ printk(KERN_CONT "%08x ", c);
9261+ }
9262+ printk("\n");
9263+}
9264+#endif
9265+
9266 /*
9267 * Check whether the instruction at regs->nip is a store using
9268 * an update addressing form which will update r1.
9269@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9270 * indicate errors in DSISR but can validly be set in SRR1.
9271 */
9272 if (trap == 0x400)
9273- error_code &= 0x48200000;
9274+ error_code &= 0x58200000;
9275 else
9276 is_write = error_code & DSISR_ISSTORE;
9277 #else
9278@@ -383,12 +414,16 @@ good_area:
9279 * "undefined". Of those that can be set, this is the only
9280 * one which seems bad.
9281 */
9282- if (error_code & 0x10000000)
9283+ if (error_code & DSISR_GUARDED)
9284 /* Guarded storage error. */
9285 goto bad_area;
9286 #endif /* CONFIG_8xx */
9287
9288 if (is_exec) {
9289+#ifdef CONFIG_PPC_STD_MMU
9290+ if (error_code & DSISR_GUARDED)
9291+ goto bad_area;
9292+#endif
9293 /*
9294 * Allow execution from readable areas if the MMU does not
9295 * provide separate controls over reading and executing.
9296@@ -483,6 +518,23 @@ bad_area:
9297 bad_area_nosemaphore:
9298 /* User mode accesses cause a SIGSEGV */
9299 if (user_mode(regs)) {
9300+
9301+#ifdef CONFIG_PAX_PAGEEXEC
9302+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9303+#ifdef CONFIG_PPC_STD_MMU
9304+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9305+#else
9306+ if (is_exec && regs->nip == address) {
9307+#endif
9308+ switch (pax_handle_fetch_fault(regs)) {
9309+ }
9310+
9311+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9312+ do_group_exit(SIGKILL);
9313+ }
9314+ }
9315+#endif
9316+
9317 _exception(SIGSEGV, regs, code, address);
9318 goto bail;
9319 }
9320diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9321index 0f0502e..bc3e7a3 100644
9322--- a/arch/powerpc/mm/mmap.c
9323+++ b/arch/powerpc/mm/mmap.c
9324@@ -86,6 +86,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9325 {
9326 unsigned long random_factor = 0UL;
9327
9328+#ifdef CONFIG_PAX_RANDMMAP
9329+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9330+#endif
9331+
9332 if (current->flags & PF_RANDOMIZE)
9333 random_factor = arch_mmap_rnd();
9334
9335@@ -95,9 +99,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9336 */
9337 if (mmap_is_legacy()) {
9338 mm->mmap_base = TASK_UNMAPPED_BASE;
9339+
9340+#ifdef CONFIG_PAX_RANDMMAP
9341+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9342+ mm->mmap_base += mm->delta_mmap;
9343+#endif
9344+
9345 mm->get_unmapped_area = arch_get_unmapped_area;
9346 } else {
9347 mm->mmap_base = mmap_base(random_factor);
9348+
9349+#ifdef CONFIG_PAX_RANDMMAP
9350+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9351+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9352+#endif
9353+
9354 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9355 }
9356 }
9357diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9358index 0f432a7..abfe841 100644
9359--- a/arch/powerpc/mm/slice.c
9360+++ b/arch/powerpc/mm/slice.c
9361@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9362 if ((mm->task_size - len) < addr)
9363 return 0;
9364 vma = find_vma(mm, addr);
9365- return (!vma || (addr + len) <= vma->vm_start);
9366+ return check_heap_stack_gap(vma, addr, len, 0);
9367 }
9368
9369 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9370@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9371 info.align_offset = 0;
9372
9373 addr = TASK_UNMAPPED_BASE;
9374+
9375+#ifdef CONFIG_PAX_RANDMMAP
9376+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9377+ addr += mm->delta_mmap;
9378+#endif
9379+
9380 while (addr < TASK_SIZE) {
9381 info.low_limit = addr;
9382 if (!slice_scan_available(addr, available, 1, &addr))
9383@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9384 if (fixed && addr > (mm->task_size - len))
9385 return -ENOMEM;
9386
9387+#ifdef CONFIG_PAX_RANDMMAP
9388+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9389+ addr = 0;
9390+#endif
9391+
9392 /* If hint, make sure it matches our alignment restrictions */
9393 if (!fixed && addr) {
9394 addr = _ALIGN_UP(addr, 1ul << pshift);
9395diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9396index d966bbe..372124a 100644
9397--- a/arch/powerpc/platforms/cell/spufs/file.c
9398+++ b/arch/powerpc/platforms/cell/spufs/file.c
9399@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9400 return VM_FAULT_NOPAGE;
9401 }
9402
9403-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9404+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9405 unsigned long address,
9406- void *buf, int len, int write)
9407+ void *buf, size_t len, int write)
9408 {
9409 struct spu_context *ctx = vma->vm_file->private_data;
9410 unsigned long offset = address - vma->vm_start;
9411diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9412index adbe380..adb7516 100644
9413--- a/arch/s390/include/asm/atomic.h
9414+++ b/arch/s390/include/asm/atomic.h
9415@@ -317,4 +317,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9416 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9417 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9418
9419+#define atomic64_read_unchecked(v) atomic64_read(v)
9420+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9421+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9422+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9423+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9424+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9425+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9426+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9427+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9428+
9429 #endif /* __ARCH_S390_ATOMIC__ */
9430diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9431index 8d72471..5322500 100644
9432--- a/arch/s390/include/asm/barrier.h
9433+++ b/arch/s390/include/asm/barrier.h
9434@@ -42,7 +42,7 @@
9435 do { \
9436 compiletime_assert_atomic_type(*p); \
9437 barrier(); \
9438- ACCESS_ONCE(*p) = (v); \
9439+ ACCESS_ONCE_RW(*p) = (v); \
9440 } while (0)
9441
9442 #define smp_load_acquire(p) \
9443diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9444index 4d7ccac..d03d0ad 100644
9445--- a/arch/s390/include/asm/cache.h
9446+++ b/arch/s390/include/asm/cache.h
9447@@ -9,8 +9,10 @@
9448 #ifndef __ARCH_S390_CACHE_H
9449 #define __ARCH_S390_CACHE_H
9450
9451-#define L1_CACHE_BYTES 256
9452+#include <linux/const.h>
9453+
9454 #define L1_CACHE_SHIFT 8
9455+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9456 #define NET_SKB_PAD 32
9457
9458 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9459diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9460index 3ad48f2..64cc6f3 100644
9461--- a/arch/s390/include/asm/elf.h
9462+++ b/arch/s390/include/asm/elf.h
9463@@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
9464 (STACK_TOP / 3 * 2) : \
9465 (STACK_TOP / 3 * 2) & ~((1UL << 32) - 1))
9466
9467+#ifdef CONFIG_PAX_ASLR
9468+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9469+
9470+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9471+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9472+#endif
9473+
9474 /* This yields a mask that user programs can use to figure out what
9475 instruction set this CPU supports. */
9476
9477diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9478index c4a93d6..4d2a9b4 100644
9479--- a/arch/s390/include/asm/exec.h
9480+++ b/arch/s390/include/asm/exec.h
9481@@ -7,6 +7,6 @@
9482 #ifndef __ASM_EXEC_H
9483 #define __ASM_EXEC_H
9484
9485-extern unsigned long arch_align_stack(unsigned long sp);
9486+#define arch_align_stack(x) ((x) & ~0xfUL)
9487
9488 #endif /* __ASM_EXEC_H */
9489diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9490index d64a7a6..0830329 100644
9491--- a/arch/s390/include/asm/uaccess.h
9492+++ b/arch/s390/include/asm/uaccess.h
9493@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9494 __range_ok((unsigned long)(addr), (size)); \
9495 })
9496
9497+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9498 #define access_ok(type, addr, size) __access_ok(addr, size)
9499
9500 /*
9501@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9502 copy_to_user(void __user *to, const void *from, unsigned long n)
9503 {
9504 might_fault();
9505+
9506+ if ((long)n < 0)
9507+ return n;
9508+
9509 return __copy_to_user(to, from, n);
9510 }
9511
9512@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9513 static inline unsigned long __must_check
9514 copy_from_user(void *to, const void __user *from, unsigned long n)
9515 {
9516- unsigned int sz = __compiletime_object_size(to);
9517+ size_t sz = __compiletime_object_size(to);
9518
9519 might_fault();
9520- if (unlikely(sz != -1 && sz < n)) {
9521+
9522+ if ((long)n < 0)
9523+ return n;
9524+
9525+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9526 copy_from_user_overflow();
9527 return n;
9528 }
9529diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9530index 0c1a679..e1df357 100644
9531--- a/arch/s390/kernel/module.c
9532+++ b/arch/s390/kernel/module.c
9533@@ -159,11 +159,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9534
9535 /* Increase core size by size of got & plt and set start
9536 offsets for got and plt. */
9537- me->core_size = ALIGN(me->core_size, 4);
9538- me->arch.got_offset = me->core_size;
9539- me->core_size += me->arch.got_size;
9540- me->arch.plt_offset = me->core_size;
9541- me->core_size += me->arch.plt_size;
9542+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9543+ me->arch.got_offset = me->core_size_rw;
9544+ me->core_size_rw += me->arch.got_size;
9545+ me->arch.plt_offset = me->core_size_rx;
9546+ me->core_size_rx += me->arch.plt_size;
9547 return 0;
9548 }
9549
9550@@ -279,7 +279,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9551 if (info->got_initialized == 0) {
9552 Elf_Addr *gotent;
9553
9554- gotent = me->module_core + me->arch.got_offset +
9555+ gotent = me->module_core_rw + me->arch.got_offset +
9556 info->got_offset;
9557 *gotent = val;
9558 info->got_initialized = 1;
9559@@ -302,7 +302,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9560 rc = apply_rela_bits(loc, val, 0, 64, 0);
9561 else if (r_type == R_390_GOTENT ||
9562 r_type == R_390_GOTPLTENT) {
9563- val += (Elf_Addr) me->module_core - loc;
9564+ val += (Elf_Addr) me->module_core_rw - loc;
9565 rc = apply_rela_bits(loc, val, 1, 32, 1);
9566 }
9567 break;
9568@@ -315,7 +315,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9569 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9570 if (info->plt_initialized == 0) {
9571 unsigned int *ip;
9572- ip = me->module_core + me->arch.plt_offset +
9573+ ip = me->module_core_rx + me->arch.plt_offset +
9574 info->plt_offset;
9575 ip[0] = 0x0d10e310; /* basr 1,0; lg 1,10(1); br 1 */
9576 ip[1] = 0x100a0004;
9577@@ -334,7 +334,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9578 val - loc + 0xffffUL < 0x1ffffeUL) ||
9579 (r_type == R_390_PLT32DBL &&
9580 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9581- val = (Elf_Addr) me->module_core +
9582+ val = (Elf_Addr) me->module_core_rx +
9583 me->arch.plt_offset +
9584 info->plt_offset;
9585 val += rela->r_addend - loc;
9586@@ -356,7 +356,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9587 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9588 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9589 val = val + rela->r_addend -
9590- ((Elf_Addr) me->module_core + me->arch.got_offset);
9591+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9592 if (r_type == R_390_GOTOFF16)
9593 rc = apply_rela_bits(loc, val, 0, 16, 0);
9594 else if (r_type == R_390_GOTOFF32)
9595@@ -366,7 +366,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9596 break;
9597 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9598 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9599- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9600+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9601 rela->r_addend - loc;
9602 if (r_type == R_390_GOTPC)
9603 rc = apply_rela_bits(loc, val, 1, 32, 0);
9604diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9605index 8f587d8..0642516b 100644
9606--- a/arch/s390/kernel/process.c
9607+++ b/arch/s390/kernel/process.c
9608@@ -200,27 +200,3 @@ unsigned long get_wchan(struct task_struct *p)
9609 }
9610 return 0;
9611 }
9612-
9613-unsigned long arch_align_stack(unsigned long sp)
9614-{
9615- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9616- sp -= get_random_int() & ~PAGE_MASK;
9617- return sp & ~0xf;
9618-}
9619-
9620-static inline unsigned long brk_rnd(void)
9621-{
9622- /* 8MB for 32bit, 1GB for 64bit */
9623- if (is_32bit_task())
9624- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9625- else
9626- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9627-}
9628-
9629-unsigned long arch_randomize_brk(struct mm_struct *mm)
9630-{
9631- unsigned long ret;
9632-
9633- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9634- return (ret > mm->brk) ? ret : mm->brk;
9635-}
9636diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9637index 6e552af..3e608a1 100644
9638--- a/arch/s390/mm/mmap.c
9639+++ b/arch/s390/mm/mmap.c
9640@@ -239,6 +239,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9641 {
9642 unsigned long random_factor = 0UL;
9643
9644+#ifdef CONFIG_PAX_RANDMMAP
9645+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9646+#endif
9647+
9648 if (current->flags & PF_RANDOMIZE)
9649 random_factor = arch_mmap_rnd();
9650
9651@@ -248,9 +252,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9652 */
9653 if (mmap_is_legacy()) {
9654 mm->mmap_base = mmap_base_legacy(random_factor);
9655+
9656+#ifdef CONFIG_PAX_RANDMMAP
9657+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9658+ mm->mmap_base += mm->delta_mmap;
9659+#endif
9660+
9661 mm->get_unmapped_area = s390_get_unmapped_area;
9662 } else {
9663 mm->mmap_base = mmap_base(random_factor);
9664+
9665+#ifdef CONFIG_PAX_RANDMMAP
9666+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9667+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9668+#endif
9669+
9670 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9671 }
9672 }
9673diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9674index ae3d59f..f65f075 100644
9675--- a/arch/score/include/asm/cache.h
9676+++ b/arch/score/include/asm/cache.h
9677@@ -1,7 +1,9 @@
9678 #ifndef _ASM_SCORE_CACHE_H
9679 #define _ASM_SCORE_CACHE_H
9680
9681+#include <linux/const.h>
9682+
9683 #define L1_CACHE_SHIFT 4
9684-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9685+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9686
9687 #endif /* _ASM_SCORE_CACHE_H */
9688diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9689index f9f3cd5..58ff438 100644
9690--- a/arch/score/include/asm/exec.h
9691+++ b/arch/score/include/asm/exec.h
9692@@ -1,6 +1,6 @@
9693 #ifndef _ASM_SCORE_EXEC_H
9694 #define _ASM_SCORE_EXEC_H
9695
9696-extern unsigned long arch_align_stack(unsigned long sp);
9697+#define arch_align_stack(x) (x)
9698
9699 #endif /* _ASM_SCORE_EXEC_H */
9700diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9701index a1519ad3..e8ac1ff 100644
9702--- a/arch/score/kernel/process.c
9703+++ b/arch/score/kernel/process.c
9704@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9705
9706 return task_pt_regs(task)->cp0_epc;
9707 }
9708-
9709-unsigned long arch_align_stack(unsigned long sp)
9710-{
9711- return sp;
9712-}
9713diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9714index ef9e555..331bd29 100644
9715--- a/arch/sh/include/asm/cache.h
9716+++ b/arch/sh/include/asm/cache.h
9717@@ -9,10 +9,11 @@
9718 #define __ASM_SH_CACHE_H
9719 #ifdef __KERNEL__
9720
9721+#include <linux/const.h>
9722 #include <linux/init.h>
9723 #include <cpu/cache.h>
9724
9725-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9726+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9727
9728 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9729
9730diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9731index 6777177..cb5e44f 100644
9732--- a/arch/sh/mm/mmap.c
9733+++ b/arch/sh/mm/mmap.c
9734@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9735 struct mm_struct *mm = current->mm;
9736 struct vm_area_struct *vma;
9737 int do_colour_align;
9738+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9739 struct vm_unmapped_area_info info;
9740
9741 if (flags & MAP_FIXED) {
9742@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9743 if (filp || (flags & MAP_SHARED))
9744 do_colour_align = 1;
9745
9746+#ifdef CONFIG_PAX_RANDMMAP
9747+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9748+#endif
9749+
9750 if (addr) {
9751 if (do_colour_align)
9752 addr = COLOUR_ALIGN(addr, pgoff);
9753@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9754 addr = PAGE_ALIGN(addr);
9755
9756 vma = find_vma(mm, addr);
9757- if (TASK_SIZE - len >= addr &&
9758- (!vma || addr + len <= vma->vm_start))
9759+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9760 return addr;
9761 }
9762
9763 info.flags = 0;
9764 info.length = len;
9765- info.low_limit = TASK_UNMAPPED_BASE;
9766+ info.low_limit = mm->mmap_base;
9767 info.high_limit = TASK_SIZE;
9768 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9769 info.align_offset = pgoff << PAGE_SHIFT;
9770@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9771 struct mm_struct *mm = current->mm;
9772 unsigned long addr = addr0;
9773 int do_colour_align;
9774+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9775 struct vm_unmapped_area_info info;
9776
9777 if (flags & MAP_FIXED) {
9778@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9779 if (filp || (flags & MAP_SHARED))
9780 do_colour_align = 1;
9781
9782+#ifdef CONFIG_PAX_RANDMMAP
9783+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9784+#endif
9785+
9786 /* requesting a specific address */
9787 if (addr) {
9788 if (do_colour_align)
9789@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9790 addr = PAGE_ALIGN(addr);
9791
9792 vma = find_vma(mm, addr);
9793- if (TASK_SIZE - len >= addr &&
9794- (!vma || addr + len <= vma->vm_start))
9795+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9796 return addr;
9797 }
9798
9799@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9800 VM_BUG_ON(addr != -ENOMEM);
9801 info.flags = 0;
9802 info.low_limit = TASK_UNMAPPED_BASE;
9803+
9804+#ifdef CONFIG_PAX_RANDMMAP
9805+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9806+ info.low_limit += mm->delta_mmap;
9807+#endif
9808+
9809 info.high_limit = TASK_SIZE;
9810 addr = vm_unmapped_area(&info);
9811 }
9812diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9813index 4082749..fd97781 100644
9814--- a/arch/sparc/include/asm/atomic_64.h
9815+++ b/arch/sparc/include/asm/atomic_64.h
9816@@ -15,18 +15,38 @@
9817 #define ATOMIC64_INIT(i) { (i) }
9818
9819 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9820+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9821+{
9822+ return ACCESS_ONCE(v->counter);
9823+}
9824 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9825+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9826+{
9827+ return ACCESS_ONCE(v->counter);
9828+}
9829
9830 #define atomic_set(v, i) (((v)->counter) = i)
9831+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9832+{
9833+ v->counter = i;
9834+}
9835 #define atomic64_set(v, i) (((v)->counter) = i)
9836+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9837+{
9838+ v->counter = i;
9839+}
9840
9841-#define ATOMIC_OP(op) \
9842-void atomic_##op(int, atomic_t *); \
9843-void atomic64_##op(long, atomic64_t *);
9844+#define __ATOMIC_OP(op, suffix) \
9845+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9846+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9847
9848-#define ATOMIC_OP_RETURN(op) \
9849-int atomic_##op##_return(int, atomic_t *); \
9850-long atomic64_##op##_return(long, atomic64_t *);
9851+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9852+
9853+#define __ATOMIC_OP_RETURN(op, suffix) \
9854+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9855+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9856+
9857+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9858
9859 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9860
9861@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9862
9863 #undef ATOMIC_OPS
9864 #undef ATOMIC_OP_RETURN
9865+#undef __ATOMIC_OP_RETURN
9866 #undef ATOMIC_OP
9867+#undef __ATOMIC_OP
9868
9869 #define atomic_dec_return(v) atomic_sub_return(1, v)
9870 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9871
9872 #define atomic_inc_return(v) atomic_add_return(1, v)
9873+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9874+{
9875+ return atomic_add_return_unchecked(1, v);
9876+}
9877 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9878+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9879+{
9880+ return atomic64_add_return_unchecked(1, v);
9881+}
9882
9883 /*
9884 * atomic_inc_and_test - increment and test
9885@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9886 * other cases.
9887 */
9888 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9889+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9890+{
9891+ return atomic_inc_return_unchecked(v) == 0;
9892+}
9893 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9894
9895 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9896@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9897 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9898
9899 #define atomic_inc(v) atomic_add(1, v)
9900+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9901+{
9902+ atomic_add_unchecked(1, v);
9903+}
9904 #define atomic64_inc(v) atomic64_add(1, v)
9905+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9906+{
9907+ atomic64_add_unchecked(1, v);
9908+}
9909
9910 #define atomic_dec(v) atomic_sub(1, v)
9911+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9912+{
9913+ atomic_sub_unchecked(1, v);
9914+}
9915 #define atomic64_dec(v) atomic64_sub(1, v)
9916+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9917+{
9918+ atomic64_sub_unchecked(1, v);
9919+}
9920
9921 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9922 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9923
9924 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9925+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9926+{
9927+ return cmpxchg(&v->counter, old, new);
9928+}
9929 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9930+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9931+{
9932+ return xchg(&v->counter, new);
9933+}
9934
9935 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9936 {
9937- int c, old;
9938+ int c, old, new;
9939 c = atomic_read(v);
9940 for (;;) {
9941- if (unlikely(c == (u)))
9942+ if (unlikely(c == u))
9943 break;
9944- old = atomic_cmpxchg((v), c, c + (a));
9945+
9946+ asm volatile("addcc %2, %0, %0\n"
9947+
9948+#ifdef CONFIG_PAX_REFCOUNT
9949+ "tvs %%icc, 6\n"
9950+#endif
9951+
9952+ : "=r" (new)
9953+ : "0" (c), "ir" (a)
9954+ : "cc");
9955+
9956+ old = atomic_cmpxchg(v, c, new);
9957 if (likely(old == c))
9958 break;
9959 c = old;
9960@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9961 #define atomic64_cmpxchg(v, o, n) \
9962 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
9963 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
9964+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9965+{
9966+ return xchg(&v->counter, new);
9967+}
9968
9969 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
9970 {
9971- long c, old;
9972+ long c, old, new;
9973 c = atomic64_read(v);
9974 for (;;) {
9975- if (unlikely(c == (u)))
9976+ if (unlikely(c == u))
9977 break;
9978- old = atomic64_cmpxchg((v), c, c + (a));
9979+
9980+ asm volatile("addcc %2, %0, %0\n"
9981+
9982+#ifdef CONFIG_PAX_REFCOUNT
9983+ "tvs %%xcc, 6\n"
9984+#endif
9985+
9986+ : "=r" (new)
9987+ : "0" (c), "ir" (a)
9988+ : "cc");
9989+
9990+ old = atomic64_cmpxchg(v, c, new);
9991 if (likely(old == c))
9992 break;
9993 c = old;
9994 }
9995- return c != (u);
9996+ return c != u;
9997 }
9998
9999 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10000diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10001index 7664894..45a974b 100644
10002--- a/arch/sparc/include/asm/barrier_64.h
10003+++ b/arch/sparc/include/asm/barrier_64.h
10004@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10005 do { \
10006 compiletime_assert_atomic_type(*p); \
10007 barrier(); \
10008- ACCESS_ONCE(*p) = (v); \
10009+ ACCESS_ONCE_RW(*p) = (v); \
10010 } while (0)
10011
10012 #define smp_load_acquire(p) \
10013diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10014index 5bb6991..5c2132e 100644
10015--- a/arch/sparc/include/asm/cache.h
10016+++ b/arch/sparc/include/asm/cache.h
10017@@ -7,10 +7,12 @@
10018 #ifndef _SPARC_CACHE_H
10019 #define _SPARC_CACHE_H
10020
10021+#include <linux/const.h>
10022+
10023 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10024
10025 #define L1_CACHE_SHIFT 5
10026-#define L1_CACHE_BYTES 32
10027+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10028
10029 #ifdef CONFIG_SPARC32
10030 #define SMP_CACHE_BYTES_SHIFT 5
10031diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10032index a24e41f..47677ff 100644
10033--- a/arch/sparc/include/asm/elf_32.h
10034+++ b/arch/sparc/include/asm/elf_32.h
10035@@ -114,6 +114,13 @@ typedef struct {
10036
10037 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10038
10039+#ifdef CONFIG_PAX_ASLR
10040+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10041+
10042+#define PAX_DELTA_MMAP_LEN 16
10043+#define PAX_DELTA_STACK_LEN 16
10044+#endif
10045+
10046 /* This yields a mask that user programs can use to figure out what
10047 instruction set this cpu supports. This can NOT be done in userspace
10048 on Sparc. */
10049diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10050index 370ca1e..d4f4a98 100644
10051--- a/arch/sparc/include/asm/elf_64.h
10052+++ b/arch/sparc/include/asm/elf_64.h
10053@@ -189,6 +189,13 @@ typedef struct {
10054 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10055 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10056
10057+#ifdef CONFIG_PAX_ASLR
10058+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10059+
10060+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10061+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10062+#endif
10063+
10064 extern unsigned long sparc64_elf_hwcap;
10065 #define ELF_HWCAP sparc64_elf_hwcap
10066
10067diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10068index a3890da..f6a408e 100644
10069--- a/arch/sparc/include/asm/pgalloc_32.h
10070+++ b/arch/sparc/include/asm/pgalloc_32.h
10071@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10072 }
10073
10074 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10075+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10076
10077 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10078 unsigned long address)
10079diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10080index 5e31871..13469c6 100644
10081--- a/arch/sparc/include/asm/pgalloc_64.h
10082+++ b/arch/sparc/include/asm/pgalloc_64.h
10083@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10084 }
10085
10086 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10087+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10088
10089 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10090 {
10091@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10092 }
10093
10094 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10095+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10096
10097 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10098 {
10099diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10100index 59ba6f6..4518128 100644
10101--- a/arch/sparc/include/asm/pgtable.h
10102+++ b/arch/sparc/include/asm/pgtable.h
10103@@ -5,4 +5,8 @@
10104 #else
10105 #include <asm/pgtable_32.h>
10106 #endif
10107+
10108+#define ktla_ktva(addr) (addr)
10109+#define ktva_ktla(addr) (addr)
10110+
10111 #endif
10112diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10113index f06b36a..bca3189 100644
10114--- a/arch/sparc/include/asm/pgtable_32.h
10115+++ b/arch/sparc/include/asm/pgtable_32.h
10116@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10117 #define PAGE_SHARED SRMMU_PAGE_SHARED
10118 #define PAGE_COPY SRMMU_PAGE_COPY
10119 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10120+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10121+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10122+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10123 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10124
10125 /* Top-level page directory - dummy used by init-mm.
10126@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10127
10128 /* xwr */
10129 #define __P000 PAGE_NONE
10130-#define __P001 PAGE_READONLY
10131-#define __P010 PAGE_COPY
10132-#define __P011 PAGE_COPY
10133+#define __P001 PAGE_READONLY_NOEXEC
10134+#define __P010 PAGE_COPY_NOEXEC
10135+#define __P011 PAGE_COPY_NOEXEC
10136 #define __P100 PAGE_READONLY
10137 #define __P101 PAGE_READONLY
10138 #define __P110 PAGE_COPY
10139 #define __P111 PAGE_COPY
10140
10141 #define __S000 PAGE_NONE
10142-#define __S001 PAGE_READONLY
10143-#define __S010 PAGE_SHARED
10144-#define __S011 PAGE_SHARED
10145+#define __S001 PAGE_READONLY_NOEXEC
10146+#define __S010 PAGE_SHARED_NOEXEC
10147+#define __S011 PAGE_SHARED_NOEXEC
10148 #define __S100 PAGE_READONLY
10149 #define __S101 PAGE_READONLY
10150 #define __S110 PAGE_SHARED
10151diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10152index ae51a11..eadfd03 100644
10153--- a/arch/sparc/include/asm/pgtsrmmu.h
10154+++ b/arch/sparc/include/asm/pgtsrmmu.h
10155@@ -111,6 +111,11 @@
10156 SRMMU_EXEC | SRMMU_REF)
10157 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10158 SRMMU_EXEC | SRMMU_REF)
10159+
10160+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10161+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10162+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10163+
10164 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10165 SRMMU_DIRTY | SRMMU_REF)
10166
10167diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10168index 29d64b1..4272fe8 100644
10169--- a/arch/sparc/include/asm/setup.h
10170+++ b/arch/sparc/include/asm/setup.h
10171@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10172 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10173
10174 /* init_64.c */
10175-extern atomic_t dcpage_flushes;
10176-extern atomic_t dcpage_flushes_xcall;
10177+extern atomic_unchecked_t dcpage_flushes;
10178+extern atomic_unchecked_t dcpage_flushes_xcall;
10179
10180 extern int sysctl_tsb_ratio;
10181 #endif
10182diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10183index 9689176..63c18ea 100644
10184--- a/arch/sparc/include/asm/spinlock_64.h
10185+++ b/arch/sparc/include/asm/spinlock_64.h
10186@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10187
10188 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10189
10190-static void inline arch_read_lock(arch_rwlock_t *lock)
10191+static inline void arch_read_lock(arch_rwlock_t *lock)
10192 {
10193 unsigned long tmp1, tmp2;
10194
10195 __asm__ __volatile__ (
10196 "1: ldsw [%2], %0\n"
10197 " brlz,pn %0, 2f\n"
10198-"4: add %0, 1, %1\n"
10199+"4: addcc %0, 1, %1\n"
10200+
10201+#ifdef CONFIG_PAX_REFCOUNT
10202+" tvs %%icc, 6\n"
10203+#endif
10204+
10205 " cas [%2], %0, %1\n"
10206 " cmp %0, %1\n"
10207 " bne,pn %%icc, 1b\n"
10208@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10209 " .previous"
10210 : "=&r" (tmp1), "=&r" (tmp2)
10211 : "r" (lock)
10212- : "memory");
10213+ : "memory", "cc");
10214 }
10215
10216-static int inline arch_read_trylock(arch_rwlock_t *lock)
10217+static inline int arch_read_trylock(arch_rwlock_t *lock)
10218 {
10219 int tmp1, tmp2;
10220
10221@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10222 "1: ldsw [%2], %0\n"
10223 " brlz,a,pn %0, 2f\n"
10224 " mov 0, %0\n"
10225-" add %0, 1, %1\n"
10226+" addcc %0, 1, %1\n"
10227+
10228+#ifdef CONFIG_PAX_REFCOUNT
10229+" tvs %%icc, 6\n"
10230+#endif
10231+
10232 " cas [%2], %0, %1\n"
10233 " cmp %0, %1\n"
10234 " bne,pn %%icc, 1b\n"
10235@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10236 return tmp1;
10237 }
10238
10239-static void inline arch_read_unlock(arch_rwlock_t *lock)
10240+static inline void arch_read_unlock(arch_rwlock_t *lock)
10241 {
10242 unsigned long tmp1, tmp2;
10243
10244 __asm__ __volatile__(
10245 "1: lduw [%2], %0\n"
10246-" sub %0, 1, %1\n"
10247+" subcc %0, 1, %1\n"
10248+
10249+#ifdef CONFIG_PAX_REFCOUNT
10250+" tvs %%icc, 6\n"
10251+#endif
10252+
10253 " cas [%2], %0, %1\n"
10254 " cmp %0, %1\n"
10255 " bne,pn %%xcc, 1b\n"
10256@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10257 : "memory");
10258 }
10259
10260-static void inline arch_write_lock(arch_rwlock_t *lock)
10261+static inline void arch_write_lock(arch_rwlock_t *lock)
10262 {
10263 unsigned long mask, tmp1, tmp2;
10264
10265@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10266 : "memory");
10267 }
10268
10269-static void inline arch_write_unlock(arch_rwlock_t *lock)
10270+static inline void arch_write_unlock(arch_rwlock_t *lock)
10271 {
10272 __asm__ __volatile__(
10273 " stw %%g0, [%0]"
10274@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10275 : "memory");
10276 }
10277
10278-static int inline arch_write_trylock(arch_rwlock_t *lock)
10279+static inline int arch_write_trylock(arch_rwlock_t *lock)
10280 {
10281 unsigned long mask, tmp1, tmp2, result;
10282
10283diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10284index 229475f..2fca9163 100644
10285--- a/arch/sparc/include/asm/thread_info_32.h
10286+++ b/arch/sparc/include/asm/thread_info_32.h
10287@@ -48,6 +48,7 @@ struct thread_info {
10288 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10289 unsigned long rwbuf_stkptrs[NSWINS];
10290 unsigned long w_saved;
10291+ unsigned long lowest_stack;
10292 };
10293
10294 /*
10295diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10296index bde5982..9cbb56d 100644
10297--- a/arch/sparc/include/asm/thread_info_64.h
10298+++ b/arch/sparc/include/asm/thread_info_64.h
10299@@ -59,6 +59,8 @@ struct thread_info {
10300 struct pt_regs *kern_una_regs;
10301 unsigned int kern_una_insn;
10302
10303+ unsigned long lowest_stack;
10304+
10305 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10306 __attribute__ ((aligned(64)));
10307 };
10308@@ -180,12 +182,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10309 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10310 /* flag bit 4 is available */
10311 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10312-/* flag bit 6 is available */
10313+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10314 #define TIF_32BIT 7 /* 32-bit binary */
10315 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10316 #define TIF_SECCOMP 9 /* secure computing */
10317 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10318 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10319+
10320 /* NOTE: Thread flags >= 12 should be ones we have no interest
10321 * in using in assembly, else we can't use the mask as
10322 * an immediate value in instructions such as andcc.
10323@@ -205,12 +208,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10324 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10325 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10326 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10327+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10328
10329 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10330 _TIF_DO_NOTIFY_RESUME_MASK | \
10331 _TIF_NEED_RESCHED)
10332 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10333
10334+#define _TIF_WORK_SYSCALL \
10335+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10336+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10337+
10338 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10339
10340 /*
10341diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10342index bd56c28..4b63d83 100644
10343--- a/arch/sparc/include/asm/uaccess.h
10344+++ b/arch/sparc/include/asm/uaccess.h
10345@@ -1,5 +1,6 @@
10346 #ifndef ___ASM_SPARC_UACCESS_H
10347 #define ___ASM_SPARC_UACCESS_H
10348+
10349 #if defined(__sparc__) && defined(__arch64__)
10350 #include <asm/uaccess_64.h>
10351 #else
10352diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10353index 64ee103..388aef0 100644
10354--- a/arch/sparc/include/asm/uaccess_32.h
10355+++ b/arch/sparc/include/asm/uaccess_32.h
10356@@ -47,6 +47,7 @@
10357 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10358 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10359 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10360+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10361 #define access_ok(type, addr, size) \
10362 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10363
10364@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10365
10366 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10367 {
10368- if (n && __access_ok((unsigned long) to, n))
10369+ if ((long)n < 0)
10370+ return n;
10371+
10372+ if (n && __access_ok((unsigned long) to, n)) {
10373+ if (!__builtin_constant_p(n))
10374+ check_object_size(from, n, true);
10375 return __copy_user(to, (__force void __user *) from, n);
10376- else
10377+ } else
10378 return n;
10379 }
10380
10381 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10382 {
10383+ if ((long)n < 0)
10384+ return n;
10385+
10386+ if (!__builtin_constant_p(n))
10387+ check_object_size(from, n, true);
10388+
10389 return __copy_user(to, (__force void __user *) from, n);
10390 }
10391
10392 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10393 {
10394- if (n && __access_ok((unsigned long) from, n))
10395+ if ((long)n < 0)
10396+ return n;
10397+
10398+ if (n && __access_ok((unsigned long) from, n)) {
10399+ if (!__builtin_constant_p(n))
10400+ check_object_size(to, n, false);
10401 return __copy_user((__force void __user *) to, from, n);
10402- else
10403+ } else
10404 return n;
10405 }
10406
10407 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10408 {
10409+ if ((long)n < 0)
10410+ return n;
10411+
10412 return __copy_user((__force void __user *) to, from, n);
10413 }
10414
10415diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10416index a35194b..47dabc0d 100644
10417--- a/arch/sparc/include/asm/uaccess_64.h
10418+++ b/arch/sparc/include/asm/uaccess_64.h
10419@@ -10,6 +10,7 @@
10420 #include <linux/compiler.h>
10421 #include <linux/string.h>
10422 #include <linux/thread_info.h>
10423+#include <linux/kernel.h>
10424 #include <asm/asi.h>
10425 #include <asm/spitfire.h>
10426 #include <asm-generic/uaccess-unaligned.h>
10427@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10428 return 1;
10429 }
10430
10431+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10432+{
10433+ return 1;
10434+}
10435+
10436 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10437 {
10438 return 1;
10439@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10440 static inline unsigned long __must_check
10441 copy_from_user(void *to, const void __user *from, unsigned long size)
10442 {
10443- unsigned long ret = ___copy_from_user(to, from, size);
10444+ unsigned long ret;
10445
10446+ if ((long)size < 0 || size > INT_MAX)
10447+ return size;
10448+
10449+ if (!__builtin_constant_p(size))
10450+ check_object_size(to, size, false);
10451+
10452+ ret = ___copy_from_user(to, from, size);
10453 if (unlikely(ret))
10454 ret = copy_from_user_fixup(to, from, size);
10455
10456@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10457 static inline unsigned long __must_check
10458 copy_to_user(void __user *to, const void *from, unsigned long size)
10459 {
10460- unsigned long ret = ___copy_to_user(to, from, size);
10461+ unsigned long ret;
10462
10463+ if ((long)size < 0 || size > INT_MAX)
10464+ return size;
10465+
10466+ if (!__builtin_constant_p(size))
10467+ check_object_size(from, size, true);
10468+
10469+ ret = ___copy_to_user(to, from, size);
10470 if (unlikely(ret))
10471 ret = copy_to_user_fixup(to, from, size);
10472 return ret;
10473diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10474index 7cf9c6e..6206648 100644
10475--- a/arch/sparc/kernel/Makefile
10476+++ b/arch/sparc/kernel/Makefile
10477@@ -4,7 +4,7 @@
10478 #
10479
10480 asflags-y := -ansi
10481-ccflags-y := -Werror
10482+#ccflags-y := -Werror
10483
10484 extra-y := head_$(BITS).o
10485
10486diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10487index 50e7b62..79fae35 100644
10488--- a/arch/sparc/kernel/process_32.c
10489+++ b/arch/sparc/kernel/process_32.c
10490@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10491
10492 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10493 r->psr, r->pc, r->npc, r->y, print_tainted());
10494- printk("PC: <%pS>\n", (void *) r->pc);
10495+ printk("PC: <%pA>\n", (void *) r->pc);
10496 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10497 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10498 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10499 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10500 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10501 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10502- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10503+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10504
10505 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10506 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10507@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10508 rw = (struct reg_window32 *) fp;
10509 pc = rw->ins[7];
10510 printk("[%08lx : ", pc);
10511- printk("%pS ] ", (void *) pc);
10512+ printk("%pA ] ", (void *) pc);
10513 fp = rw->ins[6];
10514 } while (++count < 16);
10515 printk("\n");
10516diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10517index 46a5964..a35c62c 100644
10518--- a/arch/sparc/kernel/process_64.c
10519+++ b/arch/sparc/kernel/process_64.c
10520@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10521 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10522 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10523 if (regs->tstate & TSTATE_PRIV)
10524- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10525+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10526 }
10527
10528 void show_regs(struct pt_regs *regs)
10529@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10530
10531 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10532 regs->tpc, regs->tnpc, regs->y, print_tainted());
10533- printk("TPC: <%pS>\n", (void *) regs->tpc);
10534+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10535 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10536 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10537 regs->u_regs[3]);
10538@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10539 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10540 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10541 regs->u_regs[15]);
10542- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10543+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10544 show_regwindow(regs);
10545 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10546 }
10547@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10548 ((tp && tp->task) ? tp->task->pid : -1));
10549
10550 if (gp->tstate & TSTATE_PRIV) {
10551- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10552+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10553 (void *) gp->tpc,
10554 (void *) gp->o7,
10555 (void *) gp->i7,
10556diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10557index 79cc0d1..ec62734 100644
10558--- a/arch/sparc/kernel/prom_common.c
10559+++ b/arch/sparc/kernel/prom_common.c
10560@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10561
10562 unsigned int prom_early_allocated __initdata;
10563
10564-static struct of_pdt_ops prom_sparc_ops __initdata = {
10565+static struct of_pdt_ops prom_sparc_ops __initconst = {
10566 .nextprop = prom_common_nextprop,
10567 .getproplen = prom_getproplen,
10568 .getproperty = prom_getproperty,
10569diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10570index 9ddc492..27a5619 100644
10571--- a/arch/sparc/kernel/ptrace_64.c
10572+++ b/arch/sparc/kernel/ptrace_64.c
10573@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10574 return ret;
10575 }
10576
10577+#ifdef CONFIG_GRKERNSEC_SETXID
10578+extern void gr_delayed_cred_worker(void);
10579+#endif
10580+
10581 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10582 {
10583 int ret = 0;
10584@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10585 if (test_thread_flag(TIF_NOHZ))
10586 user_exit();
10587
10588+#ifdef CONFIG_GRKERNSEC_SETXID
10589+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10590+ gr_delayed_cred_worker();
10591+#endif
10592+
10593 if (test_thread_flag(TIF_SYSCALL_TRACE))
10594 ret = tracehook_report_syscall_entry(regs);
10595
10596@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10597 if (test_thread_flag(TIF_NOHZ))
10598 user_exit();
10599
10600+#ifdef CONFIG_GRKERNSEC_SETXID
10601+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10602+ gr_delayed_cred_worker();
10603+#endif
10604+
10605 audit_syscall_exit(regs);
10606
10607 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10608diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10609index 19cd08d..ff21e99 100644
10610--- a/arch/sparc/kernel/smp_64.c
10611+++ b/arch/sparc/kernel/smp_64.c
10612@@ -891,7 +891,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10613 return;
10614
10615 #ifdef CONFIG_DEBUG_DCFLUSH
10616- atomic_inc(&dcpage_flushes);
10617+ atomic_inc_unchecked(&dcpage_flushes);
10618 #endif
10619
10620 this_cpu = get_cpu();
10621@@ -915,7 +915,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10622 xcall_deliver(data0, __pa(pg_addr),
10623 (u64) pg_addr, cpumask_of(cpu));
10624 #ifdef CONFIG_DEBUG_DCFLUSH
10625- atomic_inc(&dcpage_flushes_xcall);
10626+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10627 #endif
10628 }
10629 }
10630@@ -934,7 +934,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10631 preempt_disable();
10632
10633 #ifdef CONFIG_DEBUG_DCFLUSH
10634- atomic_inc(&dcpage_flushes);
10635+ atomic_inc_unchecked(&dcpage_flushes);
10636 #endif
10637 data0 = 0;
10638 pg_addr = page_address(page);
10639@@ -951,7 +951,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10640 xcall_deliver(data0, __pa(pg_addr),
10641 (u64) pg_addr, cpu_online_mask);
10642 #ifdef CONFIG_DEBUG_DCFLUSH
10643- atomic_inc(&dcpage_flushes_xcall);
10644+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10645 #endif
10646 }
10647 __local_flush_dcache_page(page);
10648diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10649index 646988d..b88905f 100644
10650--- a/arch/sparc/kernel/sys_sparc_32.c
10651+++ b/arch/sparc/kernel/sys_sparc_32.c
10652@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10653 if (len > TASK_SIZE - PAGE_SIZE)
10654 return -ENOMEM;
10655 if (!addr)
10656- addr = TASK_UNMAPPED_BASE;
10657+ addr = current->mm->mmap_base;
10658
10659 info.flags = 0;
10660 info.length = len;
10661diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10662index 30e7ddb..266a3b0 100644
10663--- a/arch/sparc/kernel/sys_sparc_64.c
10664+++ b/arch/sparc/kernel/sys_sparc_64.c
10665@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10666 struct vm_area_struct * vma;
10667 unsigned long task_size = TASK_SIZE;
10668 int do_color_align;
10669+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10670 struct vm_unmapped_area_info info;
10671
10672 if (flags & MAP_FIXED) {
10673 /* We do not accept a shared mapping if it would violate
10674 * cache aliasing constraints.
10675 */
10676- if ((flags & MAP_SHARED) &&
10677+ if ((filp || (flags & MAP_SHARED)) &&
10678 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10679 return -EINVAL;
10680 return addr;
10681@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10682 if (filp || (flags & MAP_SHARED))
10683 do_color_align = 1;
10684
10685+#ifdef CONFIG_PAX_RANDMMAP
10686+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10687+#endif
10688+
10689 if (addr) {
10690 if (do_color_align)
10691 addr = COLOR_ALIGN(addr, pgoff);
10692@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10693 addr = PAGE_ALIGN(addr);
10694
10695 vma = find_vma(mm, addr);
10696- if (task_size - len >= addr &&
10697- (!vma || addr + len <= vma->vm_start))
10698+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10699 return addr;
10700 }
10701
10702 info.flags = 0;
10703 info.length = len;
10704- info.low_limit = TASK_UNMAPPED_BASE;
10705+ info.low_limit = mm->mmap_base;
10706 info.high_limit = min(task_size, VA_EXCLUDE_START);
10707 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10708 info.align_offset = pgoff << PAGE_SHIFT;
10709+ info.threadstack_offset = offset;
10710 addr = vm_unmapped_area(&info);
10711
10712 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10713 VM_BUG_ON(addr != -ENOMEM);
10714 info.low_limit = VA_EXCLUDE_END;
10715+
10716+#ifdef CONFIG_PAX_RANDMMAP
10717+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10718+ info.low_limit += mm->delta_mmap;
10719+#endif
10720+
10721 info.high_limit = task_size;
10722 addr = vm_unmapped_area(&info);
10723 }
10724@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10725 unsigned long task_size = STACK_TOP32;
10726 unsigned long addr = addr0;
10727 int do_color_align;
10728+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10729 struct vm_unmapped_area_info info;
10730
10731 /* This should only ever run for 32-bit processes. */
10732@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10733 /* We do not accept a shared mapping if it would violate
10734 * cache aliasing constraints.
10735 */
10736- if ((flags & MAP_SHARED) &&
10737+ if ((filp || (flags & MAP_SHARED)) &&
10738 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10739 return -EINVAL;
10740 return addr;
10741@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10742 if (filp || (flags & MAP_SHARED))
10743 do_color_align = 1;
10744
10745+#ifdef CONFIG_PAX_RANDMMAP
10746+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10747+#endif
10748+
10749 /* requesting a specific address */
10750 if (addr) {
10751 if (do_color_align)
10752@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10753 addr = PAGE_ALIGN(addr);
10754
10755 vma = find_vma(mm, addr);
10756- if (task_size - len >= addr &&
10757- (!vma || addr + len <= vma->vm_start))
10758+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10759 return addr;
10760 }
10761
10762@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10763 info.high_limit = mm->mmap_base;
10764 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10765 info.align_offset = pgoff << PAGE_SHIFT;
10766+ info.threadstack_offset = offset;
10767 addr = vm_unmapped_area(&info);
10768
10769 /*
10770@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10771 VM_BUG_ON(addr != -ENOMEM);
10772 info.flags = 0;
10773 info.low_limit = TASK_UNMAPPED_BASE;
10774+
10775+#ifdef CONFIG_PAX_RANDMMAP
10776+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10777+ info.low_limit += mm->delta_mmap;
10778+#endif
10779+
10780 info.high_limit = STACK_TOP32;
10781 addr = vm_unmapped_area(&info);
10782 }
10783@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10784 EXPORT_SYMBOL(get_fb_unmapped_area);
10785
10786 /* Essentially the same as PowerPC. */
10787-static unsigned long mmap_rnd(void)
10788+static unsigned long mmap_rnd(struct mm_struct *mm)
10789 {
10790 unsigned long rnd = 0UL;
10791
10792+#ifdef CONFIG_PAX_RANDMMAP
10793+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10794+#endif
10795+
10796 if (current->flags & PF_RANDOMIZE) {
10797 unsigned long val = get_random_int();
10798 if (test_thread_flag(TIF_32BIT))
10799@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10800
10801 void arch_pick_mmap_layout(struct mm_struct *mm)
10802 {
10803- unsigned long random_factor = mmap_rnd();
10804+ unsigned long random_factor = mmap_rnd(mm);
10805 unsigned long gap;
10806
10807 /*
10808@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10809 gap == RLIM_INFINITY ||
10810 sysctl_legacy_va_layout) {
10811 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10812+
10813+#ifdef CONFIG_PAX_RANDMMAP
10814+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10815+ mm->mmap_base += mm->delta_mmap;
10816+#endif
10817+
10818 mm->get_unmapped_area = arch_get_unmapped_area;
10819 } else {
10820 /* We know it's 32-bit */
10821@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10822 gap = (task_size / 6 * 5);
10823
10824 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10825+
10826+#ifdef CONFIG_PAX_RANDMMAP
10827+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10828+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10829+#endif
10830+
10831 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10832 }
10833 }
10834diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10835index bb00089..e0ea580 100644
10836--- a/arch/sparc/kernel/syscalls.S
10837+++ b/arch/sparc/kernel/syscalls.S
10838@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10839 #endif
10840 .align 32
10841 1: ldx [%g6 + TI_FLAGS], %l5
10842- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10843+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10844 be,pt %icc, rtrap
10845 nop
10846 call syscall_trace_leave
10847@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10848
10849 srl %i3, 0, %o3 ! IEU0
10850 srl %i2, 0, %o2 ! IEU0 Group
10851- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10852+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10853 bne,pn %icc, linux_syscall_trace32 ! CTI
10854 mov %i0, %l5 ! IEU1
10855 5: call %l7 ! CTI Group brk forced
10856@@ -218,7 +218,7 @@ linux_sparc_syscall:
10857
10858 mov %i3, %o3 ! IEU1
10859 mov %i4, %o4 ! IEU0 Group
10860- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10861+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10862 bne,pn %icc, linux_syscall_trace ! CTI Group
10863 mov %i0, %l5 ! IEU0
10864 2: call %l7 ! CTI Group brk forced
10865@@ -233,7 +233,7 @@ ret_sys_call:
10866
10867 cmp %o0, -ERESTART_RESTARTBLOCK
10868 bgeu,pn %xcc, 1f
10869- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10870+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10871 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10872
10873 2:
10874diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10875index 4f21df7..0a374da 100644
10876--- a/arch/sparc/kernel/traps_32.c
10877+++ b/arch/sparc/kernel/traps_32.c
10878@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10879 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10880 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10881
10882+extern void gr_handle_kernel_exploit(void);
10883+
10884 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10885 {
10886 static int die_counter;
10887@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10888 count++ < 30 &&
10889 (((unsigned long) rw) >= PAGE_OFFSET) &&
10890 !(((unsigned long) rw) & 0x7)) {
10891- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10892+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10893 (void *) rw->ins[7]);
10894 rw = (struct reg_window32 *)rw->ins[6];
10895 }
10896 }
10897 printk("Instruction DUMP:");
10898 instruction_dump ((unsigned long *) regs->pc);
10899- if(regs->psr & PSR_PS)
10900+ if(regs->psr & PSR_PS) {
10901+ gr_handle_kernel_exploit();
10902 do_exit(SIGKILL);
10903+ }
10904 do_exit(SIGSEGV);
10905 }
10906
10907diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10908index d21cd62..00a4a17 100644
10909--- a/arch/sparc/kernel/traps_64.c
10910+++ b/arch/sparc/kernel/traps_64.c
10911@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10912 i + 1,
10913 p->trapstack[i].tstate, p->trapstack[i].tpc,
10914 p->trapstack[i].tnpc, p->trapstack[i].tt);
10915- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10916+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10917 }
10918 }
10919
10920@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10921
10922 lvl -= 0x100;
10923 if (regs->tstate & TSTATE_PRIV) {
10924+
10925+#ifdef CONFIG_PAX_REFCOUNT
10926+ if (lvl == 6)
10927+ pax_report_refcount_overflow(regs);
10928+#endif
10929+
10930 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10931 die_if_kernel(buffer, regs);
10932 }
10933@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10934 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10935 {
10936 char buffer[32];
10937-
10938+
10939 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10940 0, lvl, SIGTRAP) == NOTIFY_STOP)
10941 return;
10942
10943+#ifdef CONFIG_PAX_REFCOUNT
10944+ if (lvl == 6)
10945+ pax_report_refcount_overflow(regs);
10946+#endif
10947+
10948 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10949
10950 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10951@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10952 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10953 printk("%s" "ERROR(%d): ",
10954 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10955- printk("TPC<%pS>\n", (void *) regs->tpc);
10956+ printk("TPC<%pA>\n", (void *) regs->tpc);
10957 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10958 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10959 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10960@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10961 smp_processor_id(),
10962 (type & 0x1) ? 'I' : 'D',
10963 regs->tpc);
10964- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
10965+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
10966 panic("Irrecoverable Cheetah+ parity error.");
10967 }
10968
10969@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10970 smp_processor_id(),
10971 (type & 0x1) ? 'I' : 'D',
10972 regs->tpc);
10973- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
10974+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
10975 }
10976
10977 struct sun4v_error_entry {
10978@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
10979 /*0x38*/u64 reserved_5;
10980 };
10981
10982-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10983-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10984+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10985+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10986
10987 static const char *sun4v_err_type_to_str(u8 type)
10988 {
10989@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
10990 }
10991
10992 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10993- int cpu, const char *pfx, atomic_t *ocnt)
10994+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
10995 {
10996 u64 *raw_ptr = (u64 *) ent;
10997 u32 attrs;
10998@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10999
11000 show_regs(regs);
11001
11002- if ((cnt = atomic_read(ocnt)) != 0) {
11003- atomic_set(ocnt, 0);
11004+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11005+ atomic_set_unchecked(ocnt, 0);
11006 wmb();
11007 printk("%s: Queue overflowed %d times.\n",
11008 pfx, cnt);
11009@@ -2048,7 +2059,7 @@ out:
11010 */
11011 void sun4v_resum_overflow(struct pt_regs *regs)
11012 {
11013- atomic_inc(&sun4v_resum_oflow_cnt);
11014+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11015 }
11016
11017 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11018@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11019 /* XXX Actually even this can make not that much sense. Perhaps
11020 * XXX we should just pull the plug and panic directly from here?
11021 */
11022- atomic_inc(&sun4v_nonresum_oflow_cnt);
11023+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11024 }
11025
11026 static void sun4v_tlb_error(struct pt_regs *regs)
11027@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11028
11029 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11030 regs->tpc, tl);
11031- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11032+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11033 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11034- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11035+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11036 (void *) regs->u_regs[UREG_I7]);
11037 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11038 "pte[%lx] error[%lx]\n",
11039@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11040
11041 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11042 regs->tpc, tl);
11043- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11044+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11045 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11046- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11047+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11048 (void *) regs->u_regs[UREG_I7]);
11049 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11050 "pte[%lx] error[%lx]\n",
11051@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11052 fp = (unsigned long)sf->fp + STACK_BIAS;
11053 }
11054
11055- printk(" [%016lx] %pS\n", pc, (void *) pc);
11056+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11057 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11058 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11059 int index = tsk->curr_ret_stack;
11060 if (tsk->ret_stack && index >= graph) {
11061 pc = tsk->ret_stack[index - graph].ret;
11062- printk(" [%016lx] %pS\n", pc, (void *) pc);
11063+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11064 graph++;
11065 }
11066 }
11067@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11068 return (struct reg_window *) (fp + STACK_BIAS);
11069 }
11070
11071+extern void gr_handle_kernel_exploit(void);
11072+
11073 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11074 {
11075 static int die_counter;
11076@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11077 while (rw &&
11078 count++ < 30 &&
11079 kstack_valid(tp, (unsigned long) rw)) {
11080- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11081+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11082 (void *) rw->ins[7]);
11083
11084 rw = kernel_stack_up(rw);
11085@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11086 }
11087 if (panic_on_oops)
11088 panic("Fatal exception");
11089- if (regs->tstate & TSTATE_PRIV)
11090+ if (regs->tstate & TSTATE_PRIV) {
11091+ gr_handle_kernel_exploit();
11092 do_exit(SIGKILL);
11093+ }
11094 do_exit(SIGSEGV);
11095 }
11096 EXPORT_SYMBOL(die_if_kernel);
11097diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11098index 62098a8..547ab2c 100644
11099--- a/arch/sparc/kernel/unaligned_64.c
11100+++ b/arch/sparc/kernel/unaligned_64.c
11101@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11102 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11103
11104 if (__ratelimit(&ratelimit)) {
11105- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11106+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11107 regs->tpc, (void *) regs->tpc);
11108 }
11109 }
11110diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11111index 3269b02..64f5231 100644
11112--- a/arch/sparc/lib/Makefile
11113+++ b/arch/sparc/lib/Makefile
11114@@ -2,7 +2,7 @@
11115 #
11116
11117 asflags-y := -ansi -DST_DIV0=0x02
11118-ccflags-y := -Werror
11119+#ccflags-y := -Werror
11120
11121 lib-$(CONFIG_SPARC32) += ashrdi3.o
11122 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11123diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11124index 05dac43..76f8ed4 100644
11125--- a/arch/sparc/lib/atomic_64.S
11126+++ b/arch/sparc/lib/atomic_64.S
11127@@ -15,11 +15,22 @@
11128 * a value and does the barriers.
11129 */
11130
11131-#define ATOMIC_OP(op) \
11132-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11133+#ifdef CONFIG_PAX_REFCOUNT
11134+#define __REFCOUNT_OP(op) op##cc
11135+#define __OVERFLOW_IOP tvs %icc, 6;
11136+#define __OVERFLOW_XOP tvs %xcc, 6;
11137+#else
11138+#define __REFCOUNT_OP(op) op
11139+#define __OVERFLOW_IOP
11140+#define __OVERFLOW_XOP
11141+#endif
11142+
11143+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11144+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11145 BACKOFF_SETUP(%o2); \
11146 1: lduw [%o1], %g1; \
11147- op %g1, %o0, %g7; \
11148+ asm_op %g1, %o0, %g7; \
11149+ post_op \
11150 cas [%o1], %g1, %g7; \
11151 cmp %g1, %g7; \
11152 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11153@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11154 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11155 ENDPROC(atomic_##op); \
11156
11157-#define ATOMIC_OP_RETURN(op) \
11158-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11159+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11160+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11161+
11162+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11163+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11164 BACKOFF_SETUP(%o2); \
11165 1: lduw [%o1], %g1; \
11166- op %g1, %o0, %g7; \
11167+ asm_op %g1, %o0, %g7; \
11168+ post_op \
11169 cas [%o1], %g1, %g7; \
11170 cmp %g1, %g7; \
11171 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11172@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11173 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11174 ENDPROC(atomic_##op##_return);
11175
11176+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11177+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11178+
11179 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11180
11181 ATOMIC_OPS(add)
11182@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11183
11184 #undef ATOMIC_OPS
11185 #undef ATOMIC_OP_RETURN
11186+#undef __ATOMIC_OP_RETURN
11187 #undef ATOMIC_OP
11188+#undef __ATOMIC_OP
11189
11190-#define ATOMIC64_OP(op) \
11191-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11192+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11193+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11194 BACKOFF_SETUP(%o2); \
11195 1: ldx [%o1], %g1; \
11196- op %g1, %o0, %g7; \
11197+ asm_op %g1, %o0, %g7; \
11198+ post_op \
11199 casx [%o1], %g1, %g7; \
11200 cmp %g1, %g7; \
11201 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11202@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11203 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11204 ENDPROC(atomic64_##op); \
11205
11206-#define ATOMIC64_OP_RETURN(op) \
11207-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11208+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11209+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11210+
11211+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11212+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11213 BACKOFF_SETUP(%o2); \
11214 1: ldx [%o1], %g1; \
11215- op %g1, %o0, %g7; \
11216+ asm_op %g1, %o0, %g7; \
11217+ post_op \
11218 casx [%o1], %g1, %g7; \
11219 cmp %g1, %g7; \
11220 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11221@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11222 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11223 ENDPROC(atomic64_##op##_return);
11224
11225+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11226+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11227+
11228 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11229
11230 ATOMIC64_OPS(add)
11231@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11232
11233 #undef ATOMIC64_OPS
11234 #undef ATOMIC64_OP_RETURN
11235+#undef __ATOMIC64_OP_RETURN
11236 #undef ATOMIC64_OP
11237+#undef __ATOMIC64_OP
11238+#undef __OVERFLOW_XOP
11239+#undef __OVERFLOW_IOP
11240+#undef __REFCOUNT_OP
11241
11242 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11243 BACKOFF_SETUP(%o2)
11244diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11245index 8069ce1..c2e23c4 100644
11246--- a/arch/sparc/lib/ksyms.c
11247+++ b/arch/sparc/lib/ksyms.c
11248@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11249 /* Atomic counter implementation. */
11250 #define ATOMIC_OP(op) \
11251 EXPORT_SYMBOL(atomic_##op); \
11252-EXPORT_SYMBOL(atomic64_##op);
11253+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11254+EXPORT_SYMBOL(atomic64_##op); \
11255+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11256
11257 #define ATOMIC_OP_RETURN(op) \
11258 EXPORT_SYMBOL(atomic_##op##_return); \
11259@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11260 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11261
11262 ATOMIC_OPS(add)
11263+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11264+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11265 ATOMIC_OPS(sub)
11266
11267 #undef ATOMIC_OPS
11268diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11269index 30c3ecc..736f015 100644
11270--- a/arch/sparc/mm/Makefile
11271+++ b/arch/sparc/mm/Makefile
11272@@ -2,7 +2,7 @@
11273 #
11274
11275 asflags-y := -ansi
11276-ccflags-y := -Werror
11277+#ccflags-y := -Werror
11278
11279 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11280 obj-y += fault_$(BITS).o
11281diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11282index 70d8171..274c6c0 100644
11283--- a/arch/sparc/mm/fault_32.c
11284+++ b/arch/sparc/mm/fault_32.c
11285@@ -21,6 +21,9 @@
11286 #include <linux/perf_event.h>
11287 #include <linux/interrupt.h>
11288 #include <linux/kdebug.h>
11289+#include <linux/slab.h>
11290+#include <linux/pagemap.h>
11291+#include <linux/compiler.h>
11292
11293 #include <asm/page.h>
11294 #include <asm/pgtable.h>
11295@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11296 return safe_compute_effective_address(regs, insn);
11297 }
11298
11299+#ifdef CONFIG_PAX_PAGEEXEC
11300+#ifdef CONFIG_PAX_DLRESOLVE
11301+static void pax_emuplt_close(struct vm_area_struct *vma)
11302+{
11303+ vma->vm_mm->call_dl_resolve = 0UL;
11304+}
11305+
11306+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11307+{
11308+ unsigned int *kaddr;
11309+
11310+ vmf->page = alloc_page(GFP_HIGHUSER);
11311+ if (!vmf->page)
11312+ return VM_FAULT_OOM;
11313+
11314+ kaddr = kmap(vmf->page);
11315+ memset(kaddr, 0, PAGE_SIZE);
11316+ kaddr[0] = 0x9DE3BFA8U; /* save */
11317+ flush_dcache_page(vmf->page);
11318+ kunmap(vmf->page);
11319+ return VM_FAULT_MAJOR;
11320+}
11321+
11322+static const struct vm_operations_struct pax_vm_ops = {
11323+ .close = pax_emuplt_close,
11324+ .fault = pax_emuplt_fault
11325+};
11326+
11327+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11328+{
11329+ int ret;
11330+
11331+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11332+ vma->vm_mm = current->mm;
11333+ vma->vm_start = addr;
11334+ vma->vm_end = addr + PAGE_SIZE;
11335+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11336+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11337+ vma->vm_ops = &pax_vm_ops;
11338+
11339+ ret = insert_vm_struct(current->mm, vma);
11340+ if (ret)
11341+ return ret;
11342+
11343+ ++current->mm->total_vm;
11344+ return 0;
11345+}
11346+#endif
11347+
11348+/*
11349+ * PaX: decide what to do with offenders (regs->pc = fault address)
11350+ *
11351+ * returns 1 when task should be killed
11352+ * 2 when patched PLT trampoline was detected
11353+ * 3 when unpatched PLT trampoline was detected
11354+ */
11355+static int pax_handle_fetch_fault(struct pt_regs *regs)
11356+{
11357+
11358+#ifdef CONFIG_PAX_EMUPLT
11359+ int err;
11360+
11361+ do { /* PaX: patched PLT emulation #1 */
11362+ unsigned int sethi1, sethi2, jmpl;
11363+
11364+ err = get_user(sethi1, (unsigned int *)regs->pc);
11365+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11366+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11367+
11368+ if (err)
11369+ break;
11370+
11371+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11372+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11373+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11374+ {
11375+ unsigned int addr;
11376+
11377+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11378+ addr = regs->u_regs[UREG_G1];
11379+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11380+ regs->pc = addr;
11381+ regs->npc = addr+4;
11382+ return 2;
11383+ }
11384+ } while (0);
11385+
11386+ do { /* PaX: patched PLT emulation #2 */
11387+ unsigned int ba;
11388+
11389+ err = get_user(ba, (unsigned int *)regs->pc);
11390+
11391+ if (err)
11392+ break;
11393+
11394+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11395+ unsigned int addr;
11396+
11397+ if ((ba & 0xFFC00000U) == 0x30800000U)
11398+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11399+ else
11400+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11401+ regs->pc = addr;
11402+ regs->npc = addr+4;
11403+ return 2;
11404+ }
11405+ } while (0);
11406+
11407+ do { /* PaX: patched PLT emulation #3 */
11408+ unsigned int sethi, bajmpl, nop;
11409+
11410+ err = get_user(sethi, (unsigned int *)regs->pc);
11411+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11412+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11413+
11414+ if (err)
11415+ break;
11416+
11417+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11418+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11419+ nop == 0x01000000U)
11420+ {
11421+ unsigned int addr;
11422+
11423+ addr = (sethi & 0x003FFFFFU) << 10;
11424+ regs->u_regs[UREG_G1] = addr;
11425+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11426+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11427+ else
11428+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11429+ regs->pc = addr;
11430+ regs->npc = addr+4;
11431+ return 2;
11432+ }
11433+ } while (0);
11434+
11435+ do { /* PaX: unpatched PLT emulation step 1 */
11436+ unsigned int sethi, ba, nop;
11437+
11438+ err = get_user(sethi, (unsigned int *)regs->pc);
11439+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11440+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11441+
11442+ if (err)
11443+ break;
11444+
11445+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11446+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11447+ nop == 0x01000000U)
11448+ {
11449+ unsigned int addr, save, call;
11450+
11451+ if ((ba & 0xFFC00000U) == 0x30800000U)
11452+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11453+ else
11454+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11455+
11456+ err = get_user(save, (unsigned int *)addr);
11457+ err |= get_user(call, (unsigned int *)(addr+4));
11458+ err |= get_user(nop, (unsigned int *)(addr+8));
11459+ if (err)
11460+ break;
11461+
11462+#ifdef CONFIG_PAX_DLRESOLVE
11463+ if (save == 0x9DE3BFA8U &&
11464+ (call & 0xC0000000U) == 0x40000000U &&
11465+ nop == 0x01000000U)
11466+ {
11467+ struct vm_area_struct *vma;
11468+ unsigned long call_dl_resolve;
11469+
11470+ down_read(&current->mm->mmap_sem);
11471+ call_dl_resolve = current->mm->call_dl_resolve;
11472+ up_read(&current->mm->mmap_sem);
11473+ if (likely(call_dl_resolve))
11474+ goto emulate;
11475+
11476+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11477+
11478+ down_write(&current->mm->mmap_sem);
11479+ if (current->mm->call_dl_resolve) {
11480+ call_dl_resolve = current->mm->call_dl_resolve;
11481+ up_write(&current->mm->mmap_sem);
11482+ if (vma)
11483+ kmem_cache_free(vm_area_cachep, vma);
11484+ goto emulate;
11485+ }
11486+
11487+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11488+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11489+ up_write(&current->mm->mmap_sem);
11490+ if (vma)
11491+ kmem_cache_free(vm_area_cachep, vma);
11492+ return 1;
11493+ }
11494+
11495+ if (pax_insert_vma(vma, call_dl_resolve)) {
11496+ up_write(&current->mm->mmap_sem);
11497+ kmem_cache_free(vm_area_cachep, vma);
11498+ return 1;
11499+ }
11500+
11501+ current->mm->call_dl_resolve = call_dl_resolve;
11502+ up_write(&current->mm->mmap_sem);
11503+
11504+emulate:
11505+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11506+ regs->pc = call_dl_resolve;
11507+ regs->npc = addr+4;
11508+ return 3;
11509+ }
11510+#endif
11511+
11512+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11513+ if ((save & 0xFFC00000U) == 0x05000000U &&
11514+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11515+ nop == 0x01000000U)
11516+ {
11517+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11518+ regs->u_regs[UREG_G2] = addr + 4;
11519+ addr = (save & 0x003FFFFFU) << 10;
11520+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11521+ regs->pc = addr;
11522+ regs->npc = addr+4;
11523+ return 3;
11524+ }
11525+ }
11526+ } while (0);
11527+
11528+ do { /* PaX: unpatched PLT emulation step 2 */
11529+ unsigned int save, call, nop;
11530+
11531+ err = get_user(save, (unsigned int *)(regs->pc-4));
11532+ err |= get_user(call, (unsigned int *)regs->pc);
11533+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11534+ if (err)
11535+ break;
11536+
11537+ if (save == 0x9DE3BFA8U &&
11538+ (call & 0xC0000000U) == 0x40000000U &&
11539+ nop == 0x01000000U)
11540+ {
11541+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11542+
11543+ regs->u_regs[UREG_RETPC] = regs->pc;
11544+ regs->pc = dl_resolve;
11545+ regs->npc = dl_resolve+4;
11546+ return 3;
11547+ }
11548+ } while (0);
11549+#endif
11550+
11551+ return 1;
11552+}
11553+
11554+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11555+{
11556+ unsigned long i;
11557+
11558+ printk(KERN_ERR "PAX: bytes at PC: ");
11559+ for (i = 0; i < 8; i++) {
11560+ unsigned int c;
11561+ if (get_user(c, (unsigned int *)pc+i))
11562+ printk(KERN_CONT "???????? ");
11563+ else
11564+ printk(KERN_CONT "%08x ", c);
11565+ }
11566+ printk("\n");
11567+}
11568+#endif
11569+
11570 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11571 int text_fault)
11572 {
11573@@ -226,6 +500,24 @@ good_area:
11574 if (!(vma->vm_flags & VM_WRITE))
11575 goto bad_area;
11576 } else {
11577+
11578+#ifdef CONFIG_PAX_PAGEEXEC
11579+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11580+ up_read(&mm->mmap_sem);
11581+ switch (pax_handle_fetch_fault(regs)) {
11582+
11583+#ifdef CONFIG_PAX_EMUPLT
11584+ case 2:
11585+ case 3:
11586+ return;
11587+#endif
11588+
11589+ }
11590+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11591+ do_group_exit(SIGKILL);
11592+ }
11593+#endif
11594+
11595 /* Allow reads even for write-only mappings */
11596 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11597 goto bad_area;
11598diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11599index 4798232..f76e3aa 100644
11600--- a/arch/sparc/mm/fault_64.c
11601+++ b/arch/sparc/mm/fault_64.c
11602@@ -22,6 +22,9 @@
11603 #include <linux/kdebug.h>
11604 #include <linux/percpu.h>
11605 #include <linux/context_tracking.h>
11606+#include <linux/slab.h>
11607+#include <linux/pagemap.h>
11608+#include <linux/compiler.h>
11609
11610 #include <asm/page.h>
11611 #include <asm/pgtable.h>
11612@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11613 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11614 regs->tpc);
11615 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11616- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11617+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11618 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11619 dump_stack();
11620 unhandled_fault(regs->tpc, current, regs);
11621@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11622 show_regs(regs);
11623 }
11624
11625+#ifdef CONFIG_PAX_PAGEEXEC
11626+#ifdef CONFIG_PAX_DLRESOLVE
11627+static void pax_emuplt_close(struct vm_area_struct *vma)
11628+{
11629+ vma->vm_mm->call_dl_resolve = 0UL;
11630+}
11631+
11632+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11633+{
11634+ unsigned int *kaddr;
11635+
11636+ vmf->page = alloc_page(GFP_HIGHUSER);
11637+ if (!vmf->page)
11638+ return VM_FAULT_OOM;
11639+
11640+ kaddr = kmap(vmf->page);
11641+ memset(kaddr, 0, PAGE_SIZE);
11642+ kaddr[0] = 0x9DE3BFA8U; /* save */
11643+ flush_dcache_page(vmf->page);
11644+ kunmap(vmf->page);
11645+ return VM_FAULT_MAJOR;
11646+}
11647+
11648+static const struct vm_operations_struct pax_vm_ops = {
11649+ .close = pax_emuplt_close,
11650+ .fault = pax_emuplt_fault
11651+};
11652+
11653+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11654+{
11655+ int ret;
11656+
11657+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11658+ vma->vm_mm = current->mm;
11659+ vma->vm_start = addr;
11660+ vma->vm_end = addr + PAGE_SIZE;
11661+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11662+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11663+ vma->vm_ops = &pax_vm_ops;
11664+
11665+ ret = insert_vm_struct(current->mm, vma);
11666+ if (ret)
11667+ return ret;
11668+
11669+ ++current->mm->total_vm;
11670+ return 0;
11671+}
11672+#endif
11673+
11674+/*
11675+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11676+ *
11677+ * returns 1 when task should be killed
11678+ * 2 when patched PLT trampoline was detected
11679+ * 3 when unpatched PLT trampoline was detected
11680+ */
11681+static int pax_handle_fetch_fault(struct pt_regs *regs)
11682+{
11683+
11684+#ifdef CONFIG_PAX_EMUPLT
11685+ int err;
11686+
11687+ do { /* PaX: patched PLT emulation #1 */
11688+ unsigned int sethi1, sethi2, jmpl;
11689+
11690+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11691+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11692+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11693+
11694+ if (err)
11695+ break;
11696+
11697+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11698+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11699+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11700+ {
11701+ unsigned long addr;
11702+
11703+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11704+ addr = regs->u_regs[UREG_G1];
11705+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11706+
11707+ if (test_thread_flag(TIF_32BIT))
11708+ addr &= 0xFFFFFFFFUL;
11709+
11710+ regs->tpc = addr;
11711+ regs->tnpc = addr+4;
11712+ return 2;
11713+ }
11714+ } while (0);
11715+
11716+ do { /* PaX: patched PLT emulation #2 */
11717+ unsigned int ba;
11718+
11719+ err = get_user(ba, (unsigned int *)regs->tpc);
11720+
11721+ if (err)
11722+ break;
11723+
11724+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11725+ unsigned long addr;
11726+
11727+ if ((ba & 0xFFC00000U) == 0x30800000U)
11728+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11729+ else
11730+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11731+
11732+ if (test_thread_flag(TIF_32BIT))
11733+ addr &= 0xFFFFFFFFUL;
11734+
11735+ regs->tpc = addr;
11736+ regs->tnpc = addr+4;
11737+ return 2;
11738+ }
11739+ } while (0);
11740+
11741+ do { /* PaX: patched PLT emulation #3 */
11742+ unsigned int sethi, bajmpl, nop;
11743+
11744+ err = get_user(sethi, (unsigned int *)regs->tpc);
11745+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11746+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11747+
11748+ if (err)
11749+ break;
11750+
11751+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11752+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11753+ nop == 0x01000000U)
11754+ {
11755+ unsigned long addr;
11756+
11757+ addr = (sethi & 0x003FFFFFU) << 10;
11758+ regs->u_regs[UREG_G1] = addr;
11759+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11760+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11761+ else
11762+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11763+
11764+ if (test_thread_flag(TIF_32BIT))
11765+ addr &= 0xFFFFFFFFUL;
11766+
11767+ regs->tpc = addr;
11768+ regs->tnpc = addr+4;
11769+ return 2;
11770+ }
11771+ } while (0);
11772+
11773+ do { /* PaX: patched PLT emulation #4 */
11774+ unsigned int sethi, mov1, call, mov2;
11775+
11776+ err = get_user(sethi, (unsigned int *)regs->tpc);
11777+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11778+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11779+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11780+
11781+ if (err)
11782+ break;
11783+
11784+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11785+ mov1 == 0x8210000FU &&
11786+ (call & 0xC0000000U) == 0x40000000U &&
11787+ mov2 == 0x9E100001U)
11788+ {
11789+ unsigned long addr;
11790+
11791+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11792+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11793+
11794+ if (test_thread_flag(TIF_32BIT))
11795+ addr &= 0xFFFFFFFFUL;
11796+
11797+ regs->tpc = addr;
11798+ regs->tnpc = addr+4;
11799+ return 2;
11800+ }
11801+ } while (0);
11802+
11803+ do { /* PaX: patched PLT emulation #5 */
11804+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11805+
11806+ err = get_user(sethi, (unsigned int *)regs->tpc);
11807+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11808+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11809+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11810+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11811+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11812+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11813+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11814+
11815+ if (err)
11816+ break;
11817+
11818+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11819+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11820+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11821+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11822+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11823+ sllx == 0x83287020U &&
11824+ jmpl == 0x81C04005U &&
11825+ nop == 0x01000000U)
11826+ {
11827+ unsigned long addr;
11828+
11829+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11830+ regs->u_regs[UREG_G1] <<= 32;
11831+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11832+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11833+ regs->tpc = addr;
11834+ regs->tnpc = addr+4;
11835+ return 2;
11836+ }
11837+ } while (0);
11838+
11839+ do { /* PaX: patched PLT emulation #6 */
11840+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11841+
11842+ err = get_user(sethi, (unsigned int *)regs->tpc);
11843+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11844+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11845+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11846+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11847+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11848+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11849+
11850+ if (err)
11851+ break;
11852+
11853+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11854+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11855+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11856+ sllx == 0x83287020U &&
11857+ (or & 0xFFFFE000U) == 0x8A116000U &&
11858+ jmpl == 0x81C04005U &&
11859+ nop == 0x01000000U)
11860+ {
11861+ unsigned long addr;
11862+
11863+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11864+ regs->u_regs[UREG_G1] <<= 32;
11865+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11866+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11867+ regs->tpc = addr;
11868+ regs->tnpc = addr+4;
11869+ return 2;
11870+ }
11871+ } while (0);
11872+
11873+ do { /* PaX: unpatched PLT emulation step 1 */
11874+ unsigned int sethi, ba, nop;
11875+
11876+ err = get_user(sethi, (unsigned int *)regs->tpc);
11877+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11878+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11879+
11880+ if (err)
11881+ break;
11882+
11883+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11884+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11885+ nop == 0x01000000U)
11886+ {
11887+ unsigned long addr;
11888+ unsigned int save, call;
11889+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11890+
11891+ if ((ba & 0xFFC00000U) == 0x30800000U)
11892+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11893+ else
11894+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11895+
11896+ if (test_thread_flag(TIF_32BIT))
11897+ addr &= 0xFFFFFFFFUL;
11898+
11899+ err = get_user(save, (unsigned int *)addr);
11900+ err |= get_user(call, (unsigned int *)(addr+4));
11901+ err |= get_user(nop, (unsigned int *)(addr+8));
11902+ if (err)
11903+ break;
11904+
11905+#ifdef CONFIG_PAX_DLRESOLVE
11906+ if (save == 0x9DE3BFA8U &&
11907+ (call & 0xC0000000U) == 0x40000000U &&
11908+ nop == 0x01000000U)
11909+ {
11910+ struct vm_area_struct *vma;
11911+ unsigned long call_dl_resolve;
11912+
11913+ down_read(&current->mm->mmap_sem);
11914+ call_dl_resolve = current->mm->call_dl_resolve;
11915+ up_read(&current->mm->mmap_sem);
11916+ if (likely(call_dl_resolve))
11917+ goto emulate;
11918+
11919+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11920+
11921+ down_write(&current->mm->mmap_sem);
11922+ if (current->mm->call_dl_resolve) {
11923+ call_dl_resolve = current->mm->call_dl_resolve;
11924+ up_write(&current->mm->mmap_sem);
11925+ if (vma)
11926+ kmem_cache_free(vm_area_cachep, vma);
11927+ goto emulate;
11928+ }
11929+
11930+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11931+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11932+ up_write(&current->mm->mmap_sem);
11933+ if (vma)
11934+ kmem_cache_free(vm_area_cachep, vma);
11935+ return 1;
11936+ }
11937+
11938+ if (pax_insert_vma(vma, call_dl_resolve)) {
11939+ up_write(&current->mm->mmap_sem);
11940+ kmem_cache_free(vm_area_cachep, vma);
11941+ return 1;
11942+ }
11943+
11944+ current->mm->call_dl_resolve = call_dl_resolve;
11945+ up_write(&current->mm->mmap_sem);
11946+
11947+emulate:
11948+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11949+ regs->tpc = call_dl_resolve;
11950+ regs->tnpc = addr+4;
11951+ return 3;
11952+ }
11953+#endif
11954+
11955+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11956+ if ((save & 0xFFC00000U) == 0x05000000U &&
11957+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11958+ nop == 0x01000000U)
11959+ {
11960+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11961+ regs->u_regs[UREG_G2] = addr + 4;
11962+ addr = (save & 0x003FFFFFU) << 10;
11963+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11964+
11965+ if (test_thread_flag(TIF_32BIT))
11966+ addr &= 0xFFFFFFFFUL;
11967+
11968+ regs->tpc = addr;
11969+ regs->tnpc = addr+4;
11970+ return 3;
11971+ }
11972+
11973+ /* PaX: 64-bit PLT stub */
11974+ err = get_user(sethi1, (unsigned int *)addr);
11975+ err |= get_user(sethi2, (unsigned int *)(addr+4));
11976+ err |= get_user(or1, (unsigned int *)(addr+8));
11977+ err |= get_user(or2, (unsigned int *)(addr+12));
11978+ err |= get_user(sllx, (unsigned int *)(addr+16));
11979+ err |= get_user(add, (unsigned int *)(addr+20));
11980+ err |= get_user(jmpl, (unsigned int *)(addr+24));
11981+ err |= get_user(nop, (unsigned int *)(addr+28));
11982+ if (err)
11983+ break;
11984+
11985+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
11986+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11987+ (or1 & 0xFFFFE000U) == 0x88112000U &&
11988+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11989+ sllx == 0x89293020U &&
11990+ add == 0x8A010005U &&
11991+ jmpl == 0x89C14000U &&
11992+ nop == 0x01000000U)
11993+ {
11994+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11995+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11996+ regs->u_regs[UREG_G4] <<= 32;
11997+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11998+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
11999+ regs->u_regs[UREG_G4] = addr + 24;
12000+ addr = regs->u_regs[UREG_G5];
12001+ regs->tpc = addr;
12002+ regs->tnpc = addr+4;
12003+ return 3;
12004+ }
12005+ }
12006+ } while (0);
12007+
12008+#ifdef CONFIG_PAX_DLRESOLVE
12009+ do { /* PaX: unpatched PLT emulation step 2 */
12010+ unsigned int save, call, nop;
12011+
12012+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12013+ err |= get_user(call, (unsigned int *)regs->tpc);
12014+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12015+ if (err)
12016+ break;
12017+
12018+ if (save == 0x9DE3BFA8U &&
12019+ (call & 0xC0000000U) == 0x40000000U &&
12020+ nop == 0x01000000U)
12021+ {
12022+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12023+
12024+ if (test_thread_flag(TIF_32BIT))
12025+ dl_resolve &= 0xFFFFFFFFUL;
12026+
12027+ regs->u_regs[UREG_RETPC] = regs->tpc;
12028+ regs->tpc = dl_resolve;
12029+ regs->tnpc = dl_resolve+4;
12030+ return 3;
12031+ }
12032+ } while (0);
12033+#endif
12034+
12035+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12036+ unsigned int sethi, ba, nop;
12037+
12038+ err = get_user(sethi, (unsigned int *)regs->tpc);
12039+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12040+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12041+
12042+ if (err)
12043+ break;
12044+
12045+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12046+ (ba & 0xFFF00000U) == 0x30600000U &&
12047+ nop == 0x01000000U)
12048+ {
12049+ unsigned long addr;
12050+
12051+ addr = (sethi & 0x003FFFFFU) << 10;
12052+ regs->u_regs[UREG_G1] = addr;
12053+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12054+
12055+ if (test_thread_flag(TIF_32BIT))
12056+ addr &= 0xFFFFFFFFUL;
12057+
12058+ regs->tpc = addr;
12059+ regs->tnpc = addr+4;
12060+ return 2;
12061+ }
12062+ } while (0);
12063+
12064+#endif
12065+
12066+ return 1;
12067+}
12068+
12069+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12070+{
12071+ unsigned long i;
12072+
12073+ printk(KERN_ERR "PAX: bytes at PC: ");
12074+ for (i = 0; i < 8; i++) {
12075+ unsigned int c;
12076+ if (get_user(c, (unsigned int *)pc+i))
12077+ printk(KERN_CONT "???????? ");
12078+ else
12079+ printk(KERN_CONT "%08x ", c);
12080+ }
12081+ printk("\n");
12082+}
12083+#endif
12084+
12085 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12086 {
12087 enum ctx_state prev_state = exception_enter();
12088@@ -353,6 +816,29 @@ retry:
12089 if (!vma)
12090 goto bad_area;
12091
12092+#ifdef CONFIG_PAX_PAGEEXEC
12093+ /* PaX: detect ITLB misses on non-exec pages */
12094+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12095+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12096+ {
12097+ if (address != regs->tpc)
12098+ goto good_area;
12099+
12100+ up_read(&mm->mmap_sem);
12101+ switch (pax_handle_fetch_fault(regs)) {
12102+
12103+#ifdef CONFIG_PAX_EMUPLT
12104+ case 2:
12105+ case 3:
12106+ return;
12107+#endif
12108+
12109+ }
12110+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12111+ do_group_exit(SIGKILL);
12112+ }
12113+#endif
12114+
12115 /* Pure DTLB misses do not tell us whether the fault causing
12116 * load/store/atomic was a write or not, it only says that there
12117 * was no match. So in such a case we (carefully) read the
12118diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12119index 4242eab..9ae6360 100644
12120--- a/arch/sparc/mm/hugetlbpage.c
12121+++ b/arch/sparc/mm/hugetlbpage.c
12122@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12123 unsigned long addr,
12124 unsigned long len,
12125 unsigned long pgoff,
12126- unsigned long flags)
12127+ unsigned long flags,
12128+ unsigned long offset)
12129 {
12130+ struct mm_struct *mm = current->mm;
12131 unsigned long task_size = TASK_SIZE;
12132 struct vm_unmapped_area_info info;
12133
12134@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12135
12136 info.flags = 0;
12137 info.length = len;
12138- info.low_limit = TASK_UNMAPPED_BASE;
12139+ info.low_limit = mm->mmap_base;
12140 info.high_limit = min(task_size, VA_EXCLUDE_START);
12141 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12142 info.align_offset = 0;
12143+ info.threadstack_offset = offset;
12144 addr = vm_unmapped_area(&info);
12145
12146 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12147 VM_BUG_ON(addr != -ENOMEM);
12148 info.low_limit = VA_EXCLUDE_END;
12149+
12150+#ifdef CONFIG_PAX_RANDMMAP
12151+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12152+ info.low_limit += mm->delta_mmap;
12153+#endif
12154+
12155 info.high_limit = task_size;
12156 addr = vm_unmapped_area(&info);
12157 }
12158@@ -55,7 +64,8 @@ static unsigned long
12159 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12160 const unsigned long len,
12161 const unsigned long pgoff,
12162- const unsigned long flags)
12163+ const unsigned long flags,
12164+ const unsigned long offset)
12165 {
12166 struct mm_struct *mm = current->mm;
12167 unsigned long addr = addr0;
12168@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12169 info.high_limit = mm->mmap_base;
12170 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12171 info.align_offset = 0;
12172+ info.threadstack_offset = offset;
12173 addr = vm_unmapped_area(&info);
12174
12175 /*
12176@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12177 VM_BUG_ON(addr != -ENOMEM);
12178 info.flags = 0;
12179 info.low_limit = TASK_UNMAPPED_BASE;
12180+
12181+#ifdef CONFIG_PAX_RANDMMAP
12182+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12183+ info.low_limit += mm->delta_mmap;
12184+#endif
12185+
12186 info.high_limit = STACK_TOP32;
12187 addr = vm_unmapped_area(&info);
12188 }
12189@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12190 struct mm_struct *mm = current->mm;
12191 struct vm_area_struct *vma;
12192 unsigned long task_size = TASK_SIZE;
12193+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12194
12195 if (test_thread_flag(TIF_32BIT))
12196 task_size = STACK_TOP32;
12197@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12198 return addr;
12199 }
12200
12201+#ifdef CONFIG_PAX_RANDMMAP
12202+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12203+#endif
12204+
12205 if (addr) {
12206 addr = ALIGN(addr, HPAGE_SIZE);
12207 vma = find_vma(mm, addr);
12208- if (task_size - len >= addr &&
12209- (!vma || addr + len <= vma->vm_start))
12210+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12211 return addr;
12212 }
12213 if (mm->get_unmapped_area == arch_get_unmapped_area)
12214 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12215- pgoff, flags);
12216+ pgoff, flags, offset);
12217 else
12218 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12219- pgoff, flags);
12220+ pgoff, flags, offset);
12221 }
12222
12223 pte_t *huge_pte_alloc(struct mm_struct *mm,
12224diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12225index 559cb74..9e5f097 100644
12226--- a/arch/sparc/mm/init_64.c
12227+++ b/arch/sparc/mm/init_64.c
12228@@ -187,9 +187,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12229 int num_kernel_image_mappings;
12230
12231 #ifdef CONFIG_DEBUG_DCFLUSH
12232-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12233+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12234 #ifdef CONFIG_SMP
12235-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12236+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12237 #endif
12238 #endif
12239
12240@@ -197,7 +197,7 @@ inline void flush_dcache_page_impl(struct page *page)
12241 {
12242 BUG_ON(tlb_type == hypervisor);
12243 #ifdef CONFIG_DEBUG_DCFLUSH
12244- atomic_inc(&dcpage_flushes);
12245+ atomic_inc_unchecked(&dcpage_flushes);
12246 #endif
12247
12248 #ifdef DCACHE_ALIASING_POSSIBLE
12249@@ -469,10 +469,10 @@ void mmu_info(struct seq_file *m)
12250
12251 #ifdef CONFIG_DEBUG_DCFLUSH
12252 seq_printf(m, "DCPageFlushes\t: %d\n",
12253- atomic_read(&dcpage_flushes));
12254+ atomic_read_unchecked(&dcpage_flushes));
12255 #ifdef CONFIG_SMP
12256 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12257- atomic_read(&dcpage_flushes_xcall));
12258+ atomic_read_unchecked(&dcpage_flushes_xcall));
12259 #endif /* CONFIG_SMP */
12260 #endif /* CONFIG_DEBUG_DCFLUSH */
12261 }
12262diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12263index a07e31b..85c9003 100644
12264--- a/arch/tile/Kconfig
12265+++ b/arch/tile/Kconfig
12266@@ -198,6 +198,7 @@ source "kernel/Kconfig.hz"
12267
12268 config KEXEC
12269 bool "kexec system call"
12270+ depends on !GRKERNSEC_KMEM
12271 ---help---
12272 kexec is a system call that implements the ability to shutdown your
12273 current kernel, and to start another kernel. It is like a reboot
12274diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12275index 7b11c5f..755a026 100644
12276--- a/arch/tile/include/asm/atomic_64.h
12277+++ b/arch/tile/include/asm/atomic_64.h
12278@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12279
12280 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12281
12282+#define atomic64_read_unchecked(v) atomic64_read(v)
12283+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12284+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12285+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12286+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12287+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12288+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12289+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12290+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12291+
12292 /* Define this to indicate that cmpxchg is an efficient operation. */
12293 #define __HAVE_ARCH_CMPXCHG
12294
12295diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12296index 6160761..00cac88 100644
12297--- a/arch/tile/include/asm/cache.h
12298+++ b/arch/tile/include/asm/cache.h
12299@@ -15,11 +15,12 @@
12300 #ifndef _ASM_TILE_CACHE_H
12301 #define _ASM_TILE_CACHE_H
12302
12303+#include <linux/const.h>
12304 #include <arch/chip.h>
12305
12306 /* bytes per L1 data cache line */
12307 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12308-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12309+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12310
12311 /* bytes per L2 cache line */
12312 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12313diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12314index f41cb53..31d3ab4 100644
12315--- a/arch/tile/include/asm/uaccess.h
12316+++ b/arch/tile/include/asm/uaccess.h
12317@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12318 const void __user *from,
12319 unsigned long n)
12320 {
12321- int sz = __compiletime_object_size(to);
12322+ size_t sz = __compiletime_object_size(to);
12323
12324- if (likely(sz == -1 || sz >= n))
12325+ if (likely(sz == (size_t)-1 || sz >= n))
12326 n = _copy_from_user(to, from, n);
12327 else
12328 copy_from_user_overflow();
12329diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12330index 8416240..a012fb7 100644
12331--- a/arch/tile/mm/hugetlbpage.c
12332+++ b/arch/tile/mm/hugetlbpage.c
12333@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12334 info.high_limit = TASK_SIZE;
12335 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12336 info.align_offset = 0;
12337+ info.threadstack_offset = 0;
12338 return vm_unmapped_area(&info);
12339 }
12340
12341@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12342 info.high_limit = current->mm->mmap_base;
12343 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12344 info.align_offset = 0;
12345+ info.threadstack_offset = 0;
12346 addr = vm_unmapped_area(&info);
12347
12348 /*
12349diff --git a/arch/um/Makefile b/arch/um/Makefile
12350index 17d4460..9d74338e3de4 100644
12351--- a/arch/um/Makefile
12352+++ b/arch/um/Makefile
12353@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12354 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12355 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12356
12357+ifdef CONSTIFY_PLUGIN
12358+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12359+endif
12360+
12361 #This will adjust *FLAGS accordingly to the platform.
12362 include $(ARCH_DIR)/Makefile-os-$(OS)
12363
12364diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12365index 19e1bdd..3665b77 100644
12366--- a/arch/um/include/asm/cache.h
12367+++ b/arch/um/include/asm/cache.h
12368@@ -1,6 +1,7 @@
12369 #ifndef __UM_CACHE_H
12370 #define __UM_CACHE_H
12371
12372+#include <linux/const.h>
12373
12374 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12375 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12376@@ -12,6 +13,6 @@
12377 # define L1_CACHE_SHIFT 5
12378 #endif
12379
12380-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12381+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12382
12383 #endif
12384diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12385index 2e0a6b1..a64d0f5 100644
12386--- a/arch/um/include/asm/kmap_types.h
12387+++ b/arch/um/include/asm/kmap_types.h
12388@@ -8,6 +8,6 @@
12389
12390 /* No more #include "asm/arch/kmap_types.h" ! */
12391
12392-#define KM_TYPE_NR 14
12393+#define KM_TYPE_NR 15
12394
12395 #endif
12396diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12397index 71c5d13..4c7b9f1 100644
12398--- a/arch/um/include/asm/page.h
12399+++ b/arch/um/include/asm/page.h
12400@@ -14,6 +14,9 @@
12401 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12402 #define PAGE_MASK (~(PAGE_SIZE-1))
12403
12404+#define ktla_ktva(addr) (addr)
12405+#define ktva_ktla(addr) (addr)
12406+
12407 #ifndef __ASSEMBLY__
12408
12409 struct page;
12410diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12411index 2b4274e..754fe06 100644
12412--- a/arch/um/include/asm/pgtable-3level.h
12413+++ b/arch/um/include/asm/pgtable-3level.h
12414@@ -58,6 +58,7 @@
12415 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12416 #define pud_populate(mm, pud, pmd) \
12417 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12418+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12419
12420 #ifdef CONFIG_64BIT
12421 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12422diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12423index 68b9119..f72353c 100644
12424--- a/arch/um/kernel/process.c
12425+++ b/arch/um/kernel/process.c
12426@@ -345,22 +345,6 @@ int singlestepping(void * t)
12427 return 2;
12428 }
12429
12430-/*
12431- * Only x86 and x86_64 have an arch_align_stack().
12432- * All other arches have "#define arch_align_stack(x) (x)"
12433- * in their asm/exec.h
12434- * As this is included in UML from asm-um/system-generic.h,
12435- * we can use it to behave as the subarch does.
12436- */
12437-#ifndef arch_align_stack
12438-unsigned long arch_align_stack(unsigned long sp)
12439-{
12440- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12441- sp -= get_random_int() % 8192;
12442- return sp & ~0xf;
12443-}
12444-#endif
12445-
12446 unsigned long get_wchan(struct task_struct *p)
12447 {
12448 unsigned long stack_page, sp, ip;
12449diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12450index ad8f795..2c7eec6 100644
12451--- a/arch/unicore32/include/asm/cache.h
12452+++ b/arch/unicore32/include/asm/cache.h
12453@@ -12,8 +12,10 @@
12454 #ifndef __UNICORE_CACHE_H__
12455 #define __UNICORE_CACHE_H__
12456
12457-#define L1_CACHE_SHIFT (5)
12458-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12459+#include <linux/const.h>
12460+
12461+#define L1_CACHE_SHIFT 5
12462+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12463
12464 /*
12465 * Memory returned by kmalloc() may be used for DMA, so we must make
12466diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12467index 226d569..297bf74 100644
12468--- a/arch/x86/Kconfig
12469+++ b/arch/x86/Kconfig
12470@@ -32,7 +32,7 @@ config X86
12471 select HAVE_AOUT if X86_32
12472 select HAVE_UNSTABLE_SCHED_CLOCK
12473 select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
12474- select ARCH_SUPPORTS_INT128 if X86_64
12475+ select ARCH_SUPPORTS_INT128 if X86_64 && !PAX_SIZE_OVERFLOW
12476 select HAVE_IDE
12477 select HAVE_OPROFILE
12478 select HAVE_PCSPKR_PLATFORM
12479@@ -134,7 +134,7 @@ config X86
12480 select RTC_LIB
12481 select HAVE_DEBUG_STACKOVERFLOW
12482 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12483- select HAVE_CC_STACKPROTECTOR
12484+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12485 select GENERIC_CPU_AUTOPROBE
12486 select HAVE_ARCH_AUDITSYSCALL
12487 select ARCH_SUPPORTS_ATOMIC_RMW
12488@@ -266,7 +266,7 @@ config X86_HT
12489
12490 config X86_32_LAZY_GS
12491 def_bool y
12492- depends on X86_32 && !CC_STACKPROTECTOR
12493+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12494
12495 config ARCH_HWEIGHT_CFLAGS
12496 string
12497@@ -638,6 +638,7 @@ config SCHED_OMIT_FRAME_POINTER
12498
12499 menuconfig HYPERVISOR_GUEST
12500 bool "Linux guest support"
12501+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12502 ---help---
12503 Say Y here to enable options for running Linux under various hyper-
12504 visors. This option enables basic hypervisor detection and platform
12505@@ -1005,6 +1006,7 @@ config VM86
12506
12507 config X86_16BIT
12508 bool "Enable support for 16-bit segments" if EXPERT
12509+ depends on !GRKERNSEC
12510 default y
12511 ---help---
12512 This option is required by programs like Wine to run 16-bit
12513@@ -1178,6 +1180,7 @@ choice
12514
12515 config NOHIGHMEM
12516 bool "off"
12517+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12518 ---help---
12519 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12520 However, the address space of 32-bit x86 processors is only 4
12521@@ -1214,6 +1217,7 @@ config NOHIGHMEM
12522
12523 config HIGHMEM4G
12524 bool "4GB"
12525+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12526 ---help---
12527 Select this if you have a 32-bit processor and between 1 and 4
12528 gigabytes of physical RAM.
12529@@ -1266,7 +1270,7 @@ config PAGE_OFFSET
12530 hex
12531 default 0xB0000000 if VMSPLIT_3G_OPT
12532 default 0x80000000 if VMSPLIT_2G
12533- default 0x78000000 if VMSPLIT_2G_OPT
12534+ default 0x70000000 if VMSPLIT_2G_OPT
12535 default 0x40000000 if VMSPLIT_1G
12536 default 0xC0000000
12537 depends on X86_32
12538@@ -1286,7 +1290,6 @@ config X86_PAE
12539
12540 config ARCH_PHYS_ADDR_T_64BIT
12541 def_bool y
12542- depends on X86_64 || X86_PAE
12543
12544 config ARCH_DMA_ADDR_T_64BIT
12545 def_bool y
12546@@ -1717,6 +1720,7 @@ source kernel/Kconfig.hz
12547
12548 config KEXEC
12549 bool "kexec system call"
12550+ depends on !GRKERNSEC_KMEM
12551 ---help---
12552 kexec is a system call that implements the ability to shutdown your
12553 current kernel, and to start another kernel. It is like a reboot
12554@@ -1899,7 +1903,9 @@ config X86_NEED_RELOCS
12555
12556 config PHYSICAL_ALIGN
12557 hex "Alignment value to which kernel should be aligned"
12558- default "0x200000"
12559+ default "0x1000000"
12560+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12561+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12562 range 0x2000 0x1000000 if X86_32
12563 range 0x200000 0x1000000 if X86_64
12564 ---help---
12565@@ -1982,6 +1988,7 @@ config COMPAT_VDSO
12566 def_bool n
12567 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12568 depends on X86_32 || IA32_EMULATION
12569+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12570 ---help---
12571 Certain buggy versions of glibc will crash if they are
12572 presented with a 32-bit vDSO that is not mapped at the address
12573@@ -2046,6 +2053,22 @@ config CMDLINE_OVERRIDE
12574 This is used to work around broken boot loaders. This should
12575 be set to 'N' under normal conditions.
12576
12577+config DEFAULT_MODIFY_LDT_SYSCALL
12578+ bool "Allow userspace to modify the LDT by default"
12579+ default y
12580+
12581+ ---help---
12582+ Modifying the LDT (Local Descriptor Table) may be needed to run a
12583+ 16-bit or segmented code such as Dosemu or Wine. This is done via
12584+ a system call which is not needed to run portable applications,
12585+ and which can sometimes be abused to exploit some weaknesses of
12586+ the architecture, opening new vulnerabilities.
12587+
12588+ For this reason this option allows one to enable or disable the
12589+ feature at runtime. It is recommended to say 'N' here to leave
12590+ the system protected, and to enable it at runtime only if needed
12591+ by setting the sys.kernel.modify_ldt sysctl.
12592+
12593 source "kernel/livepatch/Kconfig"
12594
12595 endmenu
12596diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12597index 6983314..54ad7e8 100644
12598--- a/arch/x86/Kconfig.cpu
12599+++ b/arch/x86/Kconfig.cpu
12600@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12601
12602 config X86_F00F_BUG
12603 def_bool y
12604- depends on M586MMX || M586TSC || M586 || M486
12605+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12606
12607 config X86_INVD_BUG
12608 def_bool y
12609@@ -327,7 +327,7 @@ config X86_INVD_BUG
12610
12611 config X86_ALIGNMENT_16
12612 def_bool y
12613- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12614+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12615
12616 config X86_INTEL_USERCOPY
12617 def_bool y
12618@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12619 # generates cmov.
12620 config X86_CMOV
12621 def_bool y
12622- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12623+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12624
12625 config X86_MINIMUM_CPU_FAMILY
12626 int
12627diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12628index 72484a6..83a4411 100644
12629--- a/arch/x86/Kconfig.debug
12630+++ b/arch/x86/Kconfig.debug
12631@@ -89,7 +89,7 @@ config EFI_PGT_DUMP
12632 config DEBUG_RODATA
12633 bool "Write protect kernel read-only data structures"
12634 default y
12635- depends on DEBUG_KERNEL
12636+ depends on DEBUG_KERNEL && BROKEN
12637 ---help---
12638 Mark the kernel read-only data as write-protected in the pagetables,
12639 in order to catch accidental (and incorrect) writes to such const
12640@@ -107,7 +107,7 @@ config DEBUG_RODATA_TEST
12641
12642 config DEBUG_SET_MODULE_RONX
12643 bool "Set loadable kernel module data as NX and text as RO"
12644- depends on MODULES
12645+ depends on MODULES && BROKEN
12646 ---help---
12647 This option helps catch unintended modifications to loadable
12648 kernel module's text and read-only data. It also prevents execution
12649diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12650index 2fda005..2c72d40 100644
12651--- a/arch/x86/Makefile
12652+++ b/arch/x86/Makefile
12653@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12654 # CPU-specific tuning. Anything which can be shared with UML should go here.
12655 include arch/x86/Makefile_32.cpu
12656 KBUILD_CFLAGS += $(cflags-y)
12657-
12658- # temporary until string.h is fixed
12659- KBUILD_CFLAGS += -ffreestanding
12660 else
12661 BITS := 64
12662 UTS_MACHINE := x86_64
12663@@ -107,6 +104,9 @@ else
12664 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12665 endif
12666
12667+# temporary until string.h is fixed
12668+KBUILD_CFLAGS += -ffreestanding
12669+
12670 # Make sure compiler does not have buggy stack-protector support.
12671 ifdef CONFIG_CC_STACKPROTECTOR
12672 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12673@@ -181,6 +181,7 @@ archheaders:
12674 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12675
12676 archprepare:
12677+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12678 ifeq ($(CONFIG_KEXEC_FILE),y)
12679 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12680 endif
12681@@ -264,3 +265,9 @@ define archhelp
12682 echo ' FDARGS="..." arguments for the booted kernel'
12683 echo ' FDINITRD=file initrd for the booted kernel'
12684 endef
12685+
12686+define OLD_LD
12687+
12688+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12689+*** Please upgrade your binutils to 2.18 or newer
12690+endef
12691diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12692index 57bbf2f..b100fce 100644
12693--- a/arch/x86/boot/Makefile
12694+++ b/arch/x86/boot/Makefile
12695@@ -58,6 +58,9 @@ clean-files += cpustr.h
12696 # ---------------------------------------------------------------------------
12697
12698 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12699+ifdef CONSTIFY_PLUGIN
12700+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12701+endif
12702 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12703 GCOV_PROFILE := n
12704
12705diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12706index 878e4b9..20537ab 100644
12707--- a/arch/x86/boot/bitops.h
12708+++ b/arch/x86/boot/bitops.h
12709@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12710 u8 v;
12711 const u32 *p = (const u32 *)addr;
12712
12713- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12714+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12715 return v;
12716 }
12717
12718@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12719
12720 static inline void set_bit(int nr, void *addr)
12721 {
12722- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12723+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12724 }
12725
12726 #endif /* BOOT_BITOPS_H */
12727diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12728index bd49ec6..94c7f58 100644
12729--- a/arch/x86/boot/boot.h
12730+++ b/arch/x86/boot/boot.h
12731@@ -84,7 +84,7 @@ static inline void io_delay(void)
12732 static inline u16 ds(void)
12733 {
12734 u16 seg;
12735- asm("movw %%ds,%0" : "=rm" (seg));
12736+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12737 return seg;
12738 }
12739
12740diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12741index 0a291cd..9686efc 100644
12742--- a/arch/x86/boot/compressed/Makefile
12743+++ b/arch/x86/boot/compressed/Makefile
12744@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12745 KBUILD_CFLAGS += -mno-mmx -mno-sse
12746 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12747 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12748+ifdef CONSTIFY_PLUGIN
12749+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12750+endif
12751
12752 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12753 GCOV_PROFILE := n
12754diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12755index a53440e..c3dbf1e 100644
12756--- a/arch/x86/boot/compressed/efi_stub_32.S
12757+++ b/arch/x86/boot/compressed/efi_stub_32.S
12758@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12759 * parameter 2, ..., param n. To make things easy, we save the return
12760 * address of efi_call_phys in a global variable.
12761 */
12762- popl %ecx
12763- movl %ecx, saved_return_addr(%edx)
12764- /* get the function pointer into ECX*/
12765- popl %ecx
12766- movl %ecx, efi_rt_function_ptr(%edx)
12767+ popl saved_return_addr(%edx)
12768+ popl efi_rt_function_ptr(%edx)
12769
12770 /*
12771 * 3. Call the physical function.
12772 */
12773- call *%ecx
12774+ call *efi_rt_function_ptr(%edx)
12775
12776 /*
12777 * 4. Balance the stack. And because EAX contain the return value,
12778@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12779 1: popl %edx
12780 subl $1b, %edx
12781
12782- movl efi_rt_function_ptr(%edx), %ecx
12783- pushl %ecx
12784+ pushl efi_rt_function_ptr(%edx)
12785
12786 /*
12787 * 10. Push the saved return address onto the stack and return.
12788 */
12789- movl saved_return_addr(%edx), %ecx
12790- pushl %ecx
12791- ret
12792+ jmpl *saved_return_addr(%edx)
12793 ENDPROC(efi_call_phys)
12794 .previous
12795
12796diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12797index 630384a..278e788 100644
12798--- a/arch/x86/boot/compressed/efi_thunk_64.S
12799+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12800@@ -189,8 +189,8 @@ efi_gdt64:
12801 .long 0 /* Filled out by user */
12802 .word 0
12803 .quad 0x0000000000000000 /* NULL descriptor */
12804- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12805- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12806+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12807+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12808 .quad 0x0080890000000000 /* TS descriptor */
12809 .quad 0x0000000000000000 /* TS continued */
12810 efi_gdt64_end:
12811diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12812index 8ef964d..fcfb8aa 100644
12813--- a/arch/x86/boot/compressed/head_32.S
12814+++ b/arch/x86/boot/compressed/head_32.S
12815@@ -141,10 +141,10 @@ preferred_addr:
12816 addl %eax, %ebx
12817 notl %eax
12818 andl %eax, %ebx
12819- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12820+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12821 jge 1f
12822 #endif
12823- movl $LOAD_PHYSICAL_ADDR, %ebx
12824+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12825 1:
12826
12827 /* Target address to relocate to for decompression */
12828diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12829index b0c0d16..3b44ff8 100644
12830--- a/arch/x86/boot/compressed/head_64.S
12831+++ b/arch/x86/boot/compressed/head_64.S
12832@@ -95,10 +95,10 @@ ENTRY(startup_32)
12833 addl %eax, %ebx
12834 notl %eax
12835 andl %eax, %ebx
12836- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12837+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12838 jge 1f
12839 #endif
12840- movl $LOAD_PHYSICAL_ADDR, %ebx
12841+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12842 1:
12843
12844 /* Target address to relocate to for decompression */
12845@@ -323,10 +323,10 @@ preferred_addr:
12846 addq %rax, %rbp
12847 notq %rax
12848 andq %rax, %rbp
12849- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12850+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12851 jge 1f
12852 #endif
12853- movq $LOAD_PHYSICAL_ADDR, %rbp
12854+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12855 1:
12856
12857 /* Target address to relocate to for decompression */
12858@@ -435,8 +435,8 @@ gdt:
12859 .long gdt
12860 .word 0
12861 .quad 0x0000000000000000 /* NULL descriptor */
12862- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12863- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12864+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12865+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12866 .quad 0x0080890000000000 /* TS descriptor */
12867 .quad 0x0000000000000000 /* TS continued */
12868 gdt_end:
12869diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12870index a107b93..55602de 100644
12871--- a/arch/x86/boot/compressed/misc.c
12872+++ b/arch/x86/boot/compressed/misc.c
12873@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12874 * Calculate the delta between where vmlinux was linked to load
12875 * and where it was actually loaded.
12876 */
12877- delta = min_addr - LOAD_PHYSICAL_ADDR;
12878+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12879 if (!delta) {
12880 debug_putstr("No relocation needed... ");
12881 return;
12882@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12883 Elf32_Ehdr ehdr;
12884 Elf32_Phdr *phdrs, *phdr;
12885 #endif
12886- void *dest;
12887+ void *dest, *prev;
12888 int i;
12889
12890 memcpy(&ehdr, output, sizeof(ehdr));
12891@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12892 case PT_LOAD:
12893 #ifdef CONFIG_RELOCATABLE
12894 dest = output;
12895- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12896+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12897 #else
12898 dest = (void *)(phdr->p_paddr);
12899 #endif
12900 memcpy(dest,
12901 output + phdr->p_offset,
12902 phdr->p_filesz);
12903+ if (i)
12904+ memset(prev, 0xff, dest - prev);
12905+ prev = dest + phdr->p_filesz;
12906 break;
12907 default: /* Ignore other PT_* */ break;
12908 }
12909@@ -419,7 +422,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12910 error("Destination address too large");
12911 #endif
12912 #ifndef CONFIG_RELOCATABLE
12913- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12914+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12915 error("Wrong destination address");
12916 #endif
12917
12918diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12919index 1fd7d57..0f7d096 100644
12920--- a/arch/x86/boot/cpucheck.c
12921+++ b/arch/x86/boot/cpucheck.c
12922@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12923 u32 ecx = MSR_K7_HWCR;
12924 u32 eax, edx;
12925
12926- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12927+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12928 eax &= ~(1 << 15);
12929- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12930+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12931
12932 get_cpuflags(); /* Make sure it really did something */
12933 err = check_cpuflags();
12934@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12935 u32 ecx = MSR_VIA_FCR;
12936 u32 eax, edx;
12937
12938- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12939+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12940 eax |= (1<<1)|(1<<7);
12941- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12942+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12943
12944 set_bit(X86_FEATURE_CX8, cpu.flags);
12945 err = check_cpuflags();
12946@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12947 u32 eax, edx;
12948 u32 level = 1;
12949
12950- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12951- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12952- asm("cpuid"
12953+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12954+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12955+ asm volatile("cpuid"
12956 : "+a" (level), "=d" (cpu.flags[0])
12957 : : "ecx", "ebx");
12958- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12959+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12960
12961 err = check_cpuflags();
12962 } else if (err == 0x01 &&
12963diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12964index 16ef025..91e033b 100644
12965--- a/arch/x86/boot/header.S
12966+++ b/arch/x86/boot/header.S
12967@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12968 # single linked list of
12969 # struct setup_data
12970
12971-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12972+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12973
12974 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12975+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12976+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12977+#else
12978 #define VO_INIT_SIZE (VO__end - VO__text)
12979+#endif
12980 #if ZO_INIT_SIZE > VO_INIT_SIZE
12981 #define INIT_SIZE ZO_INIT_SIZE
12982 #else
12983diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12984index db75d07..8e6d0af 100644
12985--- a/arch/x86/boot/memory.c
12986+++ b/arch/x86/boot/memory.c
12987@@ -19,7 +19,7 @@
12988
12989 static int detect_memory_e820(void)
12990 {
12991- int count = 0;
12992+ unsigned int count = 0;
12993 struct biosregs ireg, oreg;
12994 struct e820entry *desc = boot_params.e820_map;
12995 static struct e820entry buf; /* static so it is zeroed */
12996diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12997index ba3e100..6501b8f 100644
12998--- a/arch/x86/boot/video-vesa.c
12999+++ b/arch/x86/boot/video-vesa.c
13000@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13001
13002 boot_params.screen_info.vesapm_seg = oreg.es;
13003 boot_params.screen_info.vesapm_off = oreg.di;
13004+ boot_params.screen_info.vesapm_size = oreg.cx;
13005 }
13006
13007 /*
13008diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13009index 05111bb..a1ae1f0 100644
13010--- a/arch/x86/boot/video.c
13011+++ b/arch/x86/boot/video.c
13012@@ -98,7 +98,7 @@ static void store_mode_params(void)
13013 static unsigned int get_entry(void)
13014 {
13015 char entry_buf[4];
13016- int i, len = 0;
13017+ unsigned int i, len = 0;
13018 int key;
13019 unsigned int v;
13020
13021diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13022index 9105655..41779c1 100644
13023--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13024+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13025@@ -8,6 +8,8 @@
13026 * including this sentence is retained in full.
13027 */
13028
13029+#include <asm/alternative-asm.h>
13030+
13031 .extern crypto_ft_tab
13032 .extern crypto_it_tab
13033 .extern crypto_fl_tab
13034@@ -70,6 +72,8 @@
13035 je B192; \
13036 leaq 32(r9),r9;
13037
13038+#define ret pax_force_retaddr; ret
13039+
13040 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13041 movq r1,r2; \
13042 movq r3,r4; \
13043diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13044index 6bd2c6c..368c93e 100644
13045--- a/arch/x86/crypto/aesni-intel_asm.S
13046+++ b/arch/x86/crypto/aesni-intel_asm.S
13047@@ -31,6 +31,7 @@
13048
13049 #include <linux/linkage.h>
13050 #include <asm/inst.h>
13051+#include <asm/alternative-asm.h>
13052
13053 /*
13054 * The following macros are used to move an (un)aligned 16 byte value to/from
13055@@ -217,7 +218,7 @@ enc: .octa 0x2
13056 * num_initial_blocks = b mod 4
13057 * encrypt the initial num_initial_blocks blocks and apply ghash on
13058 * the ciphertext
13059-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13060+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13061 * are clobbered
13062 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13063 */
13064@@ -227,8 +228,8 @@ enc: .octa 0x2
13065 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13066 MOVADQ SHUF_MASK(%rip), %xmm14
13067 mov arg7, %r10 # %r10 = AAD
13068- mov arg8, %r12 # %r12 = aadLen
13069- mov %r12, %r11
13070+ mov arg8, %r15 # %r15 = aadLen
13071+ mov %r15, %r11
13072 pxor %xmm\i, %xmm\i
13073
13074 _get_AAD_loop\num_initial_blocks\operation:
13075@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13076 psrldq $4, %xmm\i
13077 pxor \TMP1, %xmm\i
13078 add $4, %r10
13079- sub $4, %r12
13080+ sub $4, %r15
13081 jne _get_AAD_loop\num_initial_blocks\operation
13082
13083 cmp $16, %r11
13084 je _get_AAD_loop2_done\num_initial_blocks\operation
13085
13086- mov $16, %r12
13087+ mov $16, %r15
13088 _get_AAD_loop2\num_initial_blocks\operation:
13089 psrldq $4, %xmm\i
13090- sub $4, %r12
13091- cmp %r11, %r12
13092+ sub $4, %r15
13093+ cmp %r11, %r15
13094 jne _get_AAD_loop2\num_initial_blocks\operation
13095
13096 _get_AAD_loop2_done\num_initial_blocks\operation:
13097@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13098 * num_initial_blocks = b mod 4
13099 * encrypt the initial num_initial_blocks blocks and apply ghash on
13100 * the ciphertext
13101-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13102+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13103 * are clobbered
13104 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13105 */
13106@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13107 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13108 MOVADQ SHUF_MASK(%rip), %xmm14
13109 mov arg7, %r10 # %r10 = AAD
13110- mov arg8, %r12 # %r12 = aadLen
13111- mov %r12, %r11
13112+ mov arg8, %r15 # %r15 = aadLen
13113+ mov %r15, %r11
13114 pxor %xmm\i, %xmm\i
13115 _get_AAD_loop\num_initial_blocks\operation:
13116 movd (%r10), \TMP1
13117@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13118 psrldq $4, %xmm\i
13119 pxor \TMP1, %xmm\i
13120 add $4, %r10
13121- sub $4, %r12
13122+ sub $4, %r15
13123 jne _get_AAD_loop\num_initial_blocks\operation
13124 cmp $16, %r11
13125 je _get_AAD_loop2_done\num_initial_blocks\operation
13126- mov $16, %r12
13127+ mov $16, %r15
13128 _get_AAD_loop2\num_initial_blocks\operation:
13129 psrldq $4, %xmm\i
13130- sub $4, %r12
13131- cmp %r11, %r12
13132+ sub $4, %r15
13133+ cmp %r11, %r15
13134 jne _get_AAD_loop2\num_initial_blocks\operation
13135 _get_AAD_loop2_done\num_initial_blocks\operation:
13136 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13137@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13138 *
13139 *****************************************************************************/
13140 ENTRY(aesni_gcm_dec)
13141- push %r12
13142+ push %r15
13143 push %r13
13144 push %r14
13145 mov %rsp, %r14
13146@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13147 */
13148 sub $VARIABLE_OFFSET, %rsp
13149 and $~63, %rsp # align rsp to 64 bytes
13150- mov %arg6, %r12
13151- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13152+ mov %arg6, %r15
13153+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13154 movdqa SHUF_MASK(%rip), %xmm2
13155 PSHUFB_XMM %xmm2, %xmm13
13156
13157@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13158 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13159 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13160 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13161- mov %r13, %r12
13162- and $(3<<4), %r12
13163+ mov %r13, %r15
13164+ and $(3<<4), %r15
13165 jz _initial_num_blocks_is_0_decrypt
13166- cmp $(2<<4), %r12
13167+ cmp $(2<<4), %r15
13168 jb _initial_num_blocks_is_1_decrypt
13169 je _initial_num_blocks_is_2_decrypt
13170 _initial_num_blocks_is_3_decrypt:
13171@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13172 sub $16, %r11
13173 add %r13, %r11
13174 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13175- lea SHIFT_MASK+16(%rip), %r12
13176- sub %r13, %r12
13177+ lea SHIFT_MASK+16(%rip), %r15
13178+ sub %r13, %r15
13179 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13180 # (%r13 is the number of bytes in plaintext mod 16)
13181- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13182+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13183 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13184
13185 movdqa %xmm1, %xmm2
13186 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13187- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13188+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13189 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13190 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13191 pand %xmm1, %xmm2
13192@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13193 sub $1, %r13
13194 jne _less_than_8_bytes_left_decrypt
13195 _multiple_of_16_bytes_decrypt:
13196- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13197- shl $3, %r12 # convert into number of bits
13198- movd %r12d, %xmm15 # len(A) in %xmm15
13199+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13200+ shl $3, %r15 # convert into number of bits
13201+ movd %r15d, %xmm15 # len(A) in %xmm15
13202 shl $3, %arg4 # len(C) in bits (*128)
13203 MOVQ_R64_XMM %arg4, %xmm1
13204 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13205@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13206 mov %r14, %rsp
13207 pop %r14
13208 pop %r13
13209- pop %r12
13210+ pop %r15
13211+ pax_force_retaddr
13212 ret
13213 ENDPROC(aesni_gcm_dec)
13214
13215@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13216 * poly = x^128 + x^127 + x^126 + x^121 + 1
13217 ***************************************************************************/
13218 ENTRY(aesni_gcm_enc)
13219- push %r12
13220+ push %r15
13221 push %r13
13222 push %r14
13223 mov %rsp, %r14
13224@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13225 #
13226 sub $VARIABLE_OFFSET, %rsp
13227 and $~63, %rsp
13228- mov %arg6, %r12
13229- movdqu (%r12), %xmm13
13230+ mov %arg6, %r15
13231+ movdqu (%r15), %xmm13
13232 movdqa SHUF_MASK(%rip), %xmm2
13233 PSHUFB_XMM %xmm2, %xmm13
13234
13235@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13236 movdqa %xmm13, HashKey(%rsp)
13237 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13238 and $-16, %r13
13239- mov %r13, %r12
13240+ mov %r13, %r15
13241
13242 # Encrypt first few blocks
13243
13244- and $(3<<4), %r12
13245+ and $(3<<4), %r15
13246 jz _initial_num_blocks_is_0_encrypt
13247- cmp $(2<<4), %r12
13248+ cmp $(2<<4), %r15
13249 jb _initial_num_blocks_is_1_encrypt
13250 je _initial_num_blocks_is_2_encrypt
13251 _initial_num_blocks_is_3_encrypt:
13252@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13253 sub $16, %r11
13254 add %r13, %r11
13255 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13256- lea SHIFT_MASK+16(%rip), %r12
13257- sub %r13, %r12
13258+ lea SHIFT_MASK+16(%rip), %r15
13259+ sub %r13, %r15
13260 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13261 # (%r13 is the number of bytes in plaintext mod 16)
13262- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13263+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13264 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13265 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13266- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13267+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13268 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13269 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13270 movdqa SHUF_MASK(%rip), %xmm10
13271@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13272 sub $1, %r13
13273 jne _less_than_8_bytes_left_encrypt
13274 _multiple_of_16_bytes_encrypt:
13275- mov arg8, %r12 # %r12 = addLen (number of bytes)
13276- shl $3, %r12
13277- movd %r12d, %xmm15 # len(A) in %xmm15
13278+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13279+ shl $3, %r15
13280+ movd %r15d, %xmm15 # len(A) in %xmm15
13281 shl $3, %arg4 # len(C) in bits (*128)
13282 MOVQ_R64_XMM %arg4, %xmm1
13283 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13284@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13285 mov %r14, %rsp
13286 pop %r14
13287 pop %r13
13288- pop %r12
13289+ pop %r15
13290+ pax_force_retaddr
13291 ret
13292 ENDPROC(aesni_gcm_enc)
13293
13294@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13295 pxor %xmm1, %xmm0
13296 movaps %xmm0, (TKEYP)
13297 add $0x10, TKEYP
13298+ pax_force_retaddr
13299 ret
13300 ENDPROC(_key_expansion_128)
13301 ENDPROC(_key_expansion_256a)
13302@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13303 shufps $0b01001110, %xmm2, %xmm1
13304 movaps %xmm1, 0x10(TKEYP)
13305 add $0x20, TKEYP
13306+ pax_force_retaddr
13307 ret
13308 ENDPROC(_key_expansion_192a)
13309
13310@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13311
13312 movaps %xmm0, (TKEYP)
13313 add $0x10, TKEYP
13314+ pax_force_retaddr
13315 ret
13316 ENDPROC(_key_expansion_192b)
13317
13318@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13319 pxor %xmm1, %xmm2
13320 movaps %xmm2, (TKEYP)
13321 add $0x10, TKEYP
13322+ pax_force_retaddr
13323 ret
13324 ENDPROC(_key_expansion_256b)
13325
13326@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13327 #ifndef __x86_64__
13328 popl KEYP
13329 #endif
13330+ pax_force_retaddr
13331 ret
13332 ENDPROC(aesni_set_key)
13333
13334@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13335 popl KLEN
13336 popl KEYP
13337 #endif
13338+ pax_force_retaddr
13339 ret
13340 ENDPROC(aesni_enc)
13341
13342@@ -1985,6 +1994,7 @@ _aesni_enc1:
13343 AESENC KEY STATE
13344 movaps 0x70(TKEYP), KEY
13345 AESENCLAST KEY STATE
13346+ pax_force_retaddr
13347 ret
13348 ENDPROC(_aesni_enc1)
13349
13350@@ -2094,6 +2104,7 @@ _aesni_enc4:
13351 AESENCLAST KEY STATE2
13352 AESENCLAST KEY STATE3
13353 AESENCLAST KEY STATE4
13354+ pax_force_retaddr
13355 ret
13356 ENDPROC(_aesni_enc4)
13357
13358@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13359 popl KLEN
13360 popl KEYP
13361 #endif
13362+ pax_force_retaddr
13363 ret
13364 ENDPROC(aesni_dec)
13365
13366@@ -2175,6 +2187,7 @@ _aesni_dec1:
13367 AESDEC KEY STATE
13368 movaps 0x70(TKEYP), KEY
13369 AESDECLAST KEY STATE
13370+ pax_force_retaddr
13371 ret
13372 ENDPROC(_aesni_dec1)
13373
13374@@ -2284,6 +2297,7 @@ _aesni_dec4:
13375 AESDECLAST KEY STATE2
13376 AESDECLAST KEY STATE3
13377 AESDECLAST KEY STATE4
13378+ pax_force_retaddr
13379 ret
13380 ENDPROC(_aesni_dec4)
13381
13382@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13383 popl KEYP
13384 popl LEN
13385 #endif
13386+ pax_force_retaddr
13387 ret
13388 ENDPROC(aesni_ecb_enc)
13389
13390@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13391 popl KEYP
13392 popl LEN
13393 #endif
13394+ pax_force_retaddr
13395 ret
13396 ENDPROC(aesni_ecb_dec)
13397
13398@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13399 popl LEN
13400 popl IVP
13401 #endif
13402+ pax_force_retaddr
13403 ret
13404 ENDPROC(aesni_cbc_enc)
13405
13406@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13407 popl LEN
13408 popl IVP
13409 #endif
13410+ pax_force_retaddr
13411 ret
13412 ENDPROC(aesni_cbc_dec)
13413
13414@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13415 mov $1, TCTR_LOW
13416 MOVQ_R64_XMM TCTR_LOW INC
13417 MOVQ_R64_XMM CTR TCTR_LOW
13418+ pax_force_retaddr
13419 ret
13420 ENDPROC(_aesni_inc_init)
13421
13422@@ -2590,6 +2609,7 @@ _aesni_inc:
13423 .Linc_low:
13424 movaps CTR, IV
13425 PSHUFB_XMM BSWAP_MASK IV
13426+ pax_force_retaddr
13427 ret
13428 ENDPROC(_aesni_inc)
13429
13430@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13431 .Lctr_enc_ret:
13432 movups IV, (IVP)
13433 .Lctr_enc_just_ret:
13434+ pax_force_retaddr
13435 ret
13436 ENDPROC(aesni_ctr_enc)
13437
13438@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13439 pxor INC, STATE4
13440 movdqu STATE4, 0x70(OUTP)
13441
13442+ pax_force_retaddr
13443 ret
13444 ENDPROC(aesni_xts_crypt8)
13445
13446diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13447index 246c670..466e2d6 100644
13448--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13449+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13450@@ -21,6 +21,7 @@
13451 */
13452
13453 #include <linux/linkage.h>
13454+#include <asm/alternative-asm.h>
13455
13456 .file "blowfish-x86_64-asm.S"
13457 .text
13458@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13459 jnz .L__enc_xor;
13460
13461 write_block();
13462+ pax_force_retaddr
13463 ret;
13464 .L__enc_xor:
13465 xor_block();
13466+ pax_force_retaddr
13467 ret;
13468 ENDPROC(__blowfish_enc_blk)
13469
13470@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13471
13472 movq %r11, %rbp;
13473
13474+ pax_force_retaddr
13475 ret;
13476 ENDPROC(blowfish_dec_blk)
13477
13478@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13479
13480 popq %rbx;
13481 popq %rbp;
13482+ pax_force_retaddr
13483 ret;
13484
13485 .L__enc_xor4:
13486@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13487
13488 popq %rbx;
13489 popq %rbp;
13490+ pax_force_retaddr
13491 ret;
13492 ENDPROC(__blowfish_enc_blk_4way)
13493
13494@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13495 popq %rbx;
13496 popq %rbp;
13497
13498+ pax_force_retaddr
13499 ret;
13500 ENDPROC(blowfish_dec_blk_4way)
13501diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13502index ce71f92..1dce7ec 100644
13503--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13504+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13505@@ -16,6 +16,7 @@
13506 */
13507
13508 #include <linux/linkage.h>
13509+#include <asm/alternative-asm.h>
13510
13511 #define CAMELLIA_TABLE_BYTE_LEN 272
13512
13513@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13514 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13515 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13516 %rcx, (%r9));
13517+ pax_force_retaddr
13518 ret;
13519 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13520
13521@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13522 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13523 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13524 %rax, (%r9));
13525+ pax_force_retaddr
13526 ret;
13527 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13528
13529@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13530 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13531 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13532
13533+ pax_force_retaddr
13534 ret;
13535
13536 .align 8
13537@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13538 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13539 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13540
13541+ pax_force_retaddr
13542 ret;
13543
13544 .align 8
13545@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13546 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13547 %xmm8, %rsi);
13548
13549+ pax_force_retaddr
13550 ret;
13551 ENDPROC(camellia_ecb_enc_16way)
13552
13553@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13554 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13555 %xmm8, %rsi);
13556
13557+ pax_force_retaddr
13558 ret;
13559 ENDPROC(camellia_ecb_dec_16way)
13560
13561@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13562 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13563 %xmm8, %rsi);
13564
13565+ pax_force_retaddr
13566 ret;
13567 ENDPROC(camellia_cbc_dec_16way)
13568
13569@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13570 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13571 %xmm8, %rsi);
13572
13573+ pax_force_retaddr
13574 ret;
13575 ENDPROC(camellia_ctr_16way)
13576
13577@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13578 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13579 %xmm8, %rsi);
13580
13581+ pax_force_retaddr
13582 ret;
13583 ENDPROC(camellia_xts_crypt_16way)
13584
13585diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13586index 0e0b886..5a3123c 100644
13587--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13588+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13589@@ -11,6 +11,7 @@
13590 */
13591
13592 #include <linux/linkage.h>
13593+#include <asm/alternative-asm.h>
13594
13595 #define CAMELLIA_TABLE_BYTE_LEN 272
13596
13597@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13598 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13599 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13600 %rcx, (%r9));
13601+ pax_force_retaddr
13602 ret;
13603 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13604
13605@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13606 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13607 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13608 %rax, (%r9));
13609+ pax_force_retaddr
13610 ret;
13611 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13612
13613@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13614 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13615 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13616
13617+ pax_force_retaddr
13618 ret;
13619
13620 .align 8
13621@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13622 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13623 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13624
13625+ pax_force_retaddr
13626 ret;
13627
13628 .align 8
13629@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13630
13631 vzeroupper;
13632
13633+ pax_force_retaddr
13634 ret;
13635 ENDPROC(camellia_ecb_enc_32way)
13636
13637@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13638
13639 vzeroupper;
13640
13641+ pax_force_retaddr
13642 ret;
13643 ENDPROC(camellia_ecb_dec_32way)
13644
13645@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13646
13647 vzeroupper;
13648
13649+ pax_force_retaddr
13650 ret;
13651 ENDPROC(camellia_cbc_dec_32way)
13652
13653@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13654
13655 vzeroupper;
13656
13657+ pax_force_retaddr
13658 ret;
13659 ENDPROC(camellia_ctr_32way)
13660
13661@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13662
13663 vzeroupper;
13664
13665+ pax_force_retaddr
13666 ret;
13667 ENDPROC(camellia_xts_crypt_32way)
13668
13669diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13670index 310319c..db3d7b5 100644
13671--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13672+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13673@@ -21,6 +21,7 @@
13674 */
13675
13676 #include <linux/linkage.h>
13677+#include <asm/alternative-asm.h>
13678
13679 .file "camellia-x86_64-asm_64.S"
13680 .text
13681@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13682 enc_outunpack(mov, RT1);
13683
13684 movq RRBP, %rbp;
13685+ pax_force_retaddr
13686 ret;
13687
13688 .L__enc_xor:
13689 enc_outunpack(xor, RT1);
13690
13691 movq RRBP, %rbp;
13692+ pax_force_retaddr
13693 ret;
13694 ENDPROC(__camellia_enc_blk)
13695
13696@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13697 dec_outunpack();
13698
13699 movq RRBP, %rbp;
13700+ pax_force_retaddr
13701 ret;
13702 ENDPROC(camellia_dec_blk)
13703
13704@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13705
13706 movq RRBP, %rbp;
13707 popq %rbx;
13708+ pax_force_retaddr
13709 ret;
13710
13711 .L__enc2_xor:
13712@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13713
13714 movq RRBP, %rbp;
13715 popq %rbx;
13716+ pax_force_retaddr
13717 ret;
13718 ENDPROC(__camellia_enc_blk_2way)
13719
13720@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13721
13722 movq RRBP, %rbp;
13723 movq RXOR, %rbx;
13724+ pax_force_retaddr
13725 ret;
13726 ENDPROC(camellia_dec_blk_2way)
13727diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13728index c35fd5d..2d8c7db 100644
13729--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13730+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13731@@ -24,6 +24,7 @@
13732 */
13733
13734 #include <linux/linkage.h>
13735+#include <asm/alternative-asm.h>
13736
13737 .file "cast5-avx-x86_64-asm_64.S"
13738
13739@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13740 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13741 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13742
13743+ pax_force_retaddr
13744 ret;
13745 ENDPROC(__cast5_enc_blk16)
13746
13747@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13748 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13749 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13750
13751+ pax_force_retaddr
13752 ret;
13753
13754 .L__skip_dec:
13755@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13756 vmovdqu RR4, (6*4*4)(%r11);
13757 vmovdqu RL4, (7*4*4)(%r11);
13758
13759+ pax_force_retaddr
13760 ret;
13761 ENDPROC(cast5_ecb_enc_16way)
13762
13763@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13764 vmovdqu RR4, (6*4*4)(%r11);
13765 vmovdqu RL4, (7*4*4)(%r11);
13766
13767+ pax_force_retaddr
13768 ret;
13769 ENDPROC(cast5_ecb_dec_16way)
13770
13771@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13772 * %rdx: src
13773 */
13774
13775- pushq %r12;
13776+ pushq %r14;
13777
13778 movq %rsi, %r11;
13779- movq %rdx, %r12;
13780+ movq %rdx, %r14;
13781
13782 vmovdqu (0*16)(%rdx), RL1;
13783 vmovdqu (1*16)(%rdx), RR1;
13784@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13785 call __cast5_dec_blk16;
13786
13787 /* xor with src */
13788- vmovq (%r12), RX;
13789+ vmovq (%r14), RX;
13790 vpshufd $0x4f, RX, RX;
13791 vpxor RX, RR1, RR1;
13792- vpxor 0*16+8(%r12), RL1, RL1;
13793- vpxor 1*16+8(%r12), RR2, RR2;
13794- vpxor 2*16+8(%r12), RL2, RL2;
13795- vpxor 3*16+8(%r12), RR3, RR3;
13796- vpxor 4*16+8(%r12), RL3, RL3;
13797- vpxor 5*16+8(%r12), RR4, RR4;
13798- vpxor 6*16+8(%r12), RL4, RL4;
13799+ vpxor 0*16+8(%r14), RL1, RL1;
13800+ vpxor 1*16+8(%r14), RR2, RR2;
13801+ vpxor 2*16+8(%r14), RL2, RL2;
13802+ vpxor 3*16+8(%r14), RR3, RR3;
13803+ vpxor 4*16+8(%r14), RL3, RL3;
13804+ vpxor 5*16+8(%r14), RR4, RR4;
13805+ vpxor 6*16+8(%r14), RL4, RL4;
13806
13807 vmovdqu RR1, (0*16)(%r11);
13808 vmovdqu RL1, (1*16)(%r11);
13809@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13810 vmovdqu RR4, (6*16)(%r11);
13811 vmovdqu RL4, (7*16)(%r11);
13812
13813- popq %r12;
13814+ popq %r14;
13815
13816+ pax_force_retaddr
13817 ret;
13818 ENDPROC(cast5_cbc_dec_16way)
13819
13820@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13821 * %rcx: iv (big endian, 64bit)
13822 */
13823
13824- pushq %r12;
13825+ pushq %r14;
13826
13827 movq %rsi, %r11;
13828- movq %rdx, %r12;
13829+ movq %rdx, %r14;
13830
13831 vpcmpeqd RTMP, RTMP, RTMP;
13832 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13833@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13834 call __cast5_enc_blk16;
13835
13836 /* dst = src ^ iv */
13837- vpxor (0*16)(%r12), RR1, RR1;
13838- vpxor (1*16)(%r12), RL1, RL1;
13839- vpxor (2*16)(%r12), RR2, RR2;
13840- vpxor (3*16)(%r12), RL2, RL2;
13841- vpxor (4*16)(%r12), RR3, RR3;
13842- vpxor (5*16)(%r12), RL3, RL3;
13843- vpxor (6*16)(%r12), RR4, RR4;
13844- vpxor (7*16)(%r12), RL4, RL4;
13845+ vpxor (0*16)(%r14), RR1, RR1;
13846+ vpxor (1*16)(%r14), RL1, RL1;
13847+ vpxor (2*16)(%r14), RR2, RR2;
13848+ vpxor (3*16)(%r14), RL2, RL2;
13849+ vpxor (4*16)(%r14), RR3, RR3;
13850+ vpxor (5*16)(%r14), RL3, RL3;
13851+ vpxor (6*16)(%r14), RR4, RR4;
13852+ vpxor (7*16)(%r14), RL4, RL4;
13853 vmovdqu RR1, (0*16)(%r11);
13854 vmovdqu RL1, (1*16)(%r11);
13855 vmovdqu RR2, (2*16)(%r11);
13856@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13857 vmovdqu RR4, (6*16)(%r11);
13858 vmovdqu RL4, (7*16)(%r11);
13859
13860- popq %r12;
13861+ popq %r14;
13862
13863+ pax_force_retaddr
13864 ret;
13865 ENDPROC(cast5_ctr_16way)
13866diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13867index e3531f8..e123f35 100644
13868--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13869+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13870@@ -24,6 +24,7 @@
13871 */
13872
13873 #include <linux/linkage.h>
13874+#include <asm/alternative-asm.h>
13875 #include "glue_helper-asm-avx.S"
13876
13877 .file "cast6-avx-x86_64-asm_64.S"
13878@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13879 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13880 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13881
13882+ pax_force_retaddr
13883 ret;
13884 ENDPROC(__cast6_enc_blk8)
13885
13886@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13887 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13888 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13889
13890+ pax_force_retaddr
13891 ret;
13892 ENDPROC(__cast6_dec_blk8)
13893
13894@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13895
13896 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13897
13898+ pax_force_retaddr
13899 ret;
13900 ENDPROC(cast6_ecb_enc_8way)
13901
13902@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13903
13904 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13905
13906+ pax_force_retaddr
13907 ret;
13908 ENDPROC(cast6_ecb_dec_8way)
13909
13910@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13911 * %rdx: src
13912 */
13913
13914- pushq %r12;
13915+ pushq %r14;
13916
13917 movq %rsi, %r11;
13918- movq %rdx, %r12;
13919+ movq %rdx, %r14;
13920
13921 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13922
13923 call __cast6_dec_blk8;
13924
13925- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13926+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13927
13928- popq %r12;
13929+ popq %r14;
13930
13931+ pax_force_retaddr
13932 ret;
13933 ENDPROC(cast6_cbc_dec_8way)
13934
13935@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13936 * %rcx: iv (little endian, 128bit)
13937 */
13938
13939- pushq %r12;
13940+ pushq %r14;
13941
13942 movq %rsi, %r11;
13943- movq %rdx, %r12;
13944+ movq %rdx, %r14;
13945
13946 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13947 RD2, RX, RKR, RKM);
13948
13949 call __cast6_enc_blk8;
13950
13951- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13952+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13953
13954- popq %r12;
13955+ popq %r14;
13956
13957+ pax_force_retaddr
13958 ret;
13959 ENDPROC(cast6_ctr_8way)
13960
13961@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13962 /* dst <= regs xor IVs(in dst) */
13963 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13964
13965+ pax_force_retaddr
13966 ret;
13967 ENDPROC(cast6_xts_enc_8way)
13968
13969@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13970 /* dst <= regs xor IVs(in dst) */
13971 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13972
13973+ pax_force_retaddr
13974 ret;
13975 ENDPROC(cast6_xts_dec_8way)
13976diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13977index 225be06..2885e731 100644
13978--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13979+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13980@@ -45,6 +45,7 @@
13981
13982 #include <asm/inst.h>
13983 #include <linux/linkage.h>
13984+#include <asm/alternative-asm.h>
13985
13986 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13987
13988@@ -309,6 +310,7 @@ do_return:
13989 popq %rsi
13990 popq %rdi
13991 popq %rbx
13992+ pax_force_retaddr
13993 ret
13994
13995 ################################################################
13996@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
13997 ## PCLMULQDQ tables
13998 ## Table is 128 entries x 2 words (8 bytes) each
13999 ################################################################
14000-.section .rotata, "a", %progbits
14001+.section .rodata, "a", %progbits
14002 .align 8
14003 K_table:
14004 .long 0x493c7d27, 0x00000001
14005diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14006index 5d1e007..098cb4f 100644
14007--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14008+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14009@@ -18,6 +18,7 @@
14010
14011 #include <linux/linkage.h>
14012 #include <asm/inst.h>
14013+#include <asm/alternative-asm.h>
14014
14015 .data
14016
14017@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14018 psrlq $1, T2
14019 pxor T2, T1
14020 pxor T1, DATA
14021+ pax_force_retaddr
14022 ret
14023 ENDPROC(__clmul_gf128mul_ble)
14024
14025@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14026 call __clmul_gf128mul_ble
14027 PSHUFB_XMM BSWAP DATA
14028 movups DATA, (%rdi)
14029+ pax_force_retaddr
14030 ret
14031 ENDPROC(clmul_ghash_mul)
14032
14033@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14034 PSHUFB_XMM BSWAP DATA
14035 movups DATA, (%rdi)
14036 .Lupdate_just_ret:
14037+ pax_force_retaddr
14038 ret
14039 ENDPROC(clmul_ghash_update)
14040diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14041index 9279e0b..c4b3d2c 100644
14042--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14043+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14044@@ -1,4 +1,5 @@
14045 #include <linux/linkage.h>
14046+#include <asm/alternative-asm.h>
14047
14048 # enter salsa20_encrypt_bytes
14049 ENTRY(salsa20_encrypt_bytes)
14050@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14051 add %r11,%rsp
14052 mov %rdi,%rax
14053 mov %rsi,%rdx
14054+ pax_force_retaddr
14055 ret
14056 # bytesatleast65:
14057 ._bytesatleast65:
14058@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14059 add %r11,%rsp
14060 mov %rdi,%rax
14061 mov %rsi,%rdx
14062+ pax_force_retaddr
14063 ret
14064 ENDPROC(salsa20_keysetup)
14065
14066@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14067 add %r11,%rsp
14068 mov %rdi,%rax
14069 mov %rsi,%rdx
14070+ pax_force_retaddr
14071 ret
14072 ENDPROC(salsa20_ivsetup)
14073diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14074index 2f202f4..d9164d6 100644
14075--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14076+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14077@@ -24,6 +24,7 @@
14078 */
14079
14080 #include <linux/linkage.h>
14081+#include <asm/alternative-asm.h>
14082 #include "glue_helper-asm-avx.S"
14083
14084 .file "serpent-avx-x86_64-asm_64.S"
14085@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14086 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14087 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14088
14089+ pax_force_retaddr
14090 ret;
14091 ENDPROC(__serpent_enc_blk8_avx)
14092
14093@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14094 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14095 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14096
14097+ pax_force_retaddr
14098 ret;
14099 ENDPROC(__serpent_dec_blk8_avx)
14100
14101@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14102
14103 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14104
14105+ pax_force_retaddr
14106 ret;
14107 ENDPROC(serpent_ecb_enc_8way_avx)
14108
14109@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14110
14111 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14112
14113+ pax_force_retaddr
14114 ret;
14115 ENDPROC(serpent_ecb_dec_8way_avx)
14116
14117@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14118
14119 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14120
14121+ pax_force_retaddr
14122 ret;
14123 ENDPROC(serpent_cbc_dec_8way_avx)
14124
14125@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14126
14127 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14128
14129+ pax_force_retaddr
14130 ret;
14131 ENDPROC(serpent_ctr_8way_avx)
14132
14133@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14134 /* dst <= regs xor IVs(in dst) */
14135 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14136
14137+ pax_force_retaddr
14138 ret;
14139 ENDPROC(serpent_xts_enc_8way_avx)
14140
14141@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14142 /* dst <= regs xor IVs(in dst) */
14143 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14144
14145+ pax_force_retaddr
14146 ret;
14147 ENDPROC(serpent_xts_dec_8way_avx)
14148diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14149index b222085..abd483c 100644
14150--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14151+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14152@@ -15,6 +15,7 @@
14153 */
14154
14155 #include <linux/linkage.h>
14156+#include <asm/alternative-asm.h>
14157 #include "glue_helper-asm-avx2.S"
14158
14159 .file "serpent-avx2-asm_64.S"
14160@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14161 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14162 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14163
14164+ pax_force_retaddr
14165 ret;
14166 ENDPROC(__serpent_enc_blk16)
14167
14168@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14169 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14170 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14171
14172+ pax_force_retaddr
14173 ret;
14174 ENDPROC(__serpent_dec_blk16)
14175
14176@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14177
14178 vzeroupper;
14179
14180+ pax_force_retaddr
14181 ret;
14182 ENDPROC(serpent_ecb_enc_16way)
14183
14184@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14185
14186 vzeroupper;
14187
14188+ pax_force_retaddr
14189 ret;
14190 ENDPROC(serpent_ecb_dec_16way)
14191
14192@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14193
14194 vzeroupper;
14195
14196+ pax_force_retaddr
14197 ret;
14198 ENDPROC(serpent_cbc_dec_16way)
14199
14200@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14201
14202 vzeroupper;
14203
14204+ pax_force_retaddr
14205 ret;
14206 ENDPROC(serpent_ctr_16way)
14207
14208@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14209
14210 vzeroupper;
14211
14212+ pax_force_retaddr
14213 ret;
14214 ENDPROC(serpent_xts_enc_16way)
14215
14216@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14217
14218 vzeroupper;
14219
14220+ pax_force_retaddr
14221 ret;
14222 ENDPROC(serpent_xts_dec_16way)
14223diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14224index acc066c..1559cc4 100644
14225--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14226+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14227@@ -25,6 +25,7 @@
14228 */
14229
14230 #include <linux/linkage.h>
14231+#include <asm/alternative-asm.h>
14232
14233 .file "serpent-sse2-x86_64-asm_64.S"
14234 .text
14235@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14236 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14237 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14238
14239+ pax_force_retaddr
14240 ret;
14241
14242 .L__enc_xor8:
14243 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14244 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14245
14246+ pax_force_retaddr
14247 ret;
14248 ENDPROC(__serpent_enc_blk_8way)
14249
14250@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14251 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14252 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14253
14254+ pax_force_retaddr
14255 ret;
14256 ENDPROC(serpent_dec_blk_8way)
14257diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14258index a410950..9dfe7ad 100644
14259--- a/arch/x86/crypto/sha1_ssse3_asm.S
14260+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14261@@ -29,6 +29,7 @@
14262 */
14263
14264 #include <linux/linkage.h>
14265+#include <asm/alternative-asm.h>
14266
14267 #define CTX %rdi // arg1
14268 #define BUF %rsi // arg2
14269@@ -75,9 +76,9 @@
14270
14271 push %rbx
14272 push %rbp
14273- push %r12
14274+ push %r14
14275
14276- mov %rsp, %r12
14277+ mov %rsp, %r14
14278 sub $64, %rsp # allocate workspace
14279 and $~15, %rsp # align stack
14280
14281@@ -99,11 +100,12 @@
14282 xor %rax, %rax
14283 rep stosq
14284
14285- mov %r12, %rsp # deallocate workspace
14286+ mov %r14, %rsp # deallocate workspace
14287
14288- pop %r12
14289+ pop %r14
14290 pop %rbp
14291 pop %rbx
14292+ pax_force_retaddr
14293 ret
14294
14295 ENDPROC(\name)
14296diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14297index 92b3b5d..0dc1dcb 100644
14298--- a/arch/x86/crypto/sha256-avx-asm.S
14299+++ b/arch/x86/crypto/sha256-avx-asm.S
14300@@ -49,6 +49,7 @@
14301
14302 #ifdef CONFIG_AS_AVX
14303 #include <linux/linkage.h>
14304+#include <asm/alternative-asm.h>
14305
14306 ## assume buffers not aligned
14307 #define VMOVDQ vmovdqu
14308@@ -460,6 +461,7 @@ done_hash:
14309 popq %r13
14310 popq %rbp
14311 popq %rbx
14312+ pax_force_retaddr
14313 ret
14314 ENDPROC(sha256_transform_avx)
14315
14316diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14317index 570ec5e..cf2b625 100644
14318--- a/arch/x86/crypto/sha256-avx2-asm.S
14319+++ b/arch/x86/crypto/sha256-avx2-asm.S
14320@@ -50,6 +50,7 @@
14321
14322 #ifdef CONFIG_AS_AVX2
14323 #include <linux/linkage.h>
14324+#include <asm/alternative-asm.h>
14325
14326 ## assume buffers not aligned
14327 #define VMOVDQ vmovdqu
14328@@ -720,6 +721,7 @@ done_hash:
14329 popq %r12
14330 popq %rbp
14331 popq %rbx
14332+ pax_force_retaddr
14333 ret
14334 ENDPROC(sha256_transform_rorx)
14335
14336diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14337index 2cedc44..5144899 100644
14338--- a/arch/x86/crypto/sha256-ssse3-asm.S
14339+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14340@@ -47,6 +47,7 @@
14341 ########################################################################
14342
14343 #include <linux/linkage.h>
14344+#include <asm/alternative-asm.h>
14345
14346 ## assume buffers not aligned
14347 #define MOVDQ movdqu
14348@@ -471,6 +472,7 @@ done_hash:
14349 popq %rbp
14350 popq %rbx
14351
14352+ pax_force_retaddr
14353 ret
14354 ENDPROC(sha256_transform_ssse3)
14355
14356diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14357index 565274d..af6bc08 100644
14358--- a/arch/x86/crypto/sha512-avx-asm.S
14359+++ b/arch/x86/crypto/sha512-avx-asm.S
14360@@ -49,6 +49,7 @@
14361
14362 #ifdef CONFIG_AS_AVX
14363 #include <linux/linkage.h>
14364+#include <asm/alternative-asm.h>
14365
14366 .text
14367
14368@@ -364,6 +365,7 @@ updateblock:
14369 mov frame_RSPSAVE(%rsp), %rsp
14370
14371 nowork:
14372+ pax_force_retaddr
14373 ret
14374 ENDPROC(sha512_transform_avx)
14375
14376diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14377index 1f20b35..f25c8c1 100644
14378--- a/arch/x86/crypto/sha512-avx2-asm.S
14379+++ b/arch/x86/crypto/sha512-avx2-asm.S
14380@@ -51,6 +51,7 @@
14381
14382 #ifdef CONFIG_AS_AVX2
14383 #include <linux/linkage.h>
14384+#include <asm/alternative-asm.h>
14385
14386 .text
14387
14388@@ -678,6 +679,7 @@ done_hash:
14389
14390 # Restore Stack Pointer
14391 mov frame_RSPSAVE(%rsp), %rsp
14392+ pax_force_retaddr
14393 ret
14394 ENDPROC(sha512_transform_rorx)
14395
14396diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14397index e610e29..ffcb5ed 100644
14398--- a/arch/x86/crypto/sha512-ssse3-asm.S
14399+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14400@@ -48,6 +48,7 @@
14401 ########################################################################
14402
14403 #include <linux/linkage.h>
14404+#include <asm/alternative-asm.h>
14405
14406 .text
14407
14408@@ -363,6 +364,7 @@ updateblock:
14409 mov frame_RSPSAVE(%rsp), %rsp
14410
14411 nowork:
14412+ pax_force_retaddr
14413 ret
14414 ENDPROC(sha512_transform_ssse3)
14415
14416diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14417index 0505813..b067311 100644
14418--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14419+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14420@@ -24,6 +24,7 @@
14421 */
14422
14423 #include <linux/linkage.h>
14424+#include <asm/alternative-asm.h>
14425 #include "glue_helper-asm-avx.S"
14426
14427 .file "twofish-avx-x86_64-asm_64.S"
14428@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14429 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14430 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14431
14432+ pax_force_retaddr
14433 ret;
14434 ENDPROC(__twofish_enc_blk8)
14435
14436@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14437 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14438 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14439
14440+ pax_force_retaddr
14441 ret;
14442 ENDPROC(__twofish_dec_blk8)
14443
14444@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14445
14446 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14447
14448+ pax_force_retaddr
14449 ret;
14450 ENDPROC(twofish_ecb_enc_8way)
14451
14452@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14453
14454 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14455
14456+ pax_force_retaddr
14457 ret;
14458 ENDPROC(twofish_ecb_dec_8way)
14459
14460@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14461 * %rdx: src
14462 */
14463
14464- pushq %r12;
14465+ pushq %r14;
14466
14467 movq %rsi, %r11;
14468- movq %rdx, %r12;
14469+ movq %rdx, %r14;
14470
14471 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14472
14473 call __twofish_dec_blk8;
14474
14475- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14476+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14477
14478- popq %r12;
14479+ popq %r14;
14480
14481+ pax_force_retaddr
14482 ret;
14483 ENDPROC(twofish_cbc_dec_8way)
14484
14485@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14486 * %rcx: iv (little endian, 128bit)
14487 */
14488
14489- pushq %r12;
14490+ pushq %r14;
14491
14492 movq %rsi, %r11;
14493- movq %rdx, %r12;
14494+ movq %rdx, %r14;
14495
14496 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14497 RD2, RX0, RX1, RY0);
14498
14499 call __twofish_enc_blk8;
14500
14501- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14502+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14503
14504- popq %r12;
14505+ popq %r14;
14506
14507+ pax_force_retaddr
14508 ret;
14509 ENDPROC(twofish_ctr_8way)
14510
14511@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14512 /* dst <= regs xor IVs(in dst) */
14513 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14514
14515+ pax_force_retaddr
14516 ret;
14517 ENDPROC(twofish_xts_enc_8way)
14518
14519@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14520 /* dst <= regs xor IVs(in dst) */
14521 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14522
14523+ pax_force_retaddr
14524 ret;
14525 ENDPROC(twofish_xts_dec_8way)
14526diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14527index 1c3b7ce..02f578d 100644
14528--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14529+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14530@@ -21,6 +21,7 @@
14531 */
14532
14533 #include <linux/linkage.h>
14534+#include <asm/alternative-asm.h>
14535
14536 .file "twofish-x86_64-asm-3way.S"
14537 .text
14538@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14539 popq %r13;
14540 popq %r14;
14541 popq %r15;
14542+ pax_force_retaddr
14543 ret;
14544
14545 .L__enc_xor3:
14546@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14547 popq %r13;
14548 popq %r14;
14549 popq %r15;
14550+ pax_force_retaddr
14551 ret;
14552 ENDPROC(__twofish_enc_blk_3way)
14553
14554@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14555 popq %r13;
14556 popq %r14;
14557 popq %r15;
14558+ pax_force_retaddr
14559 ret;
14560 ENDPROC(twofish_dec_blk_3way)
14561diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14562index a350c99..c1bac24 100644
14563--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14564+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14565@@ -22,6 +22,7 @@
14566
14567 #include <linux/linkage.h>
14568 #include <asm/asm-offsets.h>
14569+#include <asm/alternative-asm.h>
14570
14571 #define a_offset 0
14572 #define b_offset 4
14573@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14574
14575 popq R1
14576 movl $1,%eax
14577+ pax_force_retaddr
14578 ret
14579 ENDPROC(twofish_enc_blk)
14580
14581@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14582
14583 popq R1
14584 movl $1,%eax
14585+ pax_force_retaddr
14586 ret
14587 ENDPROC(twofish_dec_blk)
14588diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14589index ae6aad1..719d6d9 100644
14590--- a/arch/x86/ia32/ia32_aout.c
14591+++ b/arch/x86/ia32/ia32_aout.c
14592@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14593 unsigned long dump_start, dump_size;
14594 struct user32 dump;
14595
14596+ memset(&dump, 0, sizeof(dump));
14597+
14598 fs = get_fs();
14599 set_fs(KERNEL_DS);
14600 has_dumped = 1;
14601diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14602index c81d35e6..3500144 100644
14603--- a/arch/x86/ia32/ia32_signal.c
14604+++ b/arch/x86/ia32/ia32_signal.c
14605@@ -216,7 +216,7 @@ asmlinkage long sys32_sigreturn(void)
14606 if (__get_user(set.sig[0], &frame->sc.oldmask)
14607 || (_COMPAT_NSIG_WORDS > 1
14608 && __copy_from_user((((char *) &set.sig) + 4),
14609- &frame->extramask,
14610+ frame->extramask,
14611 sizeof(frame->extramask))))
14612 goto badframe;
14613
14614@@ -335,7 +335,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14615 sp -= frame_size;
14616 /* Align the stack pointer according to the i386 ABI,
14617 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14618- sp = ((sp + 4) & -16ul) - 4;
14619+ sp = ((sp - 12) & -16ul) - 4;
14620 return (void __user *) sp;
14621 }
14622
14623@@ -380,10 +380,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14624 } else {
14625 /* Return stub is in 32bit vsyscall page */
14626 if (current->mm->context.vdso)
14627- restorer = current->mm->context.vdso +
14628- selected_vdso32->sym___kernel_sigreturn;
14629+ restorer = (void __force_user *)(current->mm->context.vdso +
14630+ selected_vdso32->sym___kernel_sigreturn);
14631 else
14632- restorer = &frame->retcode;
14633+ restorer = frame->retcode;
14634 }
14635
14636 put_user_try {
14637@@ -393,7 +393,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14638 * These are actually not used anymore, but left because some
14639 * gdb versions depend on them as a marker.
14640 */
14641- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14642+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14643 } put_user_catch(err);
14644
14645 if (err)
14646@@ -435,7 +435,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14647 0xb8,
14648 __NR_ia32_rt_sigreturn,
14649 0x80cd,
14650- 0,
14651+ 0
14652 };
14653
14654 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14655@@ -458,16 +458,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14656
14657 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14658 restorer = ksig->ka.sa.sa_restorer;
14659+ else if (current->mm->context.vdso)
14660+ /* Return stub is in 32bit vsyscall page */
14661+ restorer = (void __force_user *)(current->mm->context.vdso +
14662+ selected_vdso32->sym___kernel_rt_sigreturn);
14663 else
14664- restorer = current->mm->context.vdso +
14665- selected_vdso32->sym___kernel_rt_sigreturn;
14666+ restorer = frame->retcode;
14667 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14668
14669 /*
14670 * Not actually used anymore, but left because some gdb
14671 * versions need it.
14672 */
14673- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14674+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14675 } put_user_catch(err);
14676
14677 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14678diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14679index 72bf268..127572a 100644
14680--- a/arch/x86/ia32/ia32entry.S
14681+++ b/arch/x86/ia32/ia32entry.S
14682@@ -15,8 +15,10 @@
14683 #include <asm/irqflags.h>
14684 #include <asm/asm.h>
14685 #include <asm/smap.h>
14686+#include <asm/pgtable.h>
14687 #include <linux/linkage.h>
14688 #include <linux/err.h>
14689+#include <asm/alternative-asm.h>
14690
14691 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14692 #include <linux/elf-em.h>
14693@@ -85,6 +87,32 @@ ENTRY(native_irq_enable_sysexit)
14694 ENDPROC(native_irq_enable_sysexit)
14695 #endif
14696
14697+ .macro pax_enter_kernel_user
14698+ pax_set_fptr_mask
14699+#ifdef CONFIG_PAX_MEMORY_UDEREF
14700+ call pax_enter_kernel_user
14701+#endif
14702+ .endm
14703+
14704+ .macro pax_exit_kernel_user
14705+#ifdef CONFIG_PAX_MEMORY_UDEREF
14706+ call pax_exit_kernel_user
14707+#endif
14708+#ifdef CONFIG_PAX_RANDKSTACK
14709+ pushq %rax
14710+ pushq %r11
14711+ call pax_randomize_kstack
14712+ popq %r11
14713+ popq %rax
14714+#endif
14715+ .endm
14716+
14717+ .macro pax_erase_kstack
14718+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14719+ call pax_erase_kstack
14720+#endif
14721+ .endm
14722+
14723 /*
14724 * 32bit SYSENTER instruction entry.
14725 *
14726@@ -119,23 +147,24 @@ ENTRY(ia32_sysenter_target)
14727 * it is too small to ever cause noticeable irq latency.
14728 */
14729 SWAPGS_UNSAFE_STACK
14730- movq PER_CPU_VAR(cpu_tss + TSS_sp0), %rsp
14731- ENABLE_INTERRUPTS(CLBR_NONE)
14732+ movq PER_CPU_VAR(kernel_stack), %rsp
14733
14734 /* Zero-extending 32-bit regs, do not remove */
14735 movl %ebp, %ebp
14736 movl %eax, %eax
14737
14738- movl ASM_THREAD_INFO(TI_sysenter_return, %rsp, 0), %r10d
14739- CFI_REGISTER rip,r10
14740+ GET_THREAD_INFO(%r11)
14741+ movl TI_sysenter_return(%r11), %r11d
14742+ CFI_REGISTER rip,r11
14743
14744 /* Construct struct pt_regs on stack */
14745 pushq_cfi $__USER32_DS /* pt_regs->ss */
14746 pushq_cfi %rbp /* pt_regs->sp */
14747 CFI_REL_OFFSET rsp,0
14748 pushfq_cfi /* pt_regs->flags */
14749+ orl $X86_EFLAGS_IF,(%rsp)
14750 pushq_cfi $__USER32_CS /* pt_regs->cs */
14751- pushq_cfi %r10 /* pt_regs->ip = thread_info->sysenter_return */
14752+ pushq_cfi %r11 /* pt_regs->ip = thread_info->sysenter_return */
14753 CFI_REL_OFFSET rip,0
14754 pushq_cfi_reg rax /* pt_regs->orig_ax */
14755 pushq_cfi_reg rdi /* pt_regs->di */
14756@@ -147,15 +176,37 @@ ENTRY(ia32_sysenter_target)
14757 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14758 CFI_ADJUST_CFA_OFFSET 10*8
14759
14760+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14761+ movq_cfi r12, R12
14762+#endif
14763+
14764+ pax_enter_kernel_user
14765+
14766+#ifdef CONFIG_PAX_RANDKSTACK
14767+ pax_erase_kstack
14768+#endif
14769+
14770+ ENABLE_INTERRUPTS(CLBR_NONE)
14771+
14772 /*
14773 * no need to do an access_ok check here because rbp has been
14774 * 32bit zero extended
14775 */
14776+
14777+#ifdef CONFIG_PAX_MEMORY_UDEREF
14778+ addq pax_user_shadow_base,%rbp
14779+ ASM_PAX_OPEN_USERLAND
14780+#endif
14781+
14782 ASM_STAC
14783 1: movl (%rbp),%ebp
14784 _ASM_EXTABLE(1b,ia32_badarg)
14785 ASM_CLAC
14786
14787+#ifdef CONFIG_PAX_MEMORY_UDEREF
14788+ ASM_PAX_CLOSE_USERLAND
14789+#endif
14790+
14791 /*
14792 * Sysenter doesn't filter flags, so we need to clear NT
14793 * ourselves. To save a few cycles, we can check whether
14794@@ -165,8 +216,9 @@ ENTRY(ia32_sysenter_target)
14795 jnz sysenter_fix_flags
14796 sysenter_flags_fixed:
14797
14798- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14799- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14800+ GET_THREAD_INFO(%r11)
14801+ orl $TS_COMPAT,TI_status(%r11)
14802+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14803 CFI_REMEMBER_STATE
14804 jnz sysenter_tracesys
14805 cmpq $(IA32_NR_syscalls-1),%rax
14806@@ -181,9 +233,10 @@ sysenter_do_call:
14807 sysenter_dispatch:
14808 call *ia32_sys_call_table(,%rax,8)
14809 movq %rax,RAX(%rsp)
14810+ GET_THREAD_INFO(%r11)
14811 DISABLE_INTERRUPTS(CLBR_NONE)
14812 TRACE_IRQS_OFF
14813- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14814+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14815 jnz sysexit_audit
14816 sysexit_from_sys_call:
14817 /*
14818@@ -196,7 +249,9 @@ sysexit_from_sys_call:
14819 * This code path is still called 'sysexit' because it pairs
14820 * with 'sysenter' and it uses the SYSENTER calling convention.
14821 */
14822- andl $~TS_COMPAT,ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14823+ pax_exit_kernel_user
14824+ pax_erase_kstack
14825+ andl $~TS_COMPAT,TI_status(%r11)
14826 movl RIP(%rsp),%ecx /* User %eip */
14827 CFI_REGISTER rip,rcx
14828 RESTORE_RSI_RDI
14829@@ -247,6 +302,9 @@ sysexit_from_sys_call:
14830 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14831 movl %eax,%edi /* 1st arg: syscall number */
14832 call __audit_syscall_entry
14833+
14834+ pax_erase_kstack
14835+
14836 movl RAX(%rsp),%eax /* reload syscall number */
14837 cmpq $(IA32_NR_syscalls-1),%rax
14838 ja ia32_badsys
14839@@ -258,7 +316,7 @@ sysexit_from_sys_call:
14840 .endm
14841
14842 .macro auditsys_exit exit
14843- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14844+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14845 jnz ia32_ret_from_sys_call
14846 TRACE_IRQS_ON
14847 ENABLE_INTERRUPTS(CLBR_NONE)
14848@@ -269,11 +327,12 @@ sysexit_from_sys_call:
14849 1: setbe %al /* 1 if error, 0 if not */
14850 movzbl %al,%edi /* zero-extend that into %edi */
14851 call __audit_syscall_exit
14852+ GET_THREAD_INFO(%r11)
14853 movq RAX(%rsp),%rax /* reload syscall return value */
14854 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14855 DISABLE_INTERRUPTS(CLBR_NONE)
14856 TRACE_IRQS_OFF
14857- testl %edi, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14858+ testl %edi,TI_flags(%r11)
14859 jz \exit
14860 CLEAR_RREGS
14861 jmp int_with_check
14862@@ -295,7 +354,7 @@ sysenter_fix_flags:
14863
14864 sysenter_tracesys:
14865 #ifdef CONFIG_AUDITSYSCALL
14866- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14867+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14868 jz sysenter_auditsys
14869 #endif
14870 SAVE_EXTRA_REGS
14871@@ -307,6 +366,9 @@ sysenter_tracesys:
14872 RESTORE_EXTRA_REGS
14873 cmpq $(IA32_NR_syscalls-1),%rax
14874 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14875+
14876+ pax_erase_kstack
14877+
14878 jmp sysenter_do_call
14879 CFI_ENDPROC
14880 ENDPROC(ia32_sysenter_target)
14881@@ -357,7 +419,6 @@ ENTRY(ia32_cstar_target)
14882 movl %esp,%r8d
14883 CFI_REGISTER rsp,r8
14884 movq PER_CPU_VAR(kernel_stack),%rsp
14885- ENABLE_INTERRUPTS(CLBR_NONE)
14886
14887 /* Zero-extending 32-bit regs, do not remove */
14888 movl %eax,%eax
14889@@ -380,16 +441,41 @@ ENTRY(ia32_cstar_target)
14890 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14891 CFI_ADJUST_CFA_OFFSET 10*8
14892
14893+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14894+ movq_cfi r12, R12
14895+#endif
14896+
14897+ pax_enter_kernel_user
14898+
14899+#ifdef CONFIG_PAX_RANDKSTACK
14900+ pax_erase_kstack
14901+#endif
14902+
14903+ ENABLE_INTERRUPTS(CLBR_NONE)
14904+
14905 /*
14906 * no need to do an access_ok check here because r8 has been
14907 * 32bit zero extended
14908 */
14909+
14910+#ifdef CONFIG_PAX_MEMORY_UDEREF
14911+ ASM_PAX_OPEN_USERLAND
14912+ movq pax_user_shadow_base,%r8
14913+ addq RSP(%rsp),%r8
14914+#endif
14915+
14916 ASM_STAC
14917 1: movl (%r8),%r9d
14918 _ASM_EXTABLE(1b,ia32_badarg)
14919 ASM_CLAC
14920- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14921- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14922+
14923+#ifdef CONFIG_PAX_MEMORY_UDEREF
14924+ ASM_PAX_CLOSE_USERLAND
14925+#endif
14926+
14927+ GET_THREAD_INFO(%r11)
14928+ orl $TS_COMPAT,TI_status(%r11)
14929+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14930 CFI_REMEMBER_STATE
14931 jnz cstar_tracesys
14932 cmpq $IA32_NR_syscalls-1,%rax
14933@@ -404,12 +490,15 @@ cstar_do_call:
14934 cstar_dispatch:
14935 call *ia32_sys_call_table(,%rax,8)
14936 movq %rax,RAX(%rsp)
14937+ GET_THREAD_INFO(%r11)
14938 DISABLE_INTERRUPTS(CLBR_NONE)
14939 TRACE_IRQS_OFF
14940- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14941+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14942 jnz sysretl_audit
14943 sysretl_from_sys_call:
14944- andl $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14945+ pax_exit_kernel_user
14946+ pax_erase_kstack
14947+ andl $~TS_COMPAT,TI_status(%r11)
14948 RESTORE_RSI_RDI_RDX
14949 movl RIP(%rsp),%ecx
14950 CFI_REGISTER rip,rcx
14951@@ -451,7 +540,7 @@ sysretl_audit:
14952
14953 cstar_tracesys:
14954 #ifdef CONFIG_AUDITSYSCALL
14955- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14956+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14957 jz cstar_auditsys
14958 #endif
14959 xchgl %r9d,%ebp
14960@@ -465,11 +554,19 @@ cstar_tracesys:
14961 xchgl %ebp,%r9d
14962 cmpq $(IA32_NR_syscalls-1),%rax
14963 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14964+
14965+ pax_erase_kstack
14966+
14967 jmp cstar_do_call
14968 END(ia32_cstar_target)
14969
14970 ia32_badarg:
14971 ASM_CLAC
14972+
14973+#ifdef CONFIG_PAX_MEMORY_UDEREF
14974+ ASM_PAX_CLOSE_USERLAND
14975+#endif
14976+
14977 movq $-EFAULT,%rax
14978 jmp ia32_sysret
14979 CFI_ENDPROC
14980@@ -505,14 +602,8 @@ ENTRY(ia32_syscall)
14981 /*CFI_REL_OFFSET cs,1*8 */
14982 CFI_REL_OFFSET rip,0*8
14983
14984- /*
14985- * Interrupts are off on entry.
14986- * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
14987- * it is too small to ever cause noticeable irq latency.
14988- */
14989 PARAVIRT_ADJUST_EXCEPTION_FRAME
14990 SWAPGS
14991- ENABLE_INTERRUPTS(CLBR_NONE)
14992
14993 /* Zero-extending 32-bit regs, do not remove */
14994 movl %eax,%eax
14995@@ -528,8 +619,26 @@ ENTRY(ia32_syscall)
14996 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14997 CFI_ADJUST_CFA_OFFSET 10*8
14998
14999- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
15000- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15001+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15002+ movq_cfi r12, R12
15003+#endif
15004+
15005+ pax_enter_kernel_user
15006+
15007+#ifdef CONFIG_PAX_RANDKSTACK
15008+ pax_erase_kstack
15009+#endif
15010+
15011+ /*
15012+ * Interrupts are off on entry.
15013+ * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
15014+ * it is too small to ever cause noticeable irq latency.
15015+ */
15016+ ENABLE_INTERRUPTS(CLBR_NONE)
15017+
15018+ GET_THREAD_INFO(%r11)
15019+ orl $TS_COMPAT,TI_status(%r11)
15020+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15021 jnz ia32_tracesys
15022 cmpq $(IA32_NR_syscalls-1),%rax
15023 ja ia32_badsys
15024@@ -557,6 +666,9 @@ ia32_tracesys:
15025 RESTORE_EXTRA_REGS
15026 cmpq $(IA32_NR_syscalls-1),%rax
15027 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15028+
15029+ pax_erase_kstack
15030+
15031 jmp ia32_do_call
15032 END(ia32_syscall)
15033
15034diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15035index 719cd70..69d576b 100644
15036--- a/arch/x86/ia32/sys_ia32.c
15037+++ b/arch/x86/ia32/sys_ia32.c
15038@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15039 */
15040 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15041 {
15042- typeof(ubuf->st_uid) uid = 0;
15043- typeof(ubuf->st_gid) gid = 0;
15044+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15045+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15046 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15047 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15048 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15049diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15050index bdf02ee..51a4656 100644
15051--- a/arch/x86/include/asm/alternative-asm.h
15052+++ b/arch/x86/include/asm/alternative-asm.h
15053@@ -18,6 +18,45 @@
15054 .endm
15055 #endif
15056
15057+#ifdef KERNEXEC_PLUGIN
15058+ .macro pax_force_retaddr_bts rip=0
15059+ btsq $63,\rip(%rsp)
15060+ .endm
15061+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15062+ .macro pax_force_retaddr rip=0, reload=0
15063+ btsq $63,\rip(%rsp)
15064+ .endm
15065+ .macro pax_force_fptr ptr
15066+ btsq $63,\ptr
15067+ .endm
15068+ .macro pax_set_fptr_mask
15069+ .endm
15070+#endif
15071+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15072+ .macro pax_force_retaddr rip=0, reload=0
15073+ .if \reload
15074+ pax_set_fptr_mask
15075+ .endif
15076+ orq %r12,\rip(%rsp)
15077+ .endm
15078+ .macro pax_force_fptr ptr
15079+ orq %r12,\ptr
15080+ .endm
15081+ .macro pax_set_fptr_mask
15082+ movabs $0x8000000000000000,%r12
15083+ .endm
15084+#endif
15085+#else
15086+ .macro pax_force_retaddr rip=0, reload=0
15087+ .endm
15088+ .macro pax_force_fptr ptr
15089+ .endm
15090+ .macro pax_force_retaddr_bts rip=0
15091+ .endm
15092+ .macro pax_set_fptr_mask
15093+ .endm
15094+#endif
15095+
15096 .macro altinstruction_entry orig alt feature orig_len alt_len pad_len
15097 .long \orig - .
15098 .long \alt - .
15099@@ -38,7 +77,7 @@
15100 altinstruction_entry 140b,143f,\feature,142b-140b,144f-143f,142b-141b
15101 .popsection
15102
15103- .pushsection .altinstr_replacement,"ax"
15104+ .pushsection .altinstr_replacement,"a"
15105 143:
15106 \newinstr
15107 144:
15108@@ -68,7 +107,7 @@
15109 altinstruction_entry 140b,144f,\feature2,142b-140b,145f-144f,142b-141b
15110 .popsection
15111
15112- .pushsection .altinstr_replacement,"ax"
15113+ .pushsection .altinstr_replacement,"a"
15114 143:
15115 \newinstr1
15116 144:
15117diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15118index ba32af0..ff42fc0 100644
15119--- a/arch/x86/include/asm/alternative.h
15120+++ b/arch/x86/include/asm/alternative.h
15121@@ -130,7 +130,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15122 ".pushsection .altinstructions,\"a\"\n" \
15123 ALTINSTR_ENTRY(feature, 1) \
15124 ".popsection\n" \
15125- ".pushsection .altinstr_replacement, \"ax\"\n" \
15126+ ".pushsection .altinstr_replacement, \"a\"\n" \
15127 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15128 ".popsection"
15129
15130@@ -140,7 +140,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15131 ALTINSTR_ENTRY(feature1, 1) \
15132 ALTINSTR_ENTRY(feature2, 2) \
15133 ".popsection\n" \
15134- ".pushsection .altinstr_replacement, \"ax\"\n" \
15135+ ".pushsection .altinstr_replacement, \"a\"\n" \
15136 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15137 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15138 ".popsection"
15139diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15140index 976b86a..f3bc83a 100644
15141--- a/arch/x86/include/asm/apic.h
15142+++ b/arch/x86/include/asm/apic.h
15143@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15144
15145 #ifdef CONFIG_X86_LOCAL_APIC
15146
15147-extern unsigned int apic_verbosity;
15148+extern int apic_verbosity;
15149 extern int local_apic_timer_c2_ok;
15150
15151 extern int disable_apic;
15152diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15153index 20370c6..a2eb9b0 100644
15154--- a/arch/x86/include/asm/apm.h
15155+++ b/arch/x86/include/asm/apm.h
15156@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15157 __asm__ __volatile__(APM_DO_ZERO_SEGS
15158 "pushl %%edi\n\t"
15159 "pushl %%ebp\n\t"
15160- "lcall *%%cs:apm_bios_entry\n\t"
15161+ "lcall *%%ss:apm_bios_entry\n\t"
15162 "setc %%al\n\t"
15163 "popl %%ebp\n\t"
15164 "popl %%edi\n\t"
15165@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15166 __asm__ __volatile__(APM_DO_ZERO_SEGS
15167 "pushl %%edi\n\t"
15168 "pushl %%ebp\n\t"
15169- "lcall *%%cs:apm_bios_entry\n\t"
15170+ "lcall *%%ss:apm_bios_entry\n\t"
15171 "setc %%bl\n\t"
15172 "popl %%ebp\n\t"
15173 "popl %%edi\n\t"
15174diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15175index 5e5cd12..51cdc93 100644
15176--- a/arch/x86/include/asm/atomic.h
15177+++ b/arch/x86/include/asm/atomic.h
15178@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15179 }
15180
15181 /**
15182+ * atomic_read_unchecked - read atomic variable
15183+ * @v: pointer of type atomic_unchecked_t
15184+ *
15185+ * Atomically reads the value of @v.
15186+ */
15187+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15188+{
15189+ return ACCESS_ONCE((v)->counter);
15190+}
15191+
15192+/**
15193 * atomic_set - set atomic variable
15194 * @v: pointer of type atomic_t
15195 * @i: required value
15196@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15197 }
15198
15199 /**
15200+ * atomic_set_unchecked - set atomic variable
15201+ * @v: pointer of type atomic_unchecked_t
15202+ * @i: required value
15203+ *
15204+ * Atomically sets the value of @v to @i.
15205+ */
15206+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15207+{
15208+ v->counter = i;
15209+}
15210+
15211+/**
15212 * atomic_add - add integer to atomic variable
15213 * @i: integer value to add
15214 * @v: pointer of type atomic_t
15215@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15216 */
15217 static inline void atomic_add(int i, atomic_t *v)
15218 {
15219- asm volatile(LOCK_PREFIX "addl %1,%0"
15220+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15221+
15222+#ifdef CONFIG_PAX_REFCOUNT
15223+ "jno 0f\n"
15224+ LOCK_PREFIX "subl %1,%0\n"
15225+ "int $4\n0:\n"
15226+ _ASM_EXTABLE(0b, 0b)
15227+#endif
15228+
15229+ : "+m" (v->counter)
15230+ : "ir" (i));
15231+}
15232+
15233+/**
15234+ * atomic_add_unchecked - add integer to atomic variable
15235+ * @i: integer value to add
15236+ * @v: pointer of type atomic_unchecked_t
15237+ *
15238+ * Atomically adds @i to @v.
15239+ */
15240+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15241+{
15242+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15243 : "+m" (v->counter)
15244 : "ir" (i));
15245 }
15246@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15247 */
15248 static inline void atomic_sub(int i, atomic_t *v)
15249 {
15250- asm volatile(LOCK_PREFIX "subl %1,%0"
15251+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15252+
15253+#ifdef CONFIG_PAX_REFCOUNT
15254+ "jno 0f\n"
15255+ LOCK_PREFIX "addl %1,%0\n"
15256+ "int $4\n0:\n"
15257+ _ASM_EXTABLE(0b, 0b)
15258+#endif
15259+
15260+ : "+m" (v->counter)
15261+ : "ir" (i));
15262+}
15263+
15264+/**
15265+ * atomic_sub_unchecked - subtract integer from atomic variable
15266+ * @i: integer value to subtract
15267+ * @v: pointer of type atomic_unchecked_t
15268+ *
15269+ * Atomically subtracts @i from @v.
15270+ */
15271+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15272+{
15273+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15274 : "+m" (v->counter)
15275 : "ir" (i));
15276 }
15277@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15278 */
15279 static inline int atomic_sub_and_test(int i, atomic_t *v)
15280 {
15281- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15282+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15283 }
15284
15285 /**
15286@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15287 */
15288 static inline void atomic_inc(atomic_t *v)
15289 {
15290- asm volatile(LOCK_PREFIX "incl %0"
15291+ asm volatile(LOCK_PREFIX "incl %0\n"
15292+
15293+#ifdef CONFIG_PAX_REFCOUNT
15294+ "jno 0f\n"
15295+ LOCK_PREFIX "decl %0\n"
15296+ "int $4\n0:\n"
15297+ _ASM_EXTABLE(0b, 0b)
15298+#endif
15299+
15300+ : "+m" (v->counter));
15301+}
15302+
15303+/**
15304+ * atomic_inc_unchecked - increment atomic variable
15305+ * @v: pointer of type atomic_unchecked_t
15306+ *
15307+ * Atomically increments @v by 1.
15308+ */
15309+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15310+{
15311+ asm volatile(LOCK_PREFIX "incl %0\n"
15312 : "+m" (v->counter));
15313 }
15314
15315@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15316 */
15317 static inline void atomic_dec(atomic_t *v)
15318 {
15319- asm volatile(LOCK_PREFIX "decl %0"
15320+ asm volatile(LOCK_PREFIX "decl %0\n"
15321+
15322+#ifdef CONFIG_PAX_REFCOUNT
15323+ "jno 0f\n"
15324+ LOCK_PREFIX "incl %0\n"
15325+ "int $4\n0:\n"
15326+ _ASM_EXTABLE(0b, 0b)
15327+#endif
15328+
15329+ : "+m" (v->counter));
15330+}
15331+
15332+/**
15333+ * atomic_dec_unchecked - decrement atomic variable
15334+ * @v: pointer of type atomic_unchecked_t
15335+ *
15336+ * Atomically decrements @v by 1.
15337+ */
15338+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15339+{
15340+ asm volatile(LOCK_PREFIX "decl %0\n"
15341 : "+m" (v->counter));
15342 }
15343
15344@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15345 */
15346 static inline int atomic_dec_and_test(atomic_t *v)
15347 {
15348- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15349+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15350 }
15351
15352 /**
15353@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15354 */
15355 static inline int atomic_inc_and_test(atomic_t *v)
15356 {
15357- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15358+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15359+}
15360+
15361+/**
15362+ * atomic_inc_and_test_unchecked - increment and test
15363+ * @v: pointer of type atomic_unchecked_t
15364+ *
15365+ * Atomically increments @v by 1
15366+ * and returns true if the result is zero, or false for all
15367+ * other cases.
15368+ */
15369+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15370+{
15371+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15372 }
15373
15374 /**
15375@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15376 */
15377 static inline int atomic_add_negative(int i, atomic_t *v)
15378 {
15379- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15380+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15381 }
15382
15383 /**
15384@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15385 *
15386 * Atomically adds @i to @v and returns @i + @v
15387 */
15388-static inline int atomic_add_return(int i, atomic_t *v)
15389+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15390+{
15391+ return i + xadd_check_overflow(&v->counter, i);
15392+}
15393+
15394+/**
15395+ * atomic_add_return_unchecked - add integer and return
15396+ * @i: integer value to add
15397+ * @v: pointer of type atomic_unchecked_t
15398+ *
15399+ * Atomically adds @i to @v and returns @i + @v
15400+ */
15401+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15402 {
15403 return i + xadd(&v->counter, i);
15404 }
15405@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15406 *
15407 * Atomically subtracts @i from @v and returns @v - @i
15408 */
15409-static inline int atomic_sub_return(int i, atomic_t *v)
15410+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15411 {
15412 return atomic_add_return(-i, v);
15413 }
15414
15415 #define atomic_inc_return(v) (atomic_add_return(1, v))
15416+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15417+{
15418+ return atomic_add_return_unchecked(1, v);
15419+}
15420 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15421
15422-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15423+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15424+{
15425+ return cmpxchg(&v->counter, old, new);
15426+}
15427+
15428+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15429 {
15430 return cmpxchg(&v->counter, old, new);
15431 }
15432@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15433 return xchg(&v->counter, new);
15434 }
15435
15436+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15437+{
15438+ return xchg(&v->counter, new);
15439+}
15440+
15441 /**
15442 * __atomic_add_unless - add unless the number is already a given value
15443 * @v: pointer of type atomic_t
15444@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15445 */
15446 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15447 {
15448- int c, old;
15449+ int c, old, new;
15450 c = atomic_read(v);
15451 for (;;) {
15452- if (unlikely(c == (u)))
15453+ if (unlikely(c == u))
15454 break;
15455- old = atomic_cmpxchg((v), c, c + (a));
15456+
15457+ asm volatile("addl %2,%0\n"
15458+
15459+#ifdef CONFIG_PAX_REFCOUNT
15460+ "jno 0f\n"
15461+ "subl %2,%0\n"
15462+ "int $4\n0:\n"
15463+ _ASM_EXTABLE(0b, 0b)
15464+#endif
15465+
15466+ : "=r" (new)
15467+ : "0" (c), "ir" (a));
15468+
15469+ old = atomic_cmpxchg(v, c, new);
15470 if (likely(old == c))
15471 break;
15472 c = old;
15473@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15474 }
15475
15476 /**
15477+ * atomic_inc_not_zero_hint - increment if not null
15478+ * @v: pointer of type atomic_t
15479+ * @hint: probable value of the atomic before the increment
15480+ *
15481+ * This version of atomic_inc_not_zero() gives a hint of probable
15482+ * value of the atomic. This helps processor to not read the memory
15483+ * before doing the atomic read/modify/write cycle, lowering
15484+ * number of bus transactions on some arches.
15485+ *
15486+ * Returns: 0 if increment was not done, 1 otherwise.
15487+ */
15488+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15489+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15490+{
15491+ int val, c = hint, new;
15492+
15493+ /* sanity test, should be removed by compiler if hint is a constant */
15494+ if (!hint)
15495+ return __atomic_add_unless(v, 1, 0);
15496+
15497+ do {
15498+ asm volatile("incl %0\n"
15499+
15500+#ifdef CONFIG_PAX_REFCOUNT
15501+ "jno 0f\n"
15502+ "decl %0\n"
15503+ "int $4\n0:\n"
15504+ _ASM_EXTABLE(0b, 0b)
15505+#endif
15506+
15507+ : "=r" (new)
15508+ : "0" (c));
15509+
15510+ val = atomic_cmpxchg(v, c, new);
15511+ if (val == c)
15512+ return 1;
15513+ c = val;
15514+ } while (c);
15515+
15516+ return 0;
15517+}
15518+
15519+/**
15520 * atomic_inc_short - increment of a short integer
15521 * @v: pointer to type int
15522 *
15523@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15524 }
15525
15526 /* These are x86-specific, used by some header files */
15527-#define atomic_clear_mask(mask, addr) \
15528- asm volatile(LOCK_PREFIX "andl %0,%1" \
15529- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15530+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15531+{
15532+ asm volatile(LOCK_PREFIX "andl %1,%0"
15533+ : "+m" (v->counter)
15534+ : "r" (~(mask))
15535+ : "memory");
15536+}
15537
15538-#define atomic_set_mask(mask, addr) \
15539- asm volatile(LOCK_PREFIX "orl %0,%1" \
15540- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15541- : "memory")
15542+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15543+{
15544+ asm volatile(LOCK_PREFIX "andl %1,%0"
15545+ : "+m" (v->counter)
15546+ : "r" (~(mask))
15547+ : "memory");
15548+}
15549+
15550+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15551+{
15552+ asm volatile(LOCK_PREFIX "orl %1,%0"
15553+ : "+m" (v->counter)
15554+ : "r" (mask)
15555+ : "memory");
15556+}
15557+
15558+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15559+{
15560+ asm volatile(LOCK_PREFIX "orl %1,%0"
15561+ : "+m" (v->counter)
15562+ : "r" (mask)
15563+ : "memory");
15564+}
15565
15566 #ifdef CONFIG_X86_32
15567 # include <asm/atomic64_32.h>
15568diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15569index b154de7..bf18a5a 100644
15570--- a/arch/x86/include/asm/atomic64_32.h
15571+++ b/arch/x86/include/asm/atomic64_32.h
15572@@ -12,6 +12,14 @@ typedef struct {
15573 u64 __aligned(8) counter;
15574 } atomic64_t;
15575
15576+#ifdef CONFIG_PAX_REFCOUNT
15577+typedef struct {
15578+ u64 __aligned(8) counter;
15579+} atomic64_unchecked_t;
15580+#else
15581+typedef atomic64_t atomic64_unchecked_t;
15582+#endif
15583+
15584 #define ATOMIC64_INIT(val) { (val) }
15585
15586 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15587@@ -37,21 +45,31 @@ typedef struct {
15588 ATOMIC64_DECL_ONE(sym##_386)
15589
15590 ATOMIC64_DECL_ONE(add_386);
15591+ATOMIC64_DECL_ONE(add_unchecked_386);
15592 ATOMIC64_DECL_ONE(sub_386);
15593+ATOMIC64_DECL_ONE(sub_unchecked_386);
15594 ATOMIC64_DECL_ONE(inc_386);
15595+ATOMIC64_DECL_ONE(inc_unchecked_386);
15596 ATOMIC64_DECL_ONE(dec_386);
15597+ATOMIC64_DECL_ONE(dec_unchecked_386);
15598 #endif
15599
15600 #define alternative_atomic64(f, out, in...) \
15601 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15602
15603 ATOMIC64_DECL(read);
15604+ATOMIC64_DECL(read_unchecked);
15605 ATOMIC64_DECL(set);
15606+ATOMIC64_DECL(set_unchecked);
15607 ATOMIC64_DECL(xchg);
15608 ATOMIC64_DECL(add_return);
15609+ATOMIC64_DECL(add_return_unchecked);
15610 ATOMIC64_DECL(sub_return);
15611+ATOMIC64_DECL(sub_return_unchecked);
15612 ATOMIC64_DECL(inc_return);
15613+ATOMIC64_DECL(inc_return_unchecked);
15614 ATOMIC64_DECL(dec_return);
15615+ATOMIC64_DECL(dec_return_unchecked);
15616 ATOMIC64_DECL(dec_if_positive);
15617 ATOMIC64_DECL(inc_not_zero);
15618 ATOMIC64_DECL(add_unless);
15619@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15620 }
15621
15622 /**
15623+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15624+ * @p: pointer to type atomic64_unchecked_t
15625+ * @o: expected value
15626+ * @n: new value
15627+ *
15628+ * Atomically sets @v to @n if it was equal to @o and returns
15629+ * the old value.
15630+ */
15631+
15632+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15633+{
15634+ return cmpxchg64(&v->counter, o, n);
15635+}
15636+
15637+/**
15638 * atomic64_xchg - xchg atomic64 variable
15639 * @v: pointer to type atomic64_t
15640 * @n: value to assign
15641@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15642 }
15643
15644 /**
15645+ * atomic64_set_unchecked - set atomic64 variable
15646+ * @v: pointer to type atomic64_unchecked_t
15647+ * @n: value to assign
15648+ *
15649+ * Atomically sets the value of @v to @n.
15650+ */
15651+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15652+{
15653+ unsigned high = (unsigned)(i >> 32);
15654+ unsigned low = (unsigned)i;
15655+ alternative_atomic64(set, /* no output */,
15656+ "S" (v), "b" (low), "c" (high)
15657+ : "eax", "edx", "memory");
15658+}
15659+
15660+/**
15661 * atomic64_read - read atomic64 variable
15662 * @v: pointer to type atomic64_t
15663 *
15664@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15665 }
15666
15667 /**
15668+ * atomic64_read_unchecked - read atomic64 variable
15669+ * @v: pointer to type atomic64_unchecked_t
15670+ *
15671+ * Atomically reads the value of @v and returns it.
15672+ */
15673+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15674+{
15675+ long long r;
15676+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15677+ return r;
15678+ }
15679+
15680+/**
15681 * atomic64_add_return - add and return
15682 * @i: integer value to add
15683 * @v: pointer to type atomic64_t
15684@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15685 return i;
15686 }
15687
15688+/**
15689+ * atomic64_add_return_unchecked - add and return
15690+ * @i: integer value to add
15691+ * @v: pointer to type atomic64_unchecked_t
15692+ *
15693+ * Atomically adds @i to @v and returns @i + *@v
15694+ */
15695+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15696+{
15697+ alternative_atomic64(add_return_unchecked,
15698+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15699+ ASM_NO_INPUT_CLOBBER("memory"));
15700+ return i;
15701+}
15702+
15703 /*
15704 * Other variants with different arithmetic operators:
15705 */
15706@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15707 return a;
15708 }
15709
15710+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15711+{
15712+ long long a;
15713+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15714+ "S" (v) : "memory", "ecx");
15715+ return a;
15716+}
15717+
15718 static inline long long atomic64_dec_return(atomic64_t *v)
15719 {
15720 long long a;
15721@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15722 }
15723
15724 /**
15725+ * atomic64_add_unchecked - add integer to atomic64 variable
15726+ * @i: integer value to add
15727+ * @v: pointer to type atomic64_unchecked_t
15728+ *
15729+ * Atomically adds @i to @v.
15730+ */
15731+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15732+{
15733+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15734+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15735+ ASM_NO_INPUT_CLOBBER("memory"));
15736+ return i;
15737+}
15738+
15739+/**
15740 * atomic64_sub - subtract the atomic64 variable
15741 * @i: integer value to subtract
15742 * @v: pointer to type atomic64_t
15743diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15744index f8d273e..02f39f3 100644
15745--- a/arch/x86/include/asm/atomic64_64.h
15746+++ b/arch/x86/include/asm/atomic64_64.h
15747@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15748 }
15749
15750 /**
15751+ * atomic64_read_unchecked - read atomic64 variable
15752+ * @v: pointer of type atomic64_unchecked_t
15753+ *
15754+ * Atomically reads the value of @v.
15755+ * Doesn't imply a read memory barrier.
15756+ */
15757+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15758+{
15759+ return ACCESS_ONCE((v)->counter);
15760+}
15761+
15762+/**
15763 * atomic64_set - set atomic64 variable
15764 * @v: pointer to type atomic64_t
15765 * @i: required value
15766@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15767 }
15768
15769 /**
15770+ * atomic64_set_unchecked - set atomic64 variable
15771+ * @v: pointer to type atomic64_unchecked_t
15772+ * @i: required value
15773+ *
15774+ * Atomically sets the value of @v to @i.
15775+ */
15776+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15777+{
15778+ v->counter = i;
15779+}
15780+
15781+/**
15782 * atomic64_add - add integer to atomic64 variable
15783 * @i: integer value to add
15784 * @v: pointer to type atomic64_t
15785@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15786 */
15787 static inline void atomic64_add(long i, atomic64_t *v)
15788 {
15789+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15790+
15791+#ifdef CONFIG_PAX_REFCOUNT
15792+ "jno 0f\n"
15793+ LOCK_PREFIX "subq %1,%0\n"
15794+ "int $4\n0:\n"
15795+ _ASM_EXTABLE(0b, 0b)
15796+#endif
15797+
15798+ : "=m" (v->counter)
15799+ : "er" (i), "m" (v->counter));
15800+}
15801+
15802+/**
15803+ * atomic64_add_unchecked - add integer to atomic64 variable
15804+ * @i: integer value to add
15805+ * @v: pointer to type atomic64_unchecked_t
15806+ *
15807+ * Atomically adds @i to @v.
15808+ */
15809+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15810+{
15811 asm volatile(LOCK_PREFIX "addq %1,%0"
15812 : "=m" (v->counter)
15813 : "er" (i), "m" (v->counter));
15814@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15815 */
15816 static inline void atomic64_sub(long i, atomic64_t *v)
15817 {
15818- asm volatile(LOCK_PREFIX "subq %1,%0"
15819+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15820+
15821+#ifdef CONFIG_PAX_REFCOUNT
15822+ "jno 0f\n"
15823+ LOCK_PREFIX "addq %1,%0\n"
15824+ "int $4\n0:\n"
15825+ _ASM_EXTABLE(0b, 0b)
15826+#endif
15827+
15828+ : "=m" (v->counter)
15829+ : "er" (i), "m" (v->counter));
15830+}
15831+
15832+/**
15833+ * atomic64_sub_unchecked - subtract the atomic64 variable
15834+ * @i: integer value to subtract
15835+ * @v: pointer to type atomic64_unchecked_t
15836+ *
15837+ * Atomically subtracts @i from @v.
15838+ */
15839+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15840+{
15841+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15842 : "=m" (v->counter)
15843 : "er" (i), "m" (v->counter));
15844 }
15845@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15846 */
15847 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15848 {
15849- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15850+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15851 }
15852
15853 /**
15854@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15855 */
15856 static inline void atomic64_inc(atomic64_t *v)
15857 {
15858+ asm volatile(LOCK_PREFIX "incq %0\n"
15859+
15860+#ifdef CONFIG_PAX_REFCOUNT
15861+ "jno 0f\n"
15862+ LOCK_PREFIX "decq %0\n"
15863+ "int $4\n0:\n"
15864+ _ASM_EXTABLE(0b, 0b)
15865+#endif
15866+
15867+ : "=m" (v->counter)
15868+ : "m" (v->counter));
15869+}
15870+
15871+/**
15872+ * atomic64_inc_unchecked - increment atomic64 variable
15873+ * @v: pointer to type atomic64_unchecked_t
15874+ *
15875+ * Atomically increments @v by 1.
15876+ */
15877+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15878+{
15879 asm volatile(LOCK_PREFIX "incq %0"
15880 : "=m" (v->counter)
15881 : "m" (v->counter));
15882@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15883 */
15884 static inline void atomic64_dec(atomic64_t *v)
15885 {
15886- asm volatile(LOCK_PREFIX "decq %0"
15887+ asm volatile(LOCK_PREFIX "decq %0\n"
15888+
15889+#ifdef CONFIG_PAX_REFCOUNT
15890+ "jno 0f\n"
15891+ LOCK_PREFIX "incq %0\n"
15892+ "int $4\n0:\n"
15893+ _ASM_EXTABLE(0b, 0b)
15894+#endif
15895+
15896+ : "=m" (v->counter)
15897+ : "m" (v->counter));
15898+}
15899+
15900+/**
15901+ * atomic64_dec_unchecked - decrement atomic64 variable
15902+ * @v: pointer to type atomic64_t
15903+ *
15904+ * Atomically decrements @v by 1.
15905+ */
15906+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15907+{
15908+ asm volatile(LOCK_PREFIX "decq %0\n"
15909 : "=m" (v->counter)
15910 : "m" (v->counter));
15911 }
15912@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15913 */
15914 static inline int atomic64_dec_and_test(atomic64_t *v)
15915 {
15916- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15917+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15918 }
15919
15920 /**
15921@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15922 */
15923 static inline int atomic64_inc_and_test(atomic64_t *v)
15924 {
15925- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15926+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15927 }
15928
15929 /**
15930@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15931 */
15932 static inline int atomic64_add_negative(long i, atomic64_t *v)
15933 {
15934- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15935+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15936 }
15937
15938 /**
15939@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15940 */
15941 static inline long atomic64_add_return(long i, atomic64_t *v)
15942 {
15943+ return i + xadd_check_overflow(&v->counter, i);
15944+}
15945+
15946+/**
15947+ * atomic64_add_return_unchecked - add and return
15948+ * @i: integer value to add
15949+ * @v: pointer to type atomic64_unchecked_t
15950+ *
15951+ * Atomically adds @i to @v and returns @i + @v
15952+ */
15953+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15954+{
15955 return i + xadd(&v->counter, i);
15956 }
15957
15958@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15959 }
15960
15961 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15962+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15963+{
15964+ return atomic64_add_return_unchecked(1, v);
15965+}
15966 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15967
15968 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15969@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15970 return cmpxchg(&v->counter, old, new);
15971 }
15972
15973+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15974+{
15975+ return cmpxchg(&v->counter, old, new);
15976+}
15977+
15978 static inline long atomic64_xchg(atomic64_t *v, long new)
15979 {
15980 return xchg(&v->counter, new);
15981@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15982 */
15983 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15984 {
15985- long c, old;
15986+ long c, old, new;
15987 c = atomic64_read(v);
15988 for (;;) {
15989- if (unlikely(c == (u)))
15990+ if (unlikely(c == u))
15991 break;
15992- old = atomic64_cmpxchg((v), c, c + (a));
15993+
15994+ asm volatile("add %2,%0\n"
15995+
15996+#ifdef CONFIG_PAX_REFCOUNT
15997+ "jno 0f\n"
15998+ "sub %2,%0\n"
15999+ "int $4\n0:\n"
16000+ _ASM_EXTABLE(0b, 0b)
16001+#endif
16002+
16003+ : "=r" (new)
16004+ : "0" (c), "ir" (a));
16005+
16006+ old = atomic64_cmpxchg(v, c, new);
16007 if (likely(old == c))
16008 break;
16009 c = old;
16010 }
16011- return c != (u);
16012+ return c != u;
16013 }
16014
16015 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16016diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16017index 959e45b..6ea9bf6 100644
16018--- a/arch/x86/include/asm/barrier.h
16019+++ b/arch/x86/include/asm/barrier.h
16020@@ -57,7 +57,7 @@
16021 do { \
16022 compiletime_assert_atomic_type(*p); \
16023 smp_mb(); \
16024- ACCESS_ONCE(*p) = (v); \
16025+ ACCESS_ONCE_RW(*p) = (v); \
16026 } while (0)
16027
16028 #define smp_load_acquire(p) \
16029@@ -74,7 +74,7 @@ do { \
16030 do { \
16031 compiletime_assert_atomic_type(*p); \
16032 barrier(); \
16033- ACCESS_ONCE(*p) = (v); \
16034+ ACCESS_ONCE_RW(*p) = (v); \
16035 } while (0)
16036
16037 #define smp_load_acquire(p) \
16038diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16039index cfe3b95..d01b118 100644
16040--- a/arch/x86/include/asm/bitops.h
16041+++ b/arch/x86/include/asm/bitops.h
16042@@ -50,7 +50,7 @@
16043 * a mask operation on a byte.
16044 */
16045 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16046-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16047+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16048 #define CONST_MASK(nr) (1 << ((nr) & 7))
16049
16050 /**
16051@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16052 */
16053 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16054 {
16055- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16056+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16057 }
16058
16059 /**
16060@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16061 */
16062 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16063 {
16064- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16065+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16066 }
16067
16068 /**
16069@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16070 */
16071 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16072 {
16073- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16074+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16075 }
16076
16077 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16078@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16079 *
16080 * Undefined if no bit exists, so code should check against 0 first.
16081 */
16082-static inline unsigned long __ffs(unsigned long word)
16083+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16084 {
16085 asm("rep; bsf %1,%0"
16086 : "=r" (word)
16087@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16088 *
16089 * Undefined if no zero exists, so code should check against ~0UL first.
16090 */
16091-static inline unsigned long ffz(unsigned long word)
16092+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16093 {
16094 asm("rep; bsf %1,%0"
16095 : "=r" (word)
16096@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16097 *
16098 * Undefined if no set bit exists, so code should check against 0 first.
16099 */
16100-static inline unsigned long __fls(unsigned long word)
16101+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16102 {
16103 asm("bsr %1,%0"
16104 : "=r" (word)
16105@@ -434,7 +434,7 @@ static inline int ffs(int x)
16106 * set bit if value is nonzero. The last (most significant) bit is
16107 * at position 32.
16108 */
16109-static inline int fls(int x)
16110+static inline int __intentional_overflow(-1) fls(int x)
16111 {
16112 int r;
16113
16114@@ -476,7 +476,7 @@ static inline int fls(int x)
16115 * at position 64.
16116 */
16117 #ifdef CONFIG_X86_64
16118-static __always_inline int fls64(__u64 x)
16119+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16120 {
16121 int bitpos = -1;
16122 /*
16123diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16124index 4fa687a..60f2d39 100644
16125--- a/arch/x86/include/asm/boot.h
16126+++ b/arch/x86/include/asm/boot.h
16127@@ -6,10 +6,15 @@
16128 #include <uapi/asm/boot.h>
16129
16130 /* Physical address where kernel should be loaded. */
16131-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16132+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16133 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16134 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16135
16136+#ifndef __ASSEMBLY__
16137+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16138+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16139+#endif
16140+
16141 /* Minimum kernel alignment, as a power of two */
16142 #ifdef CONFIG_X86_64
16143 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16144diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16145index 48f99f1..d78ebf9 100644
16146--- a/arch/x86/include/asm/cache.h
16147+++ b/arch/x86/include/asm/cache.h
16148@@ -5,12 +5,13 @@
16149
16150 /* L1 cache line size */
16151 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16152-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16153+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16154
16155 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16156+#define __read_only __attribute__((__section__(".data..read_only")))
16157
16158 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16159-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16160+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16161
16162 #ifdef CONFIG_X86_VSMP
16163 #ifdef CONFIG_SMP
16164diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16165index 1c8b50e..166bcaa 100644
16166--- a/arch/x86/include/asm/calling.h
16167+++ b/arch/x86/include/asm/calling.h
16168@@ -96,23 +96,26 @@ For 32-bit we have the following conventions - kernel is built with
16169 .endm
16170
16171 .macro SAVE_C_REGS_HELPER offset=0 rax=1 rcx=1 r8910=1 r11=1
16172+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16173+ movq_cfi r12, R12+\offset
16174+#endif
16175 .if \r11
16176- movq_cfi r11, 6*8+\offset
16177+ movq_cfi r11, R11+\offset
16178 .endif
16179 .if \r8910
16180- movq_cfi r10, 7*8+\offset
16181- movq_cfi r9, 8*8+\offset
16182- movq_cfi r8, 9*8+\offset
16183+ movq_cfi r10, R10+\offset
16184+ movq_cfi r9, R9+\offset
16185+ movq_cfi r8, R8+\offset
16186 .endif
16187 .if \rax
16188- movq_cfi rax, 10*8+\offset
16189+ movq_cfi rax, RAX+\offset
16190 .endif
16191 .if \rcx
16192- movq_cfi rcx, 11*8+\offset
16193+ movq_cfi rcx, RCX+\offset
16194 .endif
16195- movq_cfi rdx, 12*8+\offset
16196- movq_cfi rsi, 13*8+\offset
16197- movq_cfi rdi, 14*8+\offset
16198+ movq_cfi rdx, RDX+\offset
16199+ movq_cfi rsi, RSI+\offset
16200+ movq_cfi rdi, RDI+\offset
16201 .endm
16202 .macro SAVE_C_REGS offset=0
16203 SAVE_C_REGS_HELPER \offset, 1, 1, 1, 1
16204@@ -131,76 +134,87 @@ For 32-bit we have the following conventions - kernel is built with
16205 .endm
16206
16207 .macro SAVE_EXTRA_REGS offset=0
16208- movq_cfi r15, 0*8+\offset
16209- movq_cfi r14, 1*8+\offset
16210- movq_cfi r13, 2*8+\offset
16211- movq_cfi r12, 3*8+\offset
16212- movq_cfi rbp, 4*8+\offset
16213- movq_cfi rbx, 5*8+\offset
16214+ movq_cfi r15, R15+\offset
16215+ movq_cfi r14, R14+\offset
16216+ movq_cfi r13, R13+\offset
16217+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16218+ movq_cfi r12, R12+\offset
16219+#endif
16220+ movq_cfi rbp, RBP+\offset
16221+ movq_cfi rbx, RBX+\offset
16222 .endm
16223 .macro SAVE_EXTRA_REGS_RBP offset=0
16224- movq_cfi rbp, 4*8+\offset
16225+ movq_cfi rbp, RBP+\offset
16226 .endm
16227
16228 .macro RESTORE_EXTRA_REGS offset=0
16229- movq_cfi_restore 0*8+\offset, r15
16230- movq_cfi_restore 1*8+\offset, r14
16231- movq_cfi_restore 2*8+\offset, r13
16232- movq_cfi_restore 3*8+\offset, r12
16233- movq_cfi_restore 4*8+\offset, rbp
16234- movq_cfi_restore 5*8+\offset, rbx
16235+ movq_cfi_restore R15+\offset, r15
16236+ movq_cfi_restore R14+\offset, r14
16237+ movq_cfi_restore R13+\offset, r13
16238+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16239+ movq_cfi_restore R12+\offset, r12
16240+#endif
16241+ movq_cfi_restore RBP+\offset, rbp
16242+ movq_cfi_restore RBX+\offset, rbx
16243 .endm
16244
16245 .macro ZERO_EXTRA_REGS
16246 xorl %r15d, %r15d
16247 xorl %r14d, %r14d
16248 xorl %r13d, %r13d
16249+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16250 xorl %r12d, %r12d
16251+#endif
16252 xorl %ebp, %ebp
16253 xorl %ebx, %ebx
16254 .endm
16255
16256- .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1
16257+ .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1, rstor_r12=1
16258+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16259+ .if \rstor_r12
16260+ movq_cfi_restore R12, r12
16261+ .endif
16262+#endif
16263 .if \rstor_r11
16264- movq_cfi_restore 6*8, r11
16265+ movq_cfi_restore R11, r11
16266 .endif
16267 .if \rstor_r8910
16268- movq_cfi_restore 7*8, r10
16269- movq_cfi_restore 8*8, r9
16270- movq_cfi_restore 9*8, r8
16271+ movq_cfi_restore R10, r10
16272+ movq_cfi_restore R9, r9
16273+ movq_cfi_restore R8, r8
16274 .endif
16275 .if \rstor_rax
16276- movq_cfi_restore 10*8, rax
16277+ movq_cfi_restore RAX, rax
16278 .endif
16279 .if \rstor_rcx
16280- movq_cfi_restore 11*8, rcx
16281+ movq_cfi_restore RCX, rcx
16282 .endif
16283 .if \rstor_rdx
16284- movq_cfi_restore 12*8, rdx
16285+ movq_cfi_restore RDX, rdx
16286 .endif
16287- movq_cfi_restore 13*8, rsi
16288- movq_cfi_restore 14*8, rdi
16289+ movq_cfi_restore RSI, rsi
16290+ movq_cfi_restore RDI, rdi
16291 .endm
16292 .macro RESTORE_C_REGS
16293- RESTORE_C_REGS_HELPER 1,1,1,1,1
16294+ RESTORE_C_REGS_HELPER 1,1,1,1,1,1
16295 .endm
16296 .macro RESTORE_C_REGS_EXCEPT_RAX
16297- RESTORE_C_REGS_HELPER 0,1,1,1,1
16298+ RESTORE_C_REGS_HELPER 0,1,1,1,1,0
16299 .endm
16300 .macro RESTORE_C_REGS_EXCEPT_RCX
16301- RESTORE_C_REGS_HELPER 1,0,1,1,1
16302+ RESTORE_C_REGS_HELPER 1,0,1,1,1,0
16303 .endm
16304 .macro RESTORE_C_REGS_EXCEPT_R11
16305- RESTORE_C_REGS_HELPER 1,1,0,1,1
16306+ RESTORE_C_REGS_HELPER 1,1,0,1,1,1
16307 .endm
16308 .macro RESTORE_C_REGS_EXCEPT_RCX_R11
16309- RESTORE_C_REGS_HELPER 1,0,0,1,1
16310+ RESTORE_C_REGS_HELPER 1,0,0,1,1,1
16311 .endm
16312 .macro RESTORE_RSI_RDI
16313- RESTORE_C_REGS_HELPER 0,0,0,0,0
16314+ RESTORE_C_REGS_HELPER 0,0,0,0,0,1
16315 .endm
16316 .macro RESTORE_RSI_RDI_RDX
16317- RESTORE_C_REGS_HELPER 0,0,0,0,1
16318+ RESTORE_C_REGS_HELPER 0,0,0,0,1,1
16319 .endm
16320
16321 .macro REMOVE_PT_GPREGS_FROM_STACK addskip=0
16322diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16323index f50de69..2b0a458 100644
16324--- a/arch/x86/include/asm/checksum_32.h
16325+++ b/arch/x86/include/asm/checksum_32.h
16326@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16327 int len, __wsum sum,
16328 int *src_err_ptr, int *dst_err_ptr);
16329
16330+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16331+ int len, __wsum sum,
16332+ int *src_err_ptr, int *dst_err_ptr);
16333+
16334+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16335+ int len, __wsum sum,
16336+ int *src_err_ptr, int *dst_err_ptr);
16337+
16338 /*
16339 * Note: when you get a NULL pointer exception here this means someone
16340 * passed in an incorrect kernel address to one of these functions.
16341@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16342
16343 might_sleep();
16344 stac();
16345- ret = csum_partial_copy_generic((__force void *)src, dst,
16346+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16347 len, sum, err_ptr, NULL);
16348 clac();
16349
16350@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16351 might_sleep();
16352 if (access_ok(VERIFY_WRITE, dst, len)) {
16353 stac();
16354- ret = csum_partial_copy_generic(src, (__force void *)dst,
16355+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16356 len, sum, NULL, err_ptr);
16357 clac();
16358 return ret;
16359diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16360index 99c105d7..2f667ac 100644
16361--- a/arch/x86/include/asm/cmpxchg.h
16362+++ b/arch/x86/include/asm/cmpxchg.h
16363@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16364 __compiletime_error("Bad argument size for cmpxchg");
16365 extern void __xadd_wrong_size(void)
16366 __compiletime_error("Bad argument size for xadd");
16367+extern void __xadd_check_overflow_wrong_size(void)
16368+ __compiletime_error("Bad argument size for xadd_check_overflow");
16369 extern void __add_wrong_size(void)
16370 __compiletime_error("Bad argument size for add");
16371+extern void __add_check_overflow_wrong_size(void)
16372+ __compiletime_error("Bad argument size for add_check_overflow");
16373
16374 /*
16375 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16376@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16377 __ret; \
16378 })
16379
16380+#ifdef CONFIG_PAX_REFCOUNT
16381+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16382+ ({ \
16383+ __typeof__ (*(ptr)) __ret = (arg); \
16384+ switch (sizeof(*(ptr))) { \
16385+ case __X86_CASE_L: \
16386+ asm volatile (lock #op "l %0, %1\n" \
16387+ "jno 0f\n" \
16388+ "mov %0,%1\n" \
16389+ "int $4\n0:\n" \
16390+ _ASM_EXTABLE(0b, 0b) \
16391+ : "+r" (__ret), "+m" (*(ptr)) \
16392+ : : "memory", "cc"); \
16393+ break; \
16394+ case __X86_CASE_Q: \
16395+ asm volatile (lock #op "q %q0, %1\n" \
16396+ "jno 0f\n" \
16397+ "mov %0,%1\n" \
16398+ "int $4\n0:\n" \
16399+ _ASM_EXTABLE(0b, 0b) \
16400+ : "+r" (__ret), "+m" (*(ptr)) \
16401+ : : "memory", "cc"); \
16402+ break; \
16403+ default: \
16404+ __ ## op ## _check_overflow_wrong_size(); \
16405+ } \
16406+ __ret; \
16407+ })
16408+#else
16409+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16410+#endif
16411+
16412 /*
16413 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16414 * Since this is generally used to protect other memory information, we
16415@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16416 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16417 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16418
16419+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16420+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16421+
16422 #define __add(ptr, inc, lock) \
16423 ({ \
16424 __typeof__ (*(ptr)) __ret = (inc); \
16425diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16426index acdee09..a553db3 100644
16427--- a/arch/x86/include/asm/compat.h
16428+++ b/arch/x86/include/asm/compat.h
16429@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16430 typedef u32 compat_uint_t;
16431 typedef u32 compat_ulong_t;
16432 typedef u64 __attribute__((aligned(4))) compat_u64;
16433-typedef u32 compat_uptr_t;
16434+typedef u32 __user compat_uptr_t;
16435
16436 struct compat_timespec {
16437 compat_time_t tv_sec;
16438diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16439index 3d6606f..300641d 100644
16440--- a/arch/x86/include/asm/cpufeature.h
16441+++ b/arch/x86/include/asm/cpufeature.h
16442@@ -214,7 +214,8 @@
16443 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16444 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16445 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16446-
16447+#define X86_FEATURE_PCIDUDEREF ( 8*32+30) /* PaX PCID based UDEREF */
16448+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16449
16450 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16451 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16452@@ -222,7 +223,7 @@
16453 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16454 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16455 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16456-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16457+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16458 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16459 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16460 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16461@@ -401,6 +402,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16462 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16463 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16464 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16465+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16466
16467 #if __GNUC__ >= 4
16468 extern void warn_pre_alternatives(void);
16469@@ -454,7 +456,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16470
16471 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16472 t_warn:
16473- warn_pre_alternatives();
16474+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID && bit != X86_FEATURE_PCIDUDEREF)
16475+ warn_pre_alternatives();
16476 return false;
16477 #endif
16478
16479@@ -475,7 +478,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16480 ".section .discard,\"aw\",@progbits\n"
16481 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16482 ".previous\n"
16483- ".section .altinstr_replacement,\"ax\"\n"
16484+ ".section .altinstr_replacement,\"a\"\n"
16485 "3: movb $1,%0\n"
16486 "4:\n"
16487 ".previous\n"
16488@@ -510,7 +513,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16489 " .byte 5f - 4f\n" /* repl len */
16490 " .byte 3b - 2b\n" /* pad len */
16491 ".previous\n"
16492- ".section .altinstr_replacement,\"ax\"\n"
16493+ ".section .altinstr_replacement,\"a\"\n"
16494 "4: jmp %l[t_no]\n"
16495 "5:\n"
16496 ".previous\n"
16497@@ -545,7 +548,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16498 ".section .discard,\"aw\",@progbits\n"
16499 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16500 ".previous\n"
16501- ".section .altinstr_replacement,\"ax\"\n"
16502+ ".section .altinstr_replacement,\"a\"\n"
16503 "3: movb $0,%0\n"
16504 "4:\n"
16505 ".previous\n"
16506@@ -560,7 +563,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16507 ".section .discard,\"aw\",@progbits\n"
16508 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16509 ".previous\n"
16510- ".section .altinstr_replacement,\"ax\"\n"
16511+ ".section .altinstr_replacement,\"a\"\n"
16512 "5: movb $1,%0\n"
16513 "6:\n"
16514 ".previous\n"
16515diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16516index a0bf89f..56f0b2a 100644
16517--- a/arch/x86/include/asm/desc.h
16518+++ b/arch/x86/include/asm/desc.h
16519@@ -4,6 +4,7 @@
16520 #include <asm/desc_defs.h>
16521 #include <asm/ldt.h>
16522 #include <asm/mmu.h>
16523+#include <asm/pgtable.h>
16524
16525 #include <linux/smp.h>
16526 #include <linux/percpu.h>
16527@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16528
16529 desc->type = (info->read_exec_only ^ 1) << 1;
16530 desc->type |= info->contents << 2;
16531+ desc->type |= info->seg_not_present ^ 1;
16532
16533 desc->s = 1;
16534 desc->dpl = 0x3;
16535@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16536 }
16537
16538 extern struct desc_ptr idt_descr;
16539-extern gate_desc idt_table[];
16540-extern struct desc_ptr debug_idt_descr;
16541-extern gate_desc debug_idt_table[];
16542-
16543-struct gdt_page {
16544- struct desc_struct gdt[GDT_ENTRIES];
16545-} __attribute__((aligned(PAGE_SIZE)));
16546-
16547-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16548+extern gate_desc idt_table[IDT_ENTRIES];
16549+extern const struct desc_ptr debug_idt_descr;
16550+extern gate_desc debug_idt_table[IDT_ENTRIES];
16551
16552+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16553 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16554 {
16555- return per_cpu(gdt_page, cpu).gdt;
16556+ return cpu_gdt_table[cpu];
16557 }
16558
16559 #ifdef CONFIG_X86_64
16560@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16561 unsigned long base, unsigned dpl, unsigned flags,
16562 unsigned short seg)
16563 {
16564- gate->a = (seg << 16) | (base & 0xffff);
16565- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16566+ gate->gate.offset_low = base;
16567+ gate->gate.seg = seg;
16568+ gate->gate.reserved = 0;
16569+ gate->gate.type = type;
16570+ gate->gate.s = 0;
16571+ gate->gate.dpl = dpl;
16572+ gate->gate.p = 1;
16573+ gate->gate.offset_high = base >> 16;
16574 }
16575
16576 #endif
16577@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16578
16579 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16580 {
16581+ pax_open_kernel();
16582 memcpy(&idt[entry], gate, sizeof(*gate));
16583+ pax_close_kernel();
16584 }
16585
16586 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16587 {
16588+ pax_open_kernel();
16589 memcpy(&ldt[entry], desc, 8);
16590+ pax_close_kernel();
16591 }
16592
16593 static inline void
16594@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16595 default: size = sizeof(*gdt); break;
16596 }
16597
16598+ pax_open_kernel();
16599 memcpy(&gdt[entry], desc, size);
16600+ pax_close_kernel();
16601 }
16602
16603 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16604@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16605
16606 static inline void native_load_tr_desc(void)
16607 {
16608+ pax_open_kernel();
16609 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16610+ pax_close_kernel();
16611 }
16612
16613 static inline void native_load_gdt(const struct desc_ptr *dtr)
16614@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16615 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16616 unsigned int i;
16617
16618+ pax_open_kernel();
16619 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16620 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16621+ pax_close_kernel();
16622 }
16623
16624 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16625@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16626 preempt_enable();
16627 }
16628
16629-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16630+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16631 {
16632 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16633 }
16634@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16635 }
16636
16637 #ifdef CONFIG_X86_64
16638-static inline void set_nmi_gate(int gate, void *addr)
16639+static inline void set_nmi_gate(int gate, const void *addr)
16640 {
16641 gate_desc s;
16642
16643@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16644 #endif
16645
16646 #ifdef CONFIG_TRACING
16647-extern struct desc_ptr trace_idt_descr;
16648-extern gate_desc trace_idt_table[];
16649+extern const struct desc_ptr trace_idt_descr;
16650+extern gate_desc trace_idt_table[IDT_ENTRIES];
16651 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16652 {
16653 write_idt_entry(trace_idt_table, entry, gate);
16654 }
16655
16656-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16657+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16658 unsigned dpl, unsigned ist, unsigned seg)
16659 {
16660 gate_desc s;
16661@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16662 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16663 #endif
16664
16665-static inline void _set_gate(int gate, unsigned type, void *addr,
16666+static inline void _set_gate(int gate, unsigned type, const void *addr,
16667 unsigned dpl, unsigned ist, unsigned seg)
16668 {
16669 gate_desc s;
16670@@ -379,14 +392,14 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16671 #define set_intr_gate_notrace(n, addr) \
16672 do { \
16673 BUG_ON((unsigned)n > 0xFF); \
16674- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16675+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16676 __KERNEL_CS); \
16677 } while (0)
16678
16679 #define set_intr_gate(n, addr) \
16680 do { \
16681 set_intr_gate_notrace(n, addr); \
16682- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16683+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16684 0, 0, __KERNEL_CS); \
16685 } while (0)
16686
16687@@ -414,19 +427,19 @@ static inline void alloc_system_vector(int vector)
16688 /*
16689 * This routine sets up an interrupt gate at directory privilege level 3.
16690 */
16691-static inline void set_system_intr_gate(unsigned int n, void *addr)
16692+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16693 {
16694 BUG_ON((unsigned)n > 0xFF);
16695 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16696 }
16697
16698-static inline void set_system_trap_gate(unsigned int n, void *addr)
16699+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16700 {
16701 BUG_ON((unsigned)n > 0xFF);
16702 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16703 }
16704
16705-static inline void set_trap_gate(unsigned int n, void *addr)
16706+static inline void set_trap_gate(unsigned int n, const void *addr)
16707 {
16708 BUG_ON((unsigned)n > 0xFF);
16709 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16710@@ -435,16 +448,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16711 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16712 {
16713 BUG_ON((unsigned)n > 0xFF);
16714- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16715+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16716 }
16717
16718-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16719+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16720 {
16721 BUG_ON((unsigned)n > 0xFF);
16722 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16723 }
16724
16725-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16726+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16727 {
16728 BUG_ON((unsigned)n > 0xFF);
16729 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16730@@ -516,4 +529,17 @@ static inline void load_current_idt(void)
16731 else
16732 load_idt((const struct desc_ptr *)&idt_descr);
16733 }
16734+
16735+#ifdef CONFIG_X86_32
16736+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16737+{
16738+ struct desc_struct d;
16739+
16740+ if (likely(limit))
16741+ limit = (limit - 1UL) >> PAGE_SHIFT;
16742+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16743+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16744+}
16745+#endif
16746+
16747 #endif /* _ASM_X86_DESC_H */
16748diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16749index 278441f..b95a174 100644
16750--- a/arch/x86/include/asm/desc_defs.h
16751+++ b/arch/x86/include/asm/desc_defs.h
16752@@ -31,6 +31,12 @@ struct desc_struct {
16753 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16754 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16755 };
16756+ struct {
16757+ u16 offset_low;
16758+ u16 seg;
16759+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16760+ unsigned offset_high: 16;
16761+ } gate;
16762 };
16763 } __attribute__((packed));
16764
16765diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16766index ced283a..ffe04cc 100644
16767--- a/arch/x86/include/asm/div64.h
16768+++ b/arch/x86/include/asm/div64.h
16769@@ -39,7 +39,7 @@
16770 __mod; \
16771 })
16772
16773-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16774+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16775 {
16776 union {
16777 u64 v64;
16778diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16779index f161c18..97d43e8 100644
16780--- a/arch/x86/include/asm/elf.h
16781+++ b/arch/x86/include/asm/elf.h
16782@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16783
16784 #include <asm/vdso.h>
16785
16786-#ifdef CONFIG_X86_64
16787-extern unsigned int vdso64_enabled;
16788-#endif
16789 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16790 extern unsigned int vdso32_enabled;
16791 #endif
16792@@ -250,7 +247,25 @@ extern int force_personality32;
16793 the loader. We need to make sure that it is out of the way of the program
16794 that it will "exec", and that there is sufficient room for the brk. */
16795
16796+#ifdef CONFIG_PAX_SEGMEXEC
16797+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16798+#else
16799 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16800+#endif
16801+
16802+#ifdef CONFIG_PAX_ASLR
16803+#ifdef CONFIG_X86_32
16804+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16805+
16806+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16807+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16808+#else
16809+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16810+
16811+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16812+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16813+#endif
16814+#endif
16815
16816 /* This yields a mask that user programs can use to figure out what
16817 instruction set this CPU supports. This could be done in user space,
16818@@ -299,17 +314,13 @@ do { \
16819
16820 #define ARCH_DLINFO \
16821 do { \
16822- if (vdso64_enabled) \
16823- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16824- (unsigned long __force)current->mm->context.vdso); \
16825+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16826 } while (0)
16827
16828 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16829 #define ARCH_DLINFO_X32 \
16830 do { \
16831- if (vdso64_enabled) \
16832- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16833- (unsigned long __force)current->mm->context.vdso); \
16834+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16835 } while (0)
16836
16837 #define AT_SYSINFO 32
16838@@ -324,10 +335,10 @@ else \
16839
16840 #endif /* !CONFIG_X86_32 */
16841
16842-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16843+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16844
16845 #define VDSO_ENTRY \
16846- ((unsigned long)current->mm->context.vdso + \
16847+ (current->mm->context.vdso + \
16848 selected_vdso32->sym___kernel_vsyscall)
16849
16850 struct linux_binprm;
16851diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16852index 77a99ac..39ff7f5 100644
16853--- a/arch/x86/include/asm/emergency-restart.h
16854+++ b/arch/x86/include/asm/emergency-restart.h
16855@@ -1,6 +1,6 @@
16856 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16857 #define _ASM_X86_EMERGENCY_RESTART_H
16858
16859-extern void machine_emergency_restart(void);
16860+extern void machine_emergency_restart(void) __noreturn;
16861
16862 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16863diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16864index 1c7eefe..d0e4702 100644
16865--- a/arch/x86/include/asm/floppy.h
16866+++ b/arch/x86/include/asm/floppy.h
16867@@ -229,18 +229,18 @@ static struct fd_routine_l {
16868 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16869 } fd_routine[] = {
16870 {
16871- request_dma,
16872- free_dma,
16873- get_dma_residue,
16874- dma_mem_alloc,
16875- hard_dma_setup
16876+ ._request_dma = request_dma,
16877+ ._free_dma = free_dma,
16878+ ._get_dma_residue = get_dma_residue,
16879+ ._dma_mem_alloc = dma_mem_alloc,
16880+ ._dma_setup = hard_dma_setup
16881 },
16882 {
16883- vdma_request_dma,
16884- vdma_nop,
16885- vdma_get_dma_residue,
16886- vdma_mem_alloc,
16887- vdma_dma_setup
16888+ ._request_dma = vdma_request_dma,
16889+ ._free_dma = vdma_nop,
16890+ ._get_dma_residue = vdma_get_dma_residue,
16891+ ._dma_mem_alloc = vdma_mem_alloc,
16892+ ._dma_setup = vdma_dma_setup
16893 }
16894 };
16895
16896diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16897index da5e967..ab07eec 100644
16898--- a/arch/x86/include/asm/fpu-internal.h
16899+++ b/arch/x86/include/asm/fpu-internal.h
16900@@ -151,8 +151,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16901 #define user_insn(insn, output, input...) \
16902 ({ \
16903 int err; \
16904+ pax_open_userland(); \
16905 asm volatile(ASM_STAC "\n" \
16906- "1:" #insn "\n\t" \
16907+ "1:" \
16908+ __copyuser_seg \
16909+ #insn "\n\t" \
16910 "2: " ASM_CLAC "\n" \
16911 ".section .fixup,\"ax\"\n" \
16912 "3: movl $-1,%[err]\n" \
16913@@ -161,6 +164,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16914 _ASM_EXTABLE(1b, 3b) \
16915 : [err] "=r" (err), output \
16916 : "0"(0), input); \
16917+ pax_close_userland(); \
16918 err; \
16919 })
16920
16921@@ -327,7 +331,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16922 "fnclex\n\t"
16923 "emms\n\t"
16924 "fildl %P[addr]" /* set F?P to defined value */
16925- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16926+ : : [addr] "m" (cpu_tss[raw_smp_processor_id()].x86_tss.sp0));
16927 }
16928
16929 return fpu_restore_checking(&tsk->thread.fpu);
16930diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16931index b4c1f54..e290c08 100644
16932--- a/arch/x86/include/asm/futex.h
16933+++ b/arch/x86/include/asm/futex.h
16934@@ -12,6 +12,7 @@
16935 #include <asm/smap.h>
16936
16937 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16938+ typecheck(u32 __user *, uaddr); \
16939 asm volatile("\t" ASM_STAC "\n" \
16940 "1:\t" insn "\n" \
16941 "2:\t" ASM_CLAC "\n" \
16942@@ -20,15 +21,16 @@
16943 "\tjmp\t2b\n" \
16944 "\t.previous\n" \
16945 _ASM_EXTABLE(1b, 3b) \
16946- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16947+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16948 : "i" (-EFAULT), "0" (oparg), "1" (0))
16949
16950 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16951+ typecheck(u32 __user *, uaddr); \
16952 asm volatile("\t" ASM_STAC "\n" \
16953 "1:\tmovl %2, %0\n" \
16954 "\tmovl\t%0, %3\n" \
16955 "\t" insn "\n" \
16956- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16957+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16958 "\tjnz\t1b\n" \
16959 "3:\t" ASM_CLAC "\n" \
16960 "\t.section .fixup,\"ax\"\n" \
16961@@ -38,7 +40,7 @@
16962 _ASM_EXTABLE(1b, 4b) \
16963 _ASM_EXTABLE(2b, 4b) \
16964 : "=&a" (oldval), "=&r" (ret), \
16965- "+m" (*uaddr), "=&r" (tem) \
16966+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16967 : "r" (oparg), "i" (-EFAULT), "1" (0))
16968
16969 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16970@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16971
16972 pagefault_disable();
16973
16974+ pax_open_userland();
16975 switch (op) {
16976 case FUTEX_OP_SET:
16977- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16978+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16979 break;
16980 case FUTEX_OP_ADD:
16981- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16982+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16983 uaddr, oparg);
16984 break;
16985 case FUTEX_OP_OR:
16986@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16987 default:
16988 ret = -ENOSYS;
16989 }
16990+ pax_close_userland();
16991
16992 pagefault_enable();
16993
16994diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
16995index e9571dd..df5f542 100644
16996--- a/arch/x86/include/asm/hw_irq.h
16997+++ b/arch/x86/include/asm/hw_irq.h
16998@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
16999 #endif /* CONFIG_X86_LOCAL_APIC */
17000
17001 /* Statistics */
17002-extern atomic_t irq_err_count;
17003-extern atomic_t irq_mis_count;
17004+extern atomic_unchecked_t irq_err_count;
17005+extern atomic_unchecked_t irq_mis_count;
17006
17007 /* EISA */
17008 extern void eisa_set_level_irq(unsigned int irq);
17009diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17010index ccffa53..3c90c87 100644
17011--- a/arch/x86/include/asm/i8259.h
17012+++ b/arch/x86/include/asm/i8259.h
17013@@ -62,7 +62,7 @@ struct legacy_pic {
17014 void (*init)(int auto_eoi);
17015 int (*irq_pending)(unsigned int irq);
17016 void (*make_irq)(unsigned int irq);
17017-};
17018+} __do_const;
17019
17020 extern struct legacy_pic *legacy_pic;
17021 extern struct legacy_pic null_legacy_pic;
17022diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17023index 34a5b93..27e40a6 100644
17024--- a/arch/x86/include/asm/io.h
17025+++ b/arch/x86/include/asm/io.h
17026@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17027 "m" (*(volatile type __force *)addr) barrier); }
17028
17029 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17030-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17031-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17032+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17033+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17034
17035 build_mmio_read(__readb, "b", unsigned char, "=q", )
17036-build_mmio_read(__readw, "w", unsigned short, "=r", )
17037-build_mmio_read(__readl, "l", unsigned int, "=r", )
17038+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17039+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17040
17041 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17042 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17043@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17044 * this function
17045 */
17046
17047-static inline phys_addr_t virt_to_phys(volatile void *address)
17048+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17049 {
17050 return __pa(address);
17051 }
17052@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17053 return ioremap_nocache(offset, size);
17054 }
17055
17056-extern void iounmap(volatile void __iomem *addr);
17057+extern void iounmap(const volatile void __iomem *addr);
17058
17059 extern void set_iounmap_nonlazy(void);
17060
17061@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17062
17063 #include <linux/vmalloc.h>
17064
17065+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17066+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17067+{
17068+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17069+}
17070+
17071+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17072+{
17073+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17074+}
17075+
17076 /*
17077 * Convert a virtual cached pointer to an uncached pointer
17078 */
17079diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17080index b77f5ed..a2f791e 100644
17081--- a/arch/x86/include/asm/irqflags.h
17082+++ b/arch/x86/include/asm/irqflags.h
17083@@ -137,6 +137,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17084 swapgs; \
17085 sysretl
17086
17087+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17088+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17089+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17090+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17091+
17092 #else
17093 #define INTERRUPT_RETURN iret
17094 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17095diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17096index 4421b5d..8543006 100644
17097--- a/arch/x86/include/asm/kprobes.h
17098+++ b/arch/x86/include/asm/kprobes.h
17099@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17100 #define RELATIVEJUMP_SIZE 5
17101 #define RELATIVECALL_OPCODE 0xe8
17102 #define RELATIVE_ADDR_SIZE 4
17103-#define MAX_STACK_SIZE 64
17104-#define MIN_STACK_SIZE(ADDR) \
17105- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17106- THREAD_SIZE - (unsigned long)(ADDR))) \
17107- ? (MAX_STACK_SIZE) \
17108- : (((unsigned long)current_thread_info()) + \
17109- THREAD_SIZE - (unsigned long)(ADDR)))
17110+#define MAX_STACK_SIZE 64UL
17111+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17112
17113 #define flush_insn_slot(p) do { } while (0)
17114
17115diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17116index 4ad6560..75c7bdd 100644
17117--- a/arch/x86/include/asm/local.h
17118+++ b/arch/x86/include/asm/local.h
17119@@ -10,33 +10,97 @@ typedef struct {
17120 atomic_long_t a;
17121 } local_t;
17122
17123+typedef struct {
17124+ atomic_long_unchecked_t a;
17125+} local_unchecked_t;
17126+
17127 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17128
17129 #define local_read(l) atomic_long_read(&(l)->a)
17130+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17131 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17132+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17133
17134 static inline void local_inc(local_t *l)
17135 {
17136- asm volatile(_ASM_INC "%0"
17137+ asm volatile(_ASM_INC "%0\n"
17138+
17139+#ifdef CONFIG_PAX_REFCOUNT
17140+ "jno 0f\n"
17141+ _ASM_DEC "%0\n"
17142+ "int $4\n0:\n"
17143+ _ASM_EXTABLE(0b, 0b)
17144+#endif
17145+
17146+ : "+m" (l->a.counter));
17147+}
17148+
17149+static inline void local_inc_unchecked(local_unchecked_t *l)
17150+{
17151+ asm volatile(_ASM_INC "%0\n"
17152 : "+m" (l->a.counter));
17153 }
17154
17155 static inline void local_dec(local_t *l)
17156 {
17157- asm volatile(_ASM_DEC "%0"
17158+ asm volatile(_ASM_DEC "%0\n"
17159+
17160+#ifdef CONFIG_PAX_REFCOUNT
17161+ "jno 0f\n"
17162+ _ASM_INC "%0\n"
17163+ "int $4\n0:\n"
17164+ _ASM_EXTABLE(0b, 0b)
17165+#endif
17166+
17167+ : "+m" (l->a.counter));
17168+}
17169+
17170+static inline void local_dec_unchecked(local_unchecked_t *l)
17171+{
17172+ asm volatile(_ASM_DEC "%0\n"
17173 : "+m" (l->a.counter));
17174 }
17175
17176 static inline void local_add(long i, local_t *l)
17177 {
17178- asm volatile(_ASM_ADD "%1,%0"
17179+ asm volatile(_ASM_ADD "%1,%0\n"
17180+
17181+#ifdef CONFIG_PAX_REFCOUNT
17182+ "jno 0f\n"
17183+ _ASM_SUB "%1,%0\n"
17184+ "int $4\n0:\n"
17185+ _ASM_EXTABLE(0b, 0b)
17186+#endif
17187+
17188+ : "+m" (l->a.counter)
17189+ : "ir" (i));
17190+}
17191+
17192+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17193+{
17194+ asm volatile(_ASM_ADD "%1,%0\n"
17195 : "+m" (l->a.counter)
17196 : "ir" (i));
17197 }
17198
17199 static inline void local_sub(long i, local_t *l)
17200 {
17201- asm volatile(_ASM_SUB "%1,%0"
17202+ asm volatile(_ASM_SUB "%1,%0\n"
17203+
17204+#ifdef CONFIG_PAX_REFCOUNT
17205+ "jno 0f\n"
17206+ _ASM_ADD "%1,%0\n"
17207+ "int $4\n0:\n"
17208+ _ASM_EXTABLE(0b, 0b)
17209+#endif
17210+
17211+ : "+m" (l->a.counter)
17212+ : "ir" (i));
17213+}
17214+
17215+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17216+{
17217+ asm volatile(_ASM_SUB "%1,%0\n"
17218 : "+m" (l->a.counter)
17219 : "ir" (i));
17220 }
17221@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17222 */
17223 static inline int local_sub_and_test(long i, local_t *l)
17224 {
17225- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17226+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17227 }
17228
17229 /**
17230@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17231 */
17232 static inline int local_dec_and_test(local_t *l)
17233 {
17234- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17235+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17236 }
17237
17238 /**
17239@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17240 */
17241 static inline int local_inc_and_test(local_t *l)
17242 {
17243- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17244+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17245 }
17246
17247 /**
17248@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17249 */
17250 static inline int local_add_negative(long i, local_t *l)
17251 {
17252- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17253+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17254 }
17255
17256 /**
17257@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17258 static inline long local_add_return(long i, local_t *l)
17259 {
17260 long __i = i;
17261+ asm volatile(_ASM_XADD "%0, %1\n"
17262+
17263+#ifdef CONFIG_PAX_REFCOUNT
17264+ "jno 0f\n"
17265+ _ASM_MOV "%0,%1\n"
17266+ "int $4\n0:\n"
17267+ _ASM_EXTABLE(0b, 0b)
17268+#endif
17269+
17270+ : "+r" (i), "+m" (l->a.counter)
17271+ : : "memory");
17272+ return i + __i;
17273+}
17274+
17275+/**
17276+ * local_add_return_unchecked - add and return
17277+ * @i: integer value to add
17278+ * @l: pointer to type local_unchecked_t
17279+ *
17280+ * Atomically adds @i to @l and returns @i + @l
17281+ */
17282+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17283+{
17284+ long __i = i;
17285 asm volatile(_ASM_XADD "%0, %1;"
17286 : "+r" (i), "+m" (l->a.counter)
17287 : : "memory");
17288@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17289
17290 #define local_cmpxchg(l, o, n) \
17291 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17292+#define local_cmpxchg_unchecked(l, o, n) \
17293+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17294 /* Always has a lock prefix */
17295 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17296
17297diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17298new file mode 100644
17299index 0000000..2bfd3ba
17300--- /dev/null
17301+++ b/arch/x86/include/asm/mman.h
17302@@ -0,0 +1,15 @@
17303+#ifndef _X86_MMAN_H
17304+#define _X86_MMAN_H
17305+
17306+#include <uapi/asm/mman.h>
17307+
17308+#ifdef __KERNEL__
17309+#ifndef __ASSEMBLY__
17310+#ifdef CONFIG_X86_32
17311+#define arch_mmap_check i386_mmap_check
17312+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17313+#endif
17314+#endif
17315+#endif
17316+
17317+#endif /* X86_MMAN_H */
17318diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17319index 09b9620..923aecd 100644
17320--- a/arch/x86/include/asm/mmu.h
17321+++ b/arch/x86/include/asm/mmu.h
17322@@ -9,7 +9,7 @@
17323 * we put the segment information here.
17324 */
17325 typedef struct {
17326- void *ldt;
17327+ struct desc_struct *ldt;
17328 int size;
17329
17330 #ifdef CONFIG_X86_64
17331@@ -18,7 +18,19 @@ typedef struct {
17332 #endif
17333
17334 struct mutex lock;
17335- void __user *vdso;
17336+ unsigned long vdso;
17337+
17338+#ifdef CONFIG_X86_32
17339+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17340+ unsigned long user_cs_base;
17341+ unsigned long user_cs_limit;
17342+
17343+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17344+ cpumask_t cpu_user_cs_mask;
17345+#endif
17346+
17347+#endif
17348+#endif
17349
17350 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17351 } mm_context_t;
17352diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17353index e997f70..5d819f7 100644
17354--- a/arch/x86/include/asm/mmu_context.h
17355+++ b/arch/x86/include/asm/mmu_context.h
17356@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17357
17358 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17359 {
17360+
17361+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17362+ if (!(static_cpu_has(X86_FEATURE_PCIDUDEREF))) {
17363+ unsigned int i;
17364+ pgd_t *pgd;
17365+
17366+ pax_open_kernel();
17367+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17368+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17369+ set_pgd_batched(pgd+i, native_make_pgd(0));
17370+ pax_close_kernel();
17371+ }
17372+#endif
17373+
17374 #ifdef CONFIG_SMP
17375 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17376 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17377@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17378 struct task_struct *tsk)
17379 {
17380 unsigned cpu = smp_processor_id();
17381+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17382+ int tlbstate = TLBSTATE_OK;
17383+#endif
17384
17385 if (likely(prev != next)) {
17386 #ifdef CONFIG_SMP
17387+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17388+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17389+#endif
17390 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17391 this_cpu_write(cpu_tlbstate.active_mm, next);
17392 #endif
17393 cpumask_set_cpu(cpu, mm_cpumask(next));
17394
17395 /* Re-load page tables */
17396+#ifdef CONFIG_PAX_PER_CPU_PGD
17397+ pax_open_kernel();
17398+
17399+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17400+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF))
17401+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17402+ else
17403+#endif
17404+
17405+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17406+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17407+ pax_close_kernel();
17408+ 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));
17409+
17410+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17411+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
17412+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17413+ u64 descriptor[2];
17414+ descriptor[0] = PCID_USER;
17415+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17416+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17417+ descriptor[0] = PCID_KERNEL;
17418+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17419+ }
17420+ } else {
17421+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17422+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17423+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17424+ else
17425+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17426+ }
17427+ } else
17428+#endif
17429+
17430+ load_cr3(get_cpu_pgd(cpu, kernel));
17431+#else
17432 load_cr3(next->pgd);
17433+#endif
17434 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17435
17436 /* Stop flush ipis for the previous mm */
17437@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17438 */
17439 if (unlikely(prev->context.ldt != next->context.ldt))
17440 load_LDT_nolock(&next->context);
17441+
17442+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17443+ if (!(__supported_pte_mask & _PAGE_NX)) {
17444+ smp_mb__before_atomic();
17445+ cpumask_clear_cpu(cpu, &prev->context.cpu_user_cs_mask);
17446+ smp_mb__after_atomic();
17447+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17448+ }
17449+#endif
17450+
17451+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17452+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17453+ prev->context.user_cs_limit != next->context.user_cs_limit))
17454+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17455+#ifdef CONFIG_SMP
17456+ else if (unlikely(tlbstate != TLBSTATE_OK))
17457+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17458+#endif
17459+#endif
17460+
17461 }
17462+ else {
17463+
17464+#ifdef CONFIG_PAX_PER_CPU_PGD
17465+ pax_open_kernel();
17466+
17467+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17468+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF))
17469+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17470+ else
17471+#endif
17472+
17473+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17474+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17475+ pax_close_kernel();
17476+ 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));
17477+
17478+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17479+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
17480+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17481+ u64 descriptor[2];
17482+ descriptor[0] = PCID_USER;
17483+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17484+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17485+ descriptor[0] = PCID_KERNEL;
17486+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17487+ }
17488+ } else {
17489+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17490+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17491+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17492+ else
17493+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17494+ }
17495+ } else
17496+#endif
17497+
17498+ load_cr3(get_cpu_pgd(cpu, kernel));
17499+#endif
17500+
17501 #ifdef CONFIG_SMP
17502- else {
17503 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17504 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17505
17506@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17507 * tlb flush IPI delivery. We must reload CR3
17508 * to make sure to use no freed page tables.
17509 */
17510+
17511+#ifndef CONFIG_PAX_PER_CPU_PGD
17512 load_cr3(next->pgd);
17513 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17514+#endif
17515+
17516 load_mm_cr4(next);
17517 load_LDT_nolock(&next->context);
17518+
17519+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17520+ if (!(__supported_pte_mask & _PAGE_NX))
17521+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17522+#endif
17523+
17524+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17525+#ifdef CONFIG_PAX_PAGEEXEC
17526+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17527+#endif
17528+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17529+#endif
17530+
17531 }
17532+#endif
17533 }
17534-#endif
17535 }
17536
17537 #define activate_mm(prev, next) \
17538diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17539index e3b7819..b257c64 100644
17540--- a/arch/x86/include/asm/module.h
17541+++ b/arch/x86/include/asm/module.h
17542@@ -5,6 +5,7 @@
17543
17544 #ifdef CONFIG_X86_64
17545 /* X86_64 does not define MODULE_PROC_FAMILY */
17546+#define MODULE_PROC_FAMILY ""
17547 #elif defined CONFIG_M486
17548 #define MODULE_PROC_FAMILY "486 "
17549 #elif defined CONFIG_M586
17550@@ -57,8 +58,20 @@
17551 #error unknown processor family
17552 #endif
17553
17554-#ifdef CONFIG_X86_32
17555-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17556+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17557+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17558+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17559+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17560+#else
17561+#define MODULE_PAX_KERNEXEC ""
17562 #endif
17563
17564+#ifdef CONFIG_PAX_MEMORY_UDEREF
17565+#define MODULE_PAX_UDEREF "UDEREF "
17566+#else
17567+#define MODULE_PAX_UDEREF ""
17568+#endif
17569+
17570+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17571+
17572 #endif /* _ASM_X86_MODULE_H */
17573diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17574index 5f2fc44..106caa6 100644
17575--- a/arch/x86/include/asm/nmi.h
17576+++ b/arch/x86/include/asm/nmi.h
17577@@ -36,26 +36,35 @@ enum {
17578
17579 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17580
17581+struct nmiaction;
17582+
17583+struct nmiwork {
17584+ const struct nmiaction *action;
17585+ u64 max_duration;
17586+ struct irq_work irq_work;
17587+};
17588+
17589 struct nmiaction {
17590 struct list_head list;
17591 nmi_handler_t handler;
17592- u64 max_duration;
17593- struct irq_work irq_work;
17594 unsigned long flags;
17595 const char *name;
17596-};
17597+ struct nmiwork *work;
17598+} __do_const;
17599
17600 #define register_nmi_handler(t, fn, fg, n, init...) \
17601 ({ \
17602- static struct nmiaction init fn##_na = { \
17603+ static struct nmiwork fn##_nw; \
17604+ static const struct nmiaction init fn##_na = { \
17605 .handler = (fn), \
17606 .name = (n), \
17607 .flags = (fg), \
17608+ .work = &fn##_nw, \
17609 }; \
17610 __register_nmi_handler((t), &fn##_na); \
17611 })
17612
17613-int __register_nmi_handler(unsigned int, struct nmiaction *);
17614+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17615
17616 void unregister_nmi_handler(unsigned int, const char *);
17617
17618diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17619index 802dde3..9183e68 100644
17620--- a/arch/x86/include/asm/page.h
17621+++ b/arch/x86/include/asm/page.h
17622@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17623 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17624
17625 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17626+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17627
17628 #define __boot_va(x) __va(x)
17629 #define __boot_pa(x) __pa(x)
17630@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17631 * virt_to_page(kaddr) returns a valid pointer if and only if
17632 * virt_addr_valid(kaddr) returns true.
17633 */
17634-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17635 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17636 extern bool __virt_addr_valid(unsigned long kaddr);
17637 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17638
17639+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17640+#define virt_to_page(kaddr) \
17641+ ({ \
17642+ const void *__kaddr = (const void *)(kaddr); \
17643+ BUG_ON(!virt_addr_valid(__kaddr)); \
17644+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17645+ })
17646+#else
17647+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17648+#endif
17649+
17650 #endif /* __ASSEMBLY__ */
17651
17652 #include <asm-generic/memory_model.h>
17653diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h
17654index 904f528..b4d0d24 100644
17655--- a/arch/x86/include/asm/page_32.h
17656+++ b/arch/x86/include/asm/page_32.h
17657@@ -7,11 +7,17 @@
17658
17659 #define __phys_addr_nodebug(x) ((x) - PAGE_OFFSET)
17660 #ifdef CONFIG_DEBUG_VIRTUAL
17661-extern unsigned long __phys_addr(unsigned long);
17662+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17663 #else
17664-#define __phys_addr(x) __phys_addr_nodebug(x)
17665+static inline unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
17666+{
17667+ return __phys_addr_nodebug(x);
17668+}
17669 #endif
17670-#define __phys_addr_symbol(x) __phys_addr(x)
17671+static inline unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long x)
17672+{
17673+ return __phys_addr(x);
17674+}
17675 #define __phys_reloc_hide(x) RELOC_HIDE((x), 0)
17676
17677 #ifdef CONFIG_FLATMEM
17678diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17679index b3bebf9..b7e1204 100644
17680--- a/arch/x86/include/asm/page_64.h
17681+++ b/arch/x86/include/asm/page_64.h
17682@@ -7,9 +7,9 @@
17683
17684 /* duplicated to the one in bootmem.h */
17685 extern unsigned long max_pfn;
17686-extern unsigned long phys_base;
17687+extern const unsigned long phys_base;
17688
17689-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17690+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17691 {
17692 unsigned long y = x - __START_KERNEL_map;
17693
17694@@ -20,12 +20,14 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17695 }
17696
17697 #ifdef CONFIG_DEBUG_VIRTUAL
17698-extern unsigned long __phys_addr(unsigned long);
17699-extern unsigned long __phys_addr_symbol(unsigned long);
17700+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17701+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17702 #else
17703 #define __phys_addr(x) __phys_addr_nodebug(x)
17704-#define __phys_addr_symbol(x) \
17705- ((unsigned long)(x) - __START_KERNEL_map + phys_base)
17706+static inline unsigned long __intentional_overflow(-1) __phys_addr_symbol(const void *x)
17707+{
17708+ return (unsigned long)x - __START_KERNEL_map + phys_base;
17709+}
17710 #endif
17711
17712 #define __phys_reloc_hide(x) (x)
17713diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17714index 8957810..f34efb4 100644
17715--- a/arch/x86/include/asm/paravirt.h
17716+++ b/arch/x86/include/asm/paravirt.h
17717@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17718 return (pmd_t) { ret };
17719 }
17720
17721-static inline pmdval_t pmd_val(pmd_t pmd)
17722+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17723 {
17724 pmdval_t ret;
17725
17726@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17727 val);
17728 }
17729
17730+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17731+{
17732+ pgdval_t val = native_pgd_val(pgd);
17733+
17734+ if (sizeof(pgdval_t) > sizeof(long))
17735+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17736+ val, (u64)val >> 32);
17737+ else
17738+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17739+ val);
17740+}
17741+
17742 static inline void pgd_clear(pgd_t *pgdp)
17743 {
17744 set_pgd(pgdp, __pgd(0));
17745@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17746 pv_mmu_ops.set_fixmap(idx, phys, flags);
17747 }
17748
17749+#ifdef CONFIG_PAX_KERNEXEC
17750+static inline unsigned long pax_open_kernel(void)
17751+{
17752+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17753+}
17754+
17755+static inline unsigned long pax_close_kernel(void)
17756+{
17757+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17758+}
17759+#else
17760+static inline unsigned long pax_open_kernel(void) { return 0; }
17761+static inline unsigned long pax_close_kernel(void) { return 0; }
17762+#endif
17763+
17764 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17765
17766 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17767@@ -906,7 +933,7 @@ extern void default_banner(void);
17768
17769 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17770 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17771-#define PARA_INDIRECT(addr) *%cs:addr
17772+#define PARA_INDIRECT(addr) *%ss:addr
17773 #endif
17774
17775 #define INTERRUPT_RETURN \
17776@@ -976,6 +1003,21 @@ extern void default_banner(void);
17777 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_usergs_sysret64), \
17778 CLBR_NONE, \
17779 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_usergs_sysret64))
17780+
17781+#define GET_CR0_INTO_RDI \
17782+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17783+ mov %rax,%rdi
17784+
17785+#define SET_RDI_INTO_CR0 \
17786+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17787+
17788+#define GET_CR3_INTO_RDI \
17789+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17790+ mov %rax,%rdi
17791+
17792+#define SET_RDI_INTO_CR3 \
17793+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17794+
17795 #endif /* CONFIG_X86_32 */
17796
17797 #endif /* __ASSEMBLY__ */
17798diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17799index f7b0b5c..cdd33f9 100644
17800--- a/arch/x86/include/asm/paravirt_types.h
17801+++ b/arch/x86/include/asm/paravirt_types.h
17802@@ -84,7 +84,7 @@ struct pv_init_ops {
17803 */
17804 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17805 unsigned long addr, unsigned len);
17806-};
17807+} __no_const __no_randomize_layout;
17808
17809
17810 struct pv_lazy_ops {
17811@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17812 void (*enter)(void);
17813 void (*leave)(void);
17814 void (*flush)(void);
17815-};
17816+} __no_randomize_layout;
17817
17818 struct pv_time_ops {
17819 unsigned long long (*sched_clock)(void);
17820 unsigned long long (*steal_clock)(int cpu);
17821 unsigned long (*get_tsc_khz)(void);
17822-};
17823+} __no_const __no_randomize_layout;
17824
17825 struct pv_cpu_ops {
17826 /* hooks for various privileged instructions */
17827@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17828
17829 void (*start_context_switch)(struct task_struct *prev);
17830 void (*end_context_switch)(struct task_struct *next);
17831-};
17832+} __no_const __no_randomize_layout;
17833
17834 struct pv_irq_ops {
17835 /*
17836@@ -215,7 +215,7 @@ struct pv_irq_ops {
17837 #ifdef CONFIG_X86_64
17838 void (*adjust_exception_frame)(void);
17839 #endif
17840-};
17841+} __no_randomize_layout;
17842
17843 struct pv_apic_ops {
17844 #ifdef CONFIG_X86_LOCAL_APIC
17845@@ -223,7 +223,7 @@ struct pv_apic_ops {
17846 unsigned long start_eip,
17847 unsigned long start_esp);
17848 #endif
17849-};
17850+} __no_const __no_randomize_layout;
17851
17852 struct pv_mmu_ops {
17853 unsigned long (*read_cr2)(void);
17854@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17855 struct paravirt_callee_save make_pud;
17856
17857 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17858+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17859 #endif /* CONFIG_PGTABLE_LEVELS == 4 */
17860 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
17861
17862@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17863 an mfn. We can tell which is which from the index. */
17864 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17865 phys_addr_t phys, pgprot_t flags);
17866-};
17867+
17868+#ifdef CONFIG_PAX_KERNEXEC
17869+ unsigned long (*pax_open_kernel)(void);
17870+ unsigned long (*pax_close_kernel)(void);
17871+#endif
17872+
17873+} __no_randomize_layout;
17874
17875 struct arch_spinlock;
17876 #ifdef CONFIG_SMP
17877@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17878 struct pv_lock_ops {
17879 struct paravirt_callee_save lock_spinning;
17880 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17881-};
17882+} __no_randomize_layout;
17883
17884 /* This contains all the paravirt structures: we get a convenient
17885 * number for each function using the offset which we use to indicate
17886- * what to patch. */
17887+ * what to patch.
17888+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17889+ */
17890+
17891 struct paravirt_patch_template {
17892 struct pv_init_ops pv_init_ops;
17893 struct pv_time_ops pv_time_ops;
17894@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17895 struct pv_apic_ops pv_apic_ops;
17896 struct pv_mmu_ops pv_mmu_ops;
17897 struct pv_lock_ops pv_lock_ops;
17898-};
17899+} __no_randomize_layout;
17900
17901 extern struct pv_info pv_info;
17902 extern struct pv_init_ops pv_init_ops;
17903diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17904index bf7f8b5..ca5799d 100644
17905--- a/arch/x86/include/asm/pgalloc.h
17906+++ b/arch/x86/include/asm/pgalloc.h
17907@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17908 pmd_t *pmd, pte_t *pte)
17909 {
17910 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17911+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17912+}
17913+
17914+static inline void pmd_populate_user(struct mm_struct *mm,
17915+ pmd_t *pmd, pte_t *pte)
17916+{
17917+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17918 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17919 }
17920
17921@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17922
17923 #ifdef CONFIG_X86_PAE
17924 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17925+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17926+{
17927+ pud_populate(mm, pudp, pmd);
17928+}
17929 #else /* !CONFIG_X86_PAE */
17930 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17931 {
17932 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17933 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17934 }
17935+
17936+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17937+{
17938+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17939+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17940+}
17941 #endif /* CONFIG_X86_PAE */
17942
17943 #if CONFIG_PGTABLE_LEVELS > 3
17944@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17945 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17946 }
17947
17948+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17949+{
17950+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17951+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17952+}
17953+
17954 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17955 {
17956 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17957diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17958index fd74a11..35fd5af 100644
17959--- a/arch/x86/include/asm/pgtable-2level.h
17960+++ b/arch/x86/include/asm/pgtable-2level.h
17961@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17962
17963 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17964 {
17965+ pax_open_kernel();
17966 *pmdp = pmd;
17967+ pax_close_kernel();
17968 }
17969
17970 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17971diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17972index cdaa58c..e61122b 100644
17973--- a/arch/x86/include/asm/pgtable-3level.h
17974+++ b/arch/x86/include/asm/pgtable-3level.h
17975@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(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 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17981+ pax_close_kernel();
17982 }
17983
17984 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17985 {
17986+ pax_open_kernel();
17987 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17988+ pax_close_kernel();
17989 }
17990
17991 /*
17992diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17993index fe57e7a..0573d42 100644
17994--- a/arch/x86/include/asm/pgtable.h
17995+++ b/arch/x86/include/asm/pgtable.h
17996@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17997
17998 #ifndef __PAGETABLE_PUD_FOLDED
17999 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18000+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18001 #define pgd_clear(pgd) native_pgd_clear(pgd)
18002 #endif
18003
18004@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18005
18006 #define arch_end_context_switch(prev) do {} while(0)
18007
18008+#define pax_open_kernel() native_pax_open_kernel()
18009+#define pax_close_kernel() native_pax_close_kernel()
18010 #endif /* CONFIG_PARAVIRT */
18011
18012+#define __HAVE_ARCH_PAX_OPEN_KERNEL
18013+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18014+
18015+#ifdef CONFIG_PAX_KERNEXEC
18016+static inline unsigned long native_pax_open_kernel(void)
18017+{
18018+ unsigned long cr0;
18019+
18020+ preempt_disable();
18021+ barrier();
18022+ cr0 = read_cr0() ^ X86_CR0_WP;
18023+ BUG_ON(cr0 & X86_CR0_WP);
18024+ write_cr0(cr0);
18025+ barrier();
18026+ return cr0 ^ X86_CR0_WP;
18027+}
18028+
18029+static inline unsigned long native_pax_close_kernel(void)
18030+{
18031+ unsigned long cr0;
18032+
18033+ barrier();
18034+ cr0 = read_cr0() ^ X86_CR0_WP;
18035+ BUG_ON(!(cr0 & X86_CR0_WP));
18036+ write_cr0(cr0);
18037+ barrier();
18038+ preempt_enable_no_resched();
18039+ return cr0 ^ X86_CR0_WP;
18040+}
18041+#else
18042+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18043+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18044+#endif
18045+
18046 /*
18047 * The following only work if pte_present() is true.
18048 * Undefined behaviour if not..
18049 */
18050+static inline int pte_user(pte_t pte)
18051+{
18052+ return pte_val(pte) & _PAGE_USER;
18053+}
18054+
18055 static inline int pte_dirty(pte_t pte)
18056 {
18057 return pte_flags(pte) & _PAGE_DIRTY;
18058@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18059 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18060 }
18061
18062+static inline unsigned long pgd_pfn(pgd_t pgd)
18063+{
18064+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18065+}
18066+
18067 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18068
18069 static inline int pmd_large(pmd_t pte)
18070@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18071 return pte_clear_flags(pte, _PAGE_RW);
18072 }
18073
18074+static inline pte_t pte_mkread(pte_t pte)
18075+{
18076+ return __pte(pte_val(pte) | _PAGE_USER);
18077+}
18078+
18079 static inline pte_t pte_mkexec(pte_t pte)
18080 {
18081- return pte_clear_flags(pte, _PAGE_NX);
18082+#ifdef CONFIG_X86_PAE
18083+ if (__supported_pte_mask & _PAGE_NX)
18084+ return pte_clear_flags(pte, _PAGE_NX);
18085+ else
18086+#endif
18087+ return pte_set_flags(pte, _PAGE_USER);
18088+}
18089+
18090+static inline pte_t pte_exprotect(pte_t pte)
18091+{
18092+#ifdef CONFIG_X86_PAE
18093+ if (__supported_pte_mask & _PAGE_NX)
18094+ return pte_set_flags(pte, _PAGE_NX);
18095+ else
18096+#endif
18097+ return pte_clear_flags(pte, _PAGE_USER);
18098 }
18099
18100 static inline pte_t pte_mkdirty(pte_t pte)
18101@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18102 #endif
18103
18104 #ifndef __ASSEMBLY__
18105+
18106+#ifdef CONFIG_PAX_PER_CPU_PGD
18107+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18108+enum cpu_pgd_type {kernel = 0, user = 1};
18109+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18110+{
18111+ return cpu_pgd[cpu][type];
18112+}
18113+#endif
18114+
18115 #include <linux/mm_types.h>
18116 #include <linux/mmdebug.h>
18117 #include <linux/log2.h>
18118@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18119 * Currently stuck as a macro due to indirect forward reference to
18120 * linux/mmzone.h's __section_mem_map_addr() definition:
18121 */
18122-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18123+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18124
18125 /* Find an entry in the second-level page table.. */
18126 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18127@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18128 * Currently stuck as a macro due to indirect forward reference to
18129 * linux/mmzone.h's __section_mem_map_addr() definition:
18130 */
18131-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18132+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18133
18134 /* to find an entry in a page-table-directory. */
18135 static inline unsigned long pud_index(unsigned long address)
18136@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18137
18138 static inline int pgd_bad(pgd_t pgd)
18139 {
18140- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18141+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18142 }
18143
18144 static inline int pgd_none(pgd_t pgd)
18145@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18146 * pgd_offset() returns a (pgd_t *)
18147 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18148 */
18149-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18150+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18151+
18152+#ifdef CONFIG_PAX_PER_CPU_PGD
18153+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18154+#endif
18155+
18156 /*
18157 * a shortcut which implies the use of the kernel's pgd, instead
18158 * of a process's
18159@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18160 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18161 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18162
18163+#ifdef CONFIG_X86_32
18164+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18165+#else
18166+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18167+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18168+
18169+#ifdef CONFIG_PAX_MEMORY_UDEREF
18170+#ifdef __ASSEMBLY__
18171+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18172+#else
18173+extern unsigned long pax_user_shadow_base;
18174+extern pgdval_t clone_pgd_mask;
18175+#endif
18176+#else
18177+#define pax_user_shadow_base (0UL)
18178+#endif
18179+
18180+#endif
18181+
18182 #ifndef __ASSEMBLY__
18183
18184 extern int direct_gbpages;
18185@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18186 * dst and src can be on the same page, but the range must not overlap,
18187 * and must not cross a page boundary.
18188 */
18189-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18190+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18191 {
18192- memcpy(dst, src, count * sizeof(pgd_t));
18193+ pax_open_kernel();
18194+ while (count--)
18195+ *dst++ = *src++;
18196+ pax_close_kernel();
18197 }
18198
18199+#ifdef CONFIG_PAX_PER_CPU_PGD
18200+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18201+#endif
18202+
18203+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18204+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18205+#else
18206+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18207+#endif
18208+
18209 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18210 static inline int page_level_shift(enum pg_level level)
18211 {
18212diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18213index b6c0b40..3535d47 100644
18214--- a/arch/x86/include/asm/pgtable_32.h
18215+++ b/arch/x86/include/asm/pgtable_32.h
18216@@ -25,9 +25,6 @@
18217 struct mm_struct;
18218 struct vm_area_struct;
18219
18220-extern pgd_t swapper_pg_dir[1024];
18221-extern pgd_t initial_page_table[1024];
18222-
18223 static inline void pgtable_cache_init(void) { }
18224 static inline void check_pgt_cache(void) { }
18225 void paging_init(void);
18226@@ -45,6 +42,12 @@ void paging_init(void);
18227 # include <asm/pgtable-2level.h>
18228 #endif
18229
18230+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18231+extern pgd_t initial_page_table[PTRS_PER_PGD];
18232+#ifdef CONFIG_X86_PAE
18233+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18234+#endif
18235+
18236 #if defined(CONFIG_HIGHPTE)
18237 #define pte_offset_map(dir, address) \
18238 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18239@@ -59,12 +62,17 @@ void paging_init(void);
18240 /* Clear a kernel PTE and flush it from the TLB */
18241 #define kpte_clear_flush(ptep, vaddr) \
18242 do { \
18243+ pax_open_kernel(); \
18244 pte_clear(&init_mm, (vaddr), (ptep)); \
18245+ pax_close_kernel(); \
18246 __flush_tlb_one((vaddr)); \
18247 } while (0)
18248
18249 #endif /* !__ASSEMBLY__ */
18250
18251+#define HAVE_ARCH_UNMAPPED_AREA
18252+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18253+
18254 /*
18255 * kern_addr_valid() is (1) for FLATMEM and (0) for
18256 * SPARSEMEM and DISCONTIGMEM
18257diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18258index 9fb2f2b..b04b4bf 100644
18259--- a/arch/x86/include/asm/pgtable_32_types.h
18260+++ b/arch/x86/include/asm/pgtable_32_types.h
18261@@ -8,7 +8,7 @@
18262 */
18263 #ifdef CONFIG_X86_PAE
18264 # include <asm/pgtable-3level_types.h>
18265-# define PMD_SIZE (1UL << PMD_SHIFT)
18266+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18267 # define PMD_MASK (~(PMD_SIZE - 1))
18268 #else
18269 # include <asm/pgtable-2level_types.h>
18270@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18271 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18272 #endif
18273
18274+#ifdef CONFIG_PAX_KERNEXEC
18275+#ifndef __ASSEMBLY__
18276+extern unsigned char MODULES_EXEC_VADDR[];
18277+extern unsigned char MODULES_EXEC_END[];
18278+#endif
18279+#include <asm/boot.h>
18280+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18281+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18282+#else
18283+#define ktla_ktva(addr) (addr)
18284+#define ktva_ktla(addr) (addr)
18285+#endif
18286+
18287 #define MODULES_VADDR VMALLOC_START
18288 #define MODULES_END VMALLOC_END
18289 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18290diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18291index 2ee7811..55aca24 100644
18292--- a/arch/x86/include/asm/pgtable_64.h
18293+++ b/arch/x86/include/asm/pgtable_64.h
18294@@ -16,11 +16,16 @@
18295
18296 extern pud_t level3_kernel_pgt[512];
18297 extern pud_t level3_ident_pgt[512];
18298+extern pud_t level3_vmalloc_start_pgt[512];
18299+extern pud_t level3_vmalloc_end_pgt[512];
18300+extern pud_t level3_vmemmap_pgt[512];
18301+extern pud_t level2_vmemmap_pgt[512];
18302 extern pmd_t level2_kernel_pgt[512];
18303 extern pmd_t level2_fixmap_pgt[512];
18304-extern pmd_t level2_ident_pgt[512];
18305-extern pte_t level1_fixmap_pgt[512];
18306-extern pgd_t init_level4_pgt[];
18307+extern pmd_t level2_ident_pgt[2][512];
18308+extern pte_t level1_fixmap_pgt[3][512];
18309+extern pte_t level1_vsyscall_pgt[512];
18310+extern pgd_t init_level4_pgt[512];
18311
18312 #define swapper_pg_dir init_level4_pgt
18313
18314@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18315
18316 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18317 {
18318+ pax_open_kernel();
18319 *pmdp = pmd;
18320+ pax_close_kernel();
18321 }
18322
18323 static inline void native_pmd_clear(pmd_t *pmd)
18324@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18325
18326 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18327 {
18328+ pax_open_kernel();
18329 *pudp = pud;
18330+ pax_close_kernel();
18331 }
18332
18333 static inline void native_pud_clear(pud_t *pud)
18334@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18335
18336 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18337 {
18338+ pax_open_kernel();
18339+ *pgdp = pgd;
18340+ pax_close_kernel();
18341+}
18342+
18343+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18344+{
18345 *pgdp = pgd;
18346 }
18347
18348diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18349index e6844df..432b56e 100644
18350--- a/arch/x86/include/asm/pgtable_64_types.h
18351+++ b/arch/x86/include/asm/pgtable_64_types.h
18352@@ -60,11 +60,16 @@ typedef struct { pteval_t pte; } pte_t;
18353 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18354 #define MODULES_END _AC(0xffffffffff000000, UL)
18355 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18356+#define MODULES_EXEC_VADDR MODULES_VADDR
18357+#define MODULES_EXEC_END MODULES_END
18358 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18359 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18360 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18361 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18362
18363+#define ktla_ktva(addr) (addr)
18364+#define ktva_ktla(addr) (addr)
18365+
18366 #define EARLY_DYNAMIC_PAGE_TABLES 64
18367
18368 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18369diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18370index 78f0c8c..4424bb0 100644
18371--- a/arch/x86/include/asm/pgtable_types.h
18372+++ b/arch/x86/include/asm/pgtable_types.h
18373@@ -85,8 +85,10 @@
18374
18375 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18376 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18377-#else
18378+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18379 #define _PAGE_NX (_AT(pteval_t, 0))
18380+#else
18381+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18382 #endif
18383
18384 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18385@@ -141,6 +143,9 @@ enum page_cache_mode {
18386 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18387 _PAGE_ACCESSED)
18388
18389+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18390+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18391+
18392 #define __PAGE_KERNEL_EXEC \
18393 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18394 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18395@@ -148,7 +153,7 @@ enum page_cache_mode {
18396 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18397 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18398 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18399-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18400+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18401 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18402 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18403 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18404@@ -194,7 +199,7 @@ enum page_cache_mode {
18405 #ifdef CONFIG_X86_64
18406 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18407 #else
18408-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18409+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18410 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18411 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18412 #endif
18413@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18414 {
18415 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18416 }
18417+#endif
18418
18419+#if CONFIG_PGTABLE_LEVELS == 3
18420+#include <asm-generic/pgtable-nopud.h>
18421+#endif
18422+
18423+#if CONFIG_PGTABLE_LEVELS == 2
18424+#include <asm-generic/pgtable-nopmd.h>
18425+#endif
18426+
18427+#ifndef __ASSEMBLY__
18428 #if CONFIG_PGTABLE_LEVELS > 3
18429 typedef struct { pudval_t pud; } pud_t;
18430
18431@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18432 return pud.pud;
18433 }
18434 #else
18435-#include <asm-generic/pgtable-nopud.h>
18436-
18437 static inline pudval_t native_pud_val(pud_t pud)
18438 {
18439 return native_pgd_val(pud.pgd);
18440@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18441 return pmd.pmd;
18442 }
18443 #else
18444-#include <asm-generic/pgtable-nopmd.h>
18445-
18446 static inline pmdval_t native_pmd_val(pmd_t pmd)
18447 {
18448 return native_pgd_val(pmd.pud.pgd);
18449@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18450
18451 extern pteval_t __supported_pte_mask;
18452 extern void set_nx(void);
18453-extern int nx_enabled;
18454
18455 #define pgprot_writecombine pgprot_writecombine
18456 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18457diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18458index 8f327184..368fb29 100644
18459--- a/arch/x86/include/asm/preempt.h
18460+++ b/arch/x86/include/asm/preempt.h
18461@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18462 */
18463 static __always_inline bool __preempt_count_dec_and_test(void)
18464 {
18465- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18466+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18467 }
18468
18469 /*
18470diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18471index 23ba676..6584489 100644
18472--- a/arch/x86/include/asm/processor.h
18473+++ b/arch/x86/include/asm/processor.h
18474@@ -130,7 +130,7 @@ struct cpuinfo_x86 {
18475 /* Index into per_cpu list: */
18476 u16 cpu_index;
18477 u32 microcode;
18478-};
18479+} __randomize_layout;
18480
18481 #define X86_VENDOR_INTEL 0
18482 #define X86_VENDOR_CYRIX 1
18483@@ -201,9 +201,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18484 : "memory");
18485 }
18486
18487+/* invpcid (%rdx),%rax */
18488+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18489+
18490+#define INVPCID_SINGLE_ADDRESS 0UL
18491+#define INVPCID_SINGLE_CONTEXT 1UL
18492+#define INVPCID_ALL_GLOBAL 2UL
18493+#define INVPCID_ALL_NONGLOBAL 3UL
18494+
18495+#define PCID_KERNEL 0UL
18496+#define PCID_USER 1UL
18497+#define PCID_NOFLUSH (1UL << 63)
18498+
18499 static inline void load_cr3(pgd_t *pgdir)
18500 {
18501- write_cr3(__pa(pgdir));
18502+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18503 }
18504
18505 #ifdef CONFIG_X86_32
18506@@ -300,7 +312,7 @@ struct tss_struct {
18507
18508 } ____cacheline_aligned;
18509
18510-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss);
18511+extern struct tss_struct cpu_tss[NR_CPUS];
18512
18513 #ifdef CONFIG_X86_32
18514 DECLARE_PER_CPU(unsigned long, cpu_current_top_of_stack);
18515@@ -500,6 +512,7 @@ struct thread_struct {
18516 unsigned short ds;
18517 unsigned short fsindex;
18518 unsigned short gsindex;
18519+ unsigned short ss;
18520 #endif
18521 #ifdef CONFIG_X86_32
18522 unsigned long ip;
18523@@ -585,10 +598,10 @@ static inline void native_swapgs(void)
18524 #endif
18525 }
18526
18527-static inline unsigned long current_top_of_stack(void)
18528+static inline unsigned long current_top_of_stack(unsigned int cpu)
18529 {
18530 #ifdef CONFIG_X86_64
18531- return this_cpu_read_stable(cpu_tss.x86_tss.sp0);
18532+ return cpu_tss[cpu].x86_tss.sp0;
18533 #else
18534 /* sp0 on x86_32 is special in and around vm86 mode. */
18535 return this_cpu_read_stable(cpu_current_top_of_stack);
18536@@ -837,8 +850,15 @@ static inline void spin_lock_prefetch(const void *x)
18537 */
18538 #define TASK_SIZE PAGE_OFFSET
18539 #define TASK_SIZE_MAX TASK_SIZE
18540+
18541+#ifdef CONFIG_PAX_SEGMEXEC
18542+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18543+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18544+#else
18545 #define STACK_TOP TASK_SIZE
18546-#define STACK_TOP_MAX STACK_TOP
18547+#endif
18548+
18549+#define STACK_TOP_MAX TASK_SIZE
18550
18551 #define INIT_THREAD { \
18552 .sp0 = TOP_OF_INIT_STACK, \
18553@@ -859,12 +879,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18554 * "struct pt_regs" is possible, but they may contain the
18555 * completely wrong values.
18556 */
18557-#define task_pt_regs(task) \
18558-({ \
18559- unsigned long __ptr = (unsigned long)task_stack_page(task); \
18560- __ptr += THREAD_SIZE - TOP_OF_KERNEL_STACK_PADDING; \
18561- ((struct pt_regs *)__ptr) - 1; \
18562-})
18563+#define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1)
18564
18565 #define KSTK_ESP(task) (task_pt_regs(task)->sp)
18566
18567@@ -878,13 +893,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18568 * particular problem by preventing anything from being mapped
18569 * at the maximum canonical address.
18570 */
18571-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18572+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18573
18574 /* This decides where the kernel will search for a free chunk of vm
18575 * space during mmap's.
18576 */
18577 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18578- 0xc0000000 : 0xFFFFe000)
18579+ 0xc0000000 : 0xFFFFf000)
18580
18581 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18582 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18583@@ -918,6 +933,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18584 */
18585 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18586
18587+#ifdef CONFIG_PAX_SEGMEXEC
18588+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18589+#endif
18590+
18591 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18592
18593 /* Get/set a process' ability to use the timestamp counter instruction */
18594@@ -962,7 +981,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18595 return 0;
18596 }
18597
18598-extern unsigned long arch_align_stack(unsigned long sp);
18599+#define arch_align_stack(x) ((x) & ~0xfUL)
18600 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18601
18602 void default_idle(void);
18603@@ -972,6 +991,6 @@ bool xen_set_default_idle(void);
18604 #define xen_set_default_idle 0
18605 #endif
18606
18607-void stop_this_cpu(void *dummy);
18608+void stop_this_cpu(void *dummy) __noreturn;
18609 void df_debug(struct pt_regs *regs, long error_code);
18610 #endif /* _ASM_X86_PROCESSOR_H */
18611diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18612index 5fabf13..7388158 100644
18613--- a/arch/x86/include/asm/ptrace.h
18614+++ b/arch/x86/include/asm/ptrace.h
18615@@ -125,15 +125,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18616 #ifdef CONFIG_X86_64
18617 static inline bool user_64bit_mode(struct pt_regs *regs)
18618 {
18619+ unsigned long cs = regs->cs & 0xffff;
18620 #ifndef CONFIG_PARAVIRT
18621 /*
18622 * On non-paravirt systems, this is the only long mode CPL 3
18623 * selector. We do not allow long mode selectors in the LDT.
18624 */
18625- return regs->cs == __USER_CS;
18626+ return cs == __USER_CS;
18627 #else
18628 /* Headers are too twisted for this to go in paravirt.h. */
18629- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18630+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18631 #endif
18632 }
18633
18634@@ -180,9 +181,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18635 * Traps from the kernel do not save sp and ss.
18636 * Use the helper function to retrieve sp.
18637 */
18638- if (offset == offsetof(struct pt_regs, sp) &&
18639- regs->cs == __KERNEL_CS)
18640- return kernel_stack_pointer(regs);
18641+ if (offset == offsetof(struct pt_regs, sp)) {
18642+ unsigned long cs = regs->cs & 0xffff;
18643+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18644+ return kernel_stack_pointer(regs);
18645+ }
18646 #endif
18647 return *(unsigned long *)((unsigned long)regs + offset);
18648 }
18649diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18650index ae0e241..e80b10b 100644
18651--- a/arch/x86/include/asm/qrwlock.h
18652+++ b/arch/x86/include/asm/qrwlock.h
18653@@ -7,8 +7,8 @@
18654 #define queue_write_unlock queue_write_unlock
18655 static inline void queue_write_unlock(struct qrwlock *lock)
18656 {
18657- barrier();
18658- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18659+ barrier();
18660+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18661 }
18662 #endif
18663
18664diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18665index 9c6b890..5305f53 100644
18666--- a/arch/x86/include/asm/realmode.h
18667+++ b/arch/x86/include/asm/realmode.h
18668@@ -22,16 +22,14 @@ struct real_mode_header {
18669 #endif
18670 /* APM/BIOS reboot */
18671 u32 machine_real_restart_asm;
18672-#ifdef CONFIG_X86_64
18673 u32 machine_real_restart_seg;
18674-#endif
18675 };
18676
18677 /* This must match data at trampoline_32/64.S */
18678 struct trampoline_header {
18679 #ifdef CONFIG_X86_32
18680 u32 start;
18681- u16 gdt_pad;
18682+ u16 boot_cs;
18683 u16 gdt_limit;
18684 u32 gdt_base;
18685 #else
18686diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18687index a82c4f1..ac45053 100644
18688--- a/arch/x86/include/asm/reboot.h
18689+++ b/arch/x86/include/asm/reboot.h
18690@@ -6,13 +6,13 @@
18691 struct pt_regs;
18692
18693 struct machine_ops {
18694- void (*restart)(char *cmd);
18695- void (*halt)(void);
18696- void (*power_off)(void);
18697+ void (* __noreturn restart)(char *cmd);
18698+ void (* __noreturn halt)(void);
18699+ void (* __noreturn power_off)(void);
18700 void (*shutdown)(void);
18701 void (*crash_shutdown)(struct pt_regs *);
18702- void (*emergency_restart)(void);
18703-};
18704+ void (* __noreturn emergency_restart)(void);
18705+} __no_const;
18706
18707 extern struct machine_ops machine_ops;
18708
18709diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18710index 8f7866a..e442f20 100644
18711--- a/arch/x86/include/asm/rmwcc.h
18712+++ b/arch/x86/include/asm/rmwcc.h
18713@@ -3,7 +3,34 @@
18714
18715 #ifdef CC_HAVE_ASM_GOTO
18716
18717-#define __GEN_RMWcc(fullop, var, cc, ...) \
18718+#ifdef CONFIG_PAX_REFCOUNT
18719+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18720+do { \
18721+ asm_volatile_goto (fullop \
18722+ ";jno 0f\n" \
18723+ fullantiop \
18724+ ";int $4\n0:\n" \
18725+ _ASM_EXTABLE(0b, 0b) \
18726+ ";j" cc " %l[cc_label]" \
18727+ : : "m" (var), ## __VA_ARGS__ \
18728+ : "memory" : cc_label); \
18729+ return 0; \
18730+cc_label: \
18731+ return 1; \
18732+} while (0)
18733+#else
18734+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18735+do { \
18736+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18737+ : : "m" (var), ## __VA_ARGS__ \
18738+ : "memory" : cc_label); \
18739+ return 0; \
18740+cc_label: \
18741+ return 1; \
18742+} while (0)
18743+#endif
18744+
18745+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18746 do { \
18747 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18748 : : "m" (var), ## __VA_ARGS__ \
18749@@ -13,15 +40,46 @@ cc_label: \
18750 return 1; \
18751 } while (0)
18752
18753-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18754- __GEN_RMWcc(op " " arg0, var, cc)
18755+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18756+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18757
18758-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18759- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18760+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18761+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18762+
18763+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18764+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18765+
18766+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18767+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18768
18769 #else /* !CC_HAVE_ASM_GOTO */
18770
18771-#define __GEN_RMWcc(fullop, var, cc, ...) \
18772+#ifdef CONFIG_PAX_REFCOUNT
18773+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18774+do { \
18775+ char c; \
18776+ asm volatile (fullop \
18777+ ";jno 0f\n" \
18778+ fullantiop \
18779+ ";int $4\n0:\n" \
18780+ _ASM_EXTABLE(0b, 0b) \
18781+ "; set" cc " %1" \
18782+ : "+m" (var), "=qm" (c) \
18783+ : __VA_ARGS__ : "memory"); \
18784+ return c != 0; \
18785+} while (0)
18786+#else
18787+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18788+do { \
18789+ char c; \
18790+ asm volatile (fullop "; set" cc " %1" \
18791+ : "+m" (var), "=qm" (c) \
18792+ : __VA_ARGS__ : "memory"); \
18793+ return c != 0; \
18794+} while (0)
18795+#endif
18796+
18797+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18798 do { \
18799 char c; \
18800 asm volatile (fullop "; set" cc " %1" \
18801@@ -30,11 +88,17 @@ do { \
18802 return c != 0; \
18803 } while (0)
18804
18805-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18806- __GEN_RMWcc(op " " arg0, var, cc)
18807+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18808+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18809+
18810+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18811+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18812+
18813+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18814+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18815
18816-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18817- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18818+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18819+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18820
18821 #endif /* CC_HAVE_ASM_GOTO */
18822
18823diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18824index cad82c9..2e5c5c1 100644
18825--- a/arch/x86/include/asm/rwsem.h
18826+++ b/arch/x86/include/asm/rwsem.h
18827@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18828 {
18829 asm volatile("# beginning down_read\n\t"
18830 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18831+
18832+#ifdef CONFIG_PAX_REFCOUNT
18833+ "jno 0f\n"
18834+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18835+ "int $4\n0:\n"
18836+ _ASM_EXTABLE(0b, 0b)
18837+#endif
18838+
18839 /* adds 0x00000001 */
18840 " jns 1f\n"
18841 " call call_rwsem_down_read_failed\n"
18842@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18843 "1:\n\t"
18844 " mov %1,%2\n\t"
18845 " add %3,%2\n\t"
18846+
18847+#ifdef CONFIG_PAX_REFCOUNT
18848+ "jno 0f\n"
18849+ "sub %3,%2\n"
18850+ "int $4\n0:\n"
18851+ _ASM_EXTABLE(0b, 0b)
18852+#endif
18853+
18854 " jle 2f\n\t"
18855 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18856 " jnz 1b\n\t"
18857@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18858 long tmp;
18859 asm volatile("# beginning down_write\n\t"
18860 LOCK_PREFIX " xadd %1,(%2)\n\t"
18861+
18862+#ifdef CONFIG_PAX_REFCOUNT
18863+ "jno 0f\n"
18864+ "mov %1,(%2)\n"
18865+ "int $4\n0:\n"
18866+ _ASM_EXTABLE(0b, 0b)
18867+#endif
18868+
18869 /* adds 0xffff0001, returns the old value */
18870 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18871 /* was the active mask 0 before? */
18872@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18873 long tmp;
18874 asm volatile("# beginning __up_read\n\t"
18875 LOCK_PREFIX " xadd %1,(%2)\n\t"
18876+
18877+#ifdef CONFIG_PAX_REFCOUNT
18878+ "jno 0f\n"
18879+ "mov %1,(%2)\n"
18880+ "int $4\n0:\n"
18881+ _ASM_EXTABLE(0b, 0b)
18882+#endif
18883+
18884 /* subtracts 1, returns the old value */
18885 " jns 1f\n\t"
18886 " call call_rwsem_wake\n" /* expects old value in %edx */
18887@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18888 long tmp;
18889 asm volatile("# beginning __up_write\n\t"
18890 LOCK_PREFIX " xadd %1,(%2)\n\t"
18891+
18892+#ifdef CONFIG_PAX_REFCOUNT
18893+ "jno 0f\n"
18894+ "mov %1,(%2)\n"
18895+ "int $4\n0:\n"
18896+ _ASM_EXTABLE(0b, 0b)
18897+#endif
18898+
18899 /* subtracts 0xffff0001, returns the old value */
18900 " jns 1f\n\t"
18901 " call call_rwsem_wake\n" /* expects old value in %edx */
18902@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18903 {
18904 asm volatile("# beginning __downgrade_write\n\t"
18905 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18906+
18907+#ifdef CONFIG_PAX_REFCOUNT
18908+ "jno 0f\n"
18909+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18910+ "int $4\n0:\n"
18911+ _ASM_EXTABLE(0b, 0b)
18912+#endif
18913+
18914 /*
18915 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18916 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18917@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18918 */
18919 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18920 {
18921- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18922+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18923+
18924+#ifdef CONFIG_PAX_REFCOUNT
18925+ "jno 0f\n"
18926+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18927+ "int $4\n0:\n"
18928+ _ASM_EXTABLE(0b, 0b)
18929+#endif
18930+
18931 : "+m" (sem->count)
18932 : "er" (delta));
18933 }
18934@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18935 */
18936 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18937 {
18938- return delta + xadd(&sem->count, delta);
18939+ return delta + xadd_check_overflow(&sem->count, delta);
18940 }
18941
18942 #endif /* __KERNEL__ */
18943diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18944index 7d5a192..23ef1aa 100644
18945--- a/arch/x86/include/asm/segment.h
18946+++ b/arch/x86/include/asm/segment.h
18947@@ -82,14 +82,20 @@
18948 * 26 - ESPFIX small SS
18949 * 27 - per-cpu [ offset to per-cpu data area ]
18950 * 28 - stack_canary-20 [ for stack protector ] <=== cacheline #8
18951- * 29 - unused
18952- * 30 - unused
18953+ * 29 - PCI BIOS CS
18954+ * 30 - PCI BIOS DS
18955 * 31 - TSS for double fault handler
18956 */
18957+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
18958+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
18959+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
18960+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
18961+
18962 #define GDT_ENTRY_TLS_MIN 6
18963 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
18964
18965 #define GDT_ENTRY_KERNEL_CS 12
18966+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 4
18967 #define GDT_ENTRY_KERNEL_DS 13
18968 #define GDT_ENTRY_DEFAULT_USER_CS 14
18969 #define GDT_ENTRY_DEFAULT_USER_DS 15
18970@@ -106,6 +112,12 @@
18971 #define GDT_ENTRY_PERCPU 27
18972 #define GDT_ENTRY_STACK_CANARY 28
18973
18974+#define GDT_ENTRY_PCIBIOS_CS 29
18975+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
18976+
18977+#define GDT_ENTRY_PCIBIOS_DS 30
18978+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
18979+
18980 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
18981
18982 /*
18983@@ -118,6 +130,7 @@
18984 */
18985
18986 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
18987+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
18988 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
18989 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
18990 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8 + 3)
18991@@ -129,7 +142,7 @@
18992 #define PNP_CS16 (GDT_ENTRY_PNPBIOS_CS16*8)
18993
18994 /* "Is this PNP code selector (PNP_CS32 or PNP_CS16)?" */
18995-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == PNP_CS32)
18996+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
18997
18998 /* data segment for BIOS: */
18999 #define PNP_DS (GDT_ENTRY_PNPBIOS_DS*8)
19000@@ -176,6 +189,8 @@
19001 #define GDT_ENTRY_DEFAULT_USER_DS 5
19002 #define GDT_ENTRY_DEFAULT_USER_CS 6
19003
19004+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19005+
19006 /* Needs two entries */
19007 #define GDT_ENTRY_TSS 8
19008 /* Needs two entries */
19009@@ -187,10 +202,12 @@
19010 /* Abused to load per CPU data from limit */
19011 #define GDT_ENTRY_PER_CPU 15
19012
19013+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19014+
19015 /*
19016 * Number of entries in the GDT table:
19017 */
19018-#define GDT_ENTRIES 16
19019+#define GDT_ENTRIES 17
19020
19021 /*
19022 * Segment selector values corresponding to the above entries:
19023@@ -200,7 +217,9 @@
19024 */
19025 #define __KERNEL32_CS (GDT_ENTRY_KERNEL32_CS*8)
19026 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19027+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19028 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19029+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19030 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8 + 3)
19031 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
19032 #define __USER32_DS __USER_DS
19033diff --git a/arch/x86/include/asm/sigcontext.h b/arch/x86/include/asm/sigcontext.h
19034index 6fe6b18..9dfce4e 100644
19035--- a/arch/x86/include/asm/sigcontext.h
19036+++ b/arch/x86/include/asm/sigcontext.h
19037@@ -57,9 +57,9 @@ struct sigcontext {
19038 unsigned long ip;
19039 unsigned long flags;
19040 unsigned short cs;
19041- unsigned short __pad2; /* Was called gs, but was always zero. */
19042- unsigned short __pad1; /* Was called fs, but was always zero. */
19043- unsigned short ss;
19044+ unsigned short gs;
19045+ unsigned short fs;
19046+ unsigned short __pad0;
19047 unsigned long err;
19048 unsigned long trapno;
19049 unsigned long oldmask;
19050diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19051index ba665eb..0f72938 100644
19052--- a/arch/x86/include/asm/smap.h
19053+++ b/arch/x86/include/asm/smap.h
19054@@ -25,6 +25,18 @@
19055
19056 #include <asm/alternative-asm.h>
19057
19058+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19059+#define ASM_PAX_OPEN_USERLAND \
19060+ ALTERNATIVE "", "call __pax_open_userland", X86_FEATURE_STRONGUDEREF
19061+
19062+#define ASM_PAX_CLOSE_USERLAND \
19063+ ALTERNATIVE "", "call __pax_close_userland", X86_FEATURE_STRONGUDEREF
19064+
19065+#else
19066+#define ASM_PAX_OPEN_USERLAND
19067+#define ASM_PAX_CLOSE_USERLAND
19068+#endif
19069+
19070 #ifdef CONFIG_X86_SMAP
19071
19072 #define ASM_CLAC \
19073@@ -44,6 +56,37 @@
19074
19075 #include <asm/alternative.h>
19076
19077+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19078+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19079+
19080+extern void __pax_open_userland(void);
19081+static __always_inline unsigned long pax_open_userland(void)
19082+{
19083+
19084+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19085+ asm volatile(ALTERNATIVE("", "call %P[open]", X86_FEATURE_STRONGUDEREF)
19086+ :
19087+ : [open] "i" (__pax_open_userland)
19088+ : "memory", "rax");
19089+#endif
19090+
19091+ return 0;
19092+}
19093+
19094+extern void __pax_close_userland(void);
19095+static __always_inline unsigned long pax_close_userland(void)
19096+{
19097+
19098+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19099+ asm volatile(ALTERNATIVE("", "call %P[close]", X86_FEATURE_STRONGUDEREF)
19100+ :
19101+ : [close] "i" (__pax_close_userland)
19102+ : "memory", "rax");
19103+#endif
19104+
19105+ return 0;
19106+}
19107+
19108 #ifdef CONFIG_X86_SMAP
19109
19110 static __always_inline void clac(void)
19111diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19112index 17a8dce..79f7280 100644
19113--- a/arch/x86/include/asm/smp.h
19114+++ b/arch/x86/include/asm/smp.h
19115@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19116 /* cpus sharing the last level cache: */
19117 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19118 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19119-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19120+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19121
19122 static inline struct cpumask *cpu_sibling_mask(int cpu)
19123 {
19124@@ -78,7 +78,7 @@ struct smp_ops {
19125
19126 void (*send_call_func_ipi)(const struct cpumask *mask);
19127 void (*send_call_func_single_ipi)(int cpu);
19128-};
19129+} __no_const;
19130
19131 /* Globals due to paravirt */
19132 extern void set_cpu_sibling_map(int cpu);
19133@@ -192,14 +192,8 @@ extern unsigned disabled_cpus;
19134 extern int safe_smp_processor_id(void);
19135
19136 #elif defined(CONFIG_X86_64_SMP)
19137-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19138-
19139-#define stack_smp_processor_id() \
19140-({ \
19141- struct thread_info *ti; \
19142- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19143- ti->cpu; \
19144-})
19145+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19146+#define stack_smp_processor_id() raw_smp_processor_id()
19147 #define safe_smp_processor_id() smp_processor_id()
19148
19149 #endif
19150diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19151index 6a99859..03cb807 100644
19152--- a/arch/x86/include/asm/stackprotector.h
19153+++ b/arch/x86/include/asm/stackprotector.h
19154@@ -47,7 +47,7 @@
19155 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19156 */
19157 #define GDT_STACK_CANARY_INIT \
19158- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19159+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19160
19161 /*
19162 * Initialize the stackprotector canary value.
19163@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19164
19165 static inline void load_stack_canary_segment(void)
19166 {
19167-#ifdef CONFIG_X86_32
19168+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19169 asm volatile ("mov %0, %%gs" : : "r" (0));
19170 #endif
19171 }
19172diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19173index 70bbe39..4ae2bd4 100644
19174--- a/arch/x86/include/asm/stacktrace.h
19175+++ b/arch/x86/include/asm/stacktrace.h
19176@@ -11,28 +11,20 @@
19177
19178 extern int kstack_depth_to_print;
19179
19180-struct thread_info;
19181+struct task_struct;
19182 struct stacktrace_ops;
19183
19184-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19185- unsigned long *stack,
19186- unsigned long bp,
19187- const struct stacktrace_ops *ops,
19188- void *data,
19189- unsigned long *end,
19190- int *graph);
19191+typedef unsigned long walk_stack_t(struct task_struct *task,
19192+ void *stack_start,
19193+ unsigned long *stack,
19194+ unsigned long bp,
19195+ const struct stacktrace_ops *ops,
19196+ void *data,
19197+ unsigned long *end,
19198+ int *graph);
19199
19200-extern unsigned long
19201-print_context_stack(struct thread_info *tinfo,
19202- unsigned long *stack, unsigned long bp,
19203- const struct stacktrace_ops *ops, void *data,
19204- unsigned long *end, int *graph);
19205-
19206-extern unsigned long
19207-print_context_stack_bp(struct thread_info *tinfo,
19208- unsigned long *stack, unsigned long bp,
19209- const struct stacktrace_ops *ops, void *data,
19210- unsigned long *end, int *graph);
19211+extern walk_stack_t print_context_stack;
19212+extern walk_stack_t print_context_stack_bp;
19213
19214 /* Generic stack tracer with callbacks */
19215
19216@@ -40,7 +32,7 @@ struct stacktrace_ops {
19217 void (*address)(void *data, unsigned long address, int reliable);
19218 /* On negative return stop dumping */
19219 int (*stack)(void *data, char *name);
19220- walk_stack_t walk_stack;
19221+ walk_stack_t *walk_stack;
19222 };
19223
19224 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19225diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19226index 751bf4b..a1278b5 100644
19227--- a/arch/x86/include/asm/switch_to.h
19228+++ b/arch/x86/include/asm/switch_to.h
19229@@ -112,7 +112,7 @@ do { \
19230 "call __switch_to\n\t" \
19231 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19232 __switch_canary \
19233- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19234+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19235 "movq %%rax,%%rdi\n\t" \
19236 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19237 "jnz ret_from_fork\n\t" \
19238@@ -123,7 +123,7 @@ do { \
19239 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19240 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19241 [_tif_fork] "i" (_TIF_FORK), \
19242- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19243+ [thread_info] "m" (current_tinfo), \
19244 [current_task] "m" (current_task) \
19245 __switch_canary_iparam \
19246 : "memory", "cc" __EXTRA_CLOBBER)
19247diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19248index b4bdec3..e8af9bc 100644
19249--- a/arch/x86/include/asm/thread_info.h
19250+++ b/arch/x86/include/asm/thread_info.h
19251@@ -36,7 +36,7 @@
19252 #ifdef CONFIG_X86_32
19253 # define TOP_OF_KERNEL_STACK_PADDING 8
19254 #else
19255-# define TOP_OF_KERNEL_STACK_PADDING 0
19256+# define TOP_OF_KERNEL_STACK_PADDING 16
19257 #endif
19258
19259 /*
19260@@ -50,27 +50,26 @@ struct task_struct;
19261 #include <linux/atomic.h>
19262
19263 struct thread_info {
19264- struct task_struct *task; /* main task structure */
19265 __u32 flags; /* low level flags */
19266 __u32 status; /* thread synchronous flags */
19267 __u32 cpu; /* current CPU */
19268 int saved_preempt_count;
19269 mm_segment_t addr_limit;
19270 void __user *sysenter_return;
19271+ unsigned long lowest_stack;
19272 unsigned int sig_on_uaccess_error:1;
19273 unsigned int uaccess_err:1; /* uaccess failed */
19274 };
19275
19276-#define INIT_THREAD_INFO(tsk) \
19277+#define INIT_THREAD_INFO \
19278 { \
19279- .task = &tsk, \
19280 .flags = 0, \
19281 .cpu = 0, \
19282 .saved_preempt_count = INIT_PREEMPT_COUNT, \
19283 .addr_limit = KERNEL_DS, \
19284 }
19285
19286-#define init_thread_info (init_thread_union.thread_info)
19287+#define init_thread_info (init_thread_union.stack)
19288 #define init_stack (init_thread_union.stack)
19289
19290 #else /* !__ASSEMBLY__ */
19291@@ -110,6 +109,7 @@ struct thread_info {
19292 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19293 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19294 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19295+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19296
19297 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19298 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19299@@ -133,17 +133,18 @@ struct thread_info {
19300 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19301 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19302 #define _TIF_X32 (1 << TIF_X32)
19303+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19304
19305 /* work to do in syscall_trace_enter() */
19306 #define _TIF_WORK_SYSCALL_ENTRY \
19307 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19308 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19309- _TIF_NOHZ)
19310+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19311
19312 /* work to do in syscall_trace_leave() */
19313 #define _TIF_WORK_SYSCALL_EXIT \
19314 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19315- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19316+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19317
19318 /* work to do on interrupt/exception return */
19319 #define _TIF_WORK_MASK \
19320@@ -154,7 +155,7 @@ struct thread_info {
19321 /* work to do on any return to user space */
19322 #define _TIF_ALLWORK_MASK \
19323 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19324- _TIF_NOHZ)
19325+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19326
19327 /* Only used for 64 bit */
19328 #define _TIF_DO_NOTIFY_MASK \
19329@@ -179,9 +180,11 @@ struct thread_info {
19330
19331 DECLARE_PER_CPU(unsigned long, kernel_stack);
19332
19333+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19334+
19335 static inline struct thread_info *current_thread_info(void)
19336 {
19337- return (struct thread_info *)(current_top_of_stack() - THREAD_SIZE);
19338+ return this_cpu_read_stable(current_tinfo);
19339 }
19340
19341 static inline unsigned long current_stack_pointer(void)
19342@@ -199,8 +202,7 @@ static inline unsigned long current_stack_pointer(void)
19343
19344 /* Load thread_info address into "reg" */
19345 #define GET_THREAD_INFO(reg) \
19346- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19347- _ASM_SUB $(THREAD_SIZE),reg ;
19348+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19349
19350 /*
19351 * ASM operand which evaluates to a 'thread_info' address of
19352@@ -293,5 +295,12 @@ static inline bool is_ia32_task(void)
19353 extern void arch_task_cache_init(void);
19354 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19355 extern void arch_release_task_struct(struct task_struct *tsk);
19356+
19357+#define __HAVE_THREAD_FUNCTIONS
19358+#define task_thread_info(task) (&(task)->tinfo)
19359+#define task_stack_page(task) ((task)->stack)
19360+#define setup_thread_stack(p, org) do {} while (0)
19361+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19362+
19363 #endif
19364 #endif /* _ASM_X86_THREAD_INFO_H */
19365diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19366index cd79194..6a9956f 100644
19367--- a/arch/x86/include/asm/tlbflush.h
19368+++ b/arch/x86/include/asm/tlbflush.h
19369@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19370
19371 static inline void __native_flush_tlb(void)
19372 {
19373+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19374+ u64 descriptor[2];
19375+
19376+ descriptor[0] = PCID_KERNEL;
19377+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19378+ return;
19379+ }
19380+
19381+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19382+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19383+ unsigned int cpu = raw_get_cpu();
19384+
19385+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19386+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19387+ raw_put_cpu_no_resched();
19388+ return;
19389+ }
19390+#endif
19391+
19392 native_write_cr3(native_read_cr3());
19393 }
19394
19395 static inline void __native_flush_tlb_global_irq_disabled(void)
19396 {
19397- unsigned long cr4;
19398+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19399+ u64 descriptor[2];
19400
19401- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19402- /* clear PGE */
19403- native_write_cr4(cr4 & ~X86_CR4_PGE);
19404- /* write old PGE again and flush TLBs */
19405- native_write_cr4(cr4);
19406+ descriptor[0] = PCID_KERNEL;
19407+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19408+ } else {
19409+ unsigned long cr4;
19410+
19411+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19412+ /* clear PGE */
19413+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19414+ /* write old PGE again and flush TLBs */
19415+ native_write_cr4(cr4);
19416+ }
19417 }
19418
19419 static inline void __native_flush_tlb_global(void)
19420@@ -118,6 +144,43 @@ static inline void __native_flush_tlb_global(void)
19421
19422 static inline void __native_flush_tlb_single(unsigned long addr)
19423 {
19424+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19425+ u64 descriptor[2];
19426+
19427+ descriptor[0] = PCID_KERNEL;
19428+ descriptor[1] = addr;
19429+
19430+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19431+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19432+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19433+ if (addr < TASK_SIZE_MAX)
19434+ descriptor[1] += pax_user_shadow_base;
19435+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19436+ }
19437+
19438+ descriptor[0] = PCID_USER;
19439+ descriptor[1] = addr;
19440+ }
19441+#endif
19442+
19443+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19444+ return;
19445+ }
19446+
19447+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19448+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19449+ unsigned int cpu = raw_get_cpu();
19450+
19451+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19452+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19453+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19454+ raw_put_cpu_no_resched();
19455+
19456+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19457+ addr += pax_user_shadow_base;
19458+ }
19459+#endif
19460+
19461 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19462 }
19463
19464diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19465index ace9dec..3f9e253 100644
19466--- a/arch/x86/include/asm/uaccess.h
19467+++ b/arch/x86/include/asm/uaccess.h
19468@@ -7,6 +7,7 @@
19469 #include <linux/compiler.h>
19470 #include <linux/thread_info.h>
19471 #include <linux/string.h>
19472+#include <linux/spinlock.h>
19473 #include <asm/asm.h>
19474 #include <asm/page.h>
19475 #include <asm/smap.h>
19476@@ -29,7 +30,12 @@
19477
19478 #define get_ds() (KERNEL_DS)
19479 #define get_fs() (current_thread_info()->addr_limit)
19480+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19481+void __set_fs(mm_segment_t x);
19482+void set_fs(mm_segment_t x);
19483+#else
19484 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19485+#endif
19486
19487 #define segment_eq(a, b) ((a).seg == (b).seg)
19488
19489@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19490 * checks that the pointer is in the user space range - after calling
19491 * this function, memory access functions may still return -EFAULT.
19492 */
19493-#define access_ok(type, addr, size) \
19494- likely(!__range_not_ok(addr, size, user_addr_max()))
19495+extern int _cond_resched(void);
19496+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19497+#define access_ok(type, addr, size) \
19498+({ \
19499+ unsigned long __size = size; \
19500+ unsigned long __addr = (unsigned long)addr; \
19501+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19502+ if (__ret_ao && __size) { \
19503+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19504+ unsigned long __end_ao = __addr + __size - 1; \
19505+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19506+ while (__addr_ao <= __end_ao) { \
19507+ char __c_ao; \
19508+ __addr_ao += PAGE_SIZE; \
19509+ if (__size > PAGE_SIZE) \
19510+ _cond_resched(); \
19511+ if (__get_user(__c_ao, (char __user *)__addr)) \
19512+ break; \
19513+ if (type != VERIFY_WRITE) { \
19514+ __addr = __addr_ao; \
19515+ continue; \
19516+ } \
19517+ if (__put_user(__c_ao, (char __user *)__addr)) \
19518+ break; \
19519+ __addr = __addr_ao; \
19520+ } \
19521+ } \
19522+ } \
19523+ __ret_ao; \
19524+})
19525
19526 /*
19527 * The exception table consists of pairs of addresses relative to the
19528@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19529 extern int __get_user_bad(void);
19530
19531 /*
19532- * This is a type: either unsigned long, if the argument fits into
19533- * that type, or otherwise unsigned long long.
19534+ * This is a type: either (un)signed int, if the argument fits into
19535+ * that type, or otherwise (un)signed long long.
19536 */
19537 #define __inttype(x) \
19538-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19539+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19540+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19541+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19542
19543 /**
19544 * get_user: - Get a simple variable from user space.
19545@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19546 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19547 __chk_user_ptr(ptr); \
19548 might_fault(); \
19549+ pax_open_userland(); \
19550 asm volatile("call __get_user_%P3" \
19551 : "=a" (__ret_gu), "=r" (__val_gu) \
19552 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19553 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19554+ pax_close_userland(); \
19555 __ret_gu; \
19556 })
19557
19558@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19559 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19560 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19561
19562-
19563+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19564+#define __copyuser_seg "gs;"
19565+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19566+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19567+#else
19568+#define __copyuser_seg
19569+#define __COPYUSER_SET_ES
19570+#define __COPYUSER_RESTORE_ES
19571+#endif
19572
19573 #ifdef CONFIG_X86_32
19574 #define __put_user_asm_u64(x, addr, err, errret) \
19575 asm volatile(ASM_STAC "\n" \
19576- "1: movl %%eax,0(%2)\n" \
19577- "2: movl %%edx,4(%2)\n" \
19578+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19579+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19580 "3: " ASM_CLAC "\n" \
19581 ".section .fixup,\"ax\"\n" \
19582 "4: movl %3,%0\n" \
19583@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19584
19585 #define __put_user_asm_ex_u64(x, addr) \
19586 asm volatile(ASM_STAC "\n" \
19587- "1: movl %%eax,0(%1)\n" \
19588- "2: movl %%edx,4(%1)\n" \
19589+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19590+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19591 "3: " ASM_CLAC "\n" \
19592 _ASM_EXTABLE_EX(1b, 2b) \
19593 _ASM_EXTABLE_EX(2b, 3b) \
19594@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19595 __typeof__(*(ptr)) __pu_val; \
19596 __chk_user_ptr(ptr); \
19597 might_fault(); \
19598- __pu_val = x; \
19599+ __pu_val = (x); \
19600+ pax_open_userland(); \
19601 switch (sizeof(*(ptr))) { \
19602 case 1: \
19603 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19604@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19605 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19606 break; \
19607 } \
19608+ pax_close_userland(); \
19609 __ret_pu; \
19610 })
19611
19612@@ -355,8 +403,10 @@ do { \
19613 } while (0)
19614
19615 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19616+do { \
19617+ pax_open_userland(); \
19618 asm volatile(ASM_STAC "\n" \
19619- "1: mov"itype" %2,%"rtype"1\n" \
19620+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19621 "2: " ASM_CLAC "\n" \
19622 ".section .fixup,\"ax\"\n" \
19623 "3: mov %3,%0\n" \
19624@@ -364,8 +414,10 @@ do { \
19625 " jmp 2b\n" \
19626 ".previous\n" \
19627 _ASM_EXTABLE(1b, 3b) \
19628- : "=r" (err), ltype(x) \
19629- : "m" (__m(addr)), "i" (errret), "0" (err))
19630+ : "=r" (err), ltype (x) \
19631+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19632+ pax_close_userland(); \
19633+} while (0)
19634
19635 #define __get_user_size_ex(x, ptr, size) \
19636 do { \
19637@@ -389,7 +441,7 @@ do { \
19638 } while (0)
19639
19640 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19641- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19642+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19643 "2:\n" \
19644 _ASM_EXTABLE_EX(1b, 2b) \
19645 : ltype(x) : "m" (__m(addr)))
19646@@ -406,13 +458,24 @@ do { \
19647 int __gu_err; \
19648 unsigned long __gu_val; \
19649 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19650- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19651+ (x) = (__typeof__(*(ptr)))__gu_val; \
19652 __gu_err; \
19653 })
19654
19655 /* FIXME: this hack is definitely wrong -AK */
19656 struct __large_struct { unsigned long buf[100]; };
19657-#define __m(x) (*(struct __large_struct __user *)(x))
19658+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19659+#define ____m(x) \
19660+({ \
19661+ unsigned long ____x = (unsigned long)(x); \
19662+ if (____x < pax_user_shadow_base) \
19663+ ____x += pax_user_shadow_base; \
19664+ (typeof(x))____x; \
19665+})
19666+#else
19667+#define ____m(x) (x)
19668+#endif
19669+#define __m(x) (*(struct __large_struct __user *)____m(x))
19670
19671 /*
19672 * Tell gcc we read from memory instead of writing: this is because
19673@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19674 * aliasing issues.
19675 */
19676 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19677+do { \
19678+ pax_open_userland(); \
19679 asm volatile(ASM_STAC "\n" \
19680- "1: mov"itype" %"rtype"1,%2\n" \
19681+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19682 "2: " ASM_CLAC "\n" \
19683 ".section .fixup,\"ax\"\n" \
19684 "3: mov %3,%0\n" \
19685@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19686 ".previous\n" \
19687 _ASM_EXTABLE(1b, 3b) \
19688 : "=r"(err) \
19689- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19690+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19691+ pax_close_userland(); \
19692+} while (0)
19693
19694 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19695- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19696+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19697 "2:\n" \
19698 _ASM_EXTABLE_EX(1b, 2b) \
19699 : : ltype(x), "m" (__m(addr)))
19700@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19701 */
19702 #define uaccess_try do { \
19703 current_thread_info()->uaccess_err = 0; \
19704+ pax_open_userland(); \
19705 stac(); \
19706 barrier();
19707
19708 #define uaccess_catch(err) \
19709 clac(); \
19710+ pax_close_userland(); \
19711 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19712 } while (0)
19713
19714@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19715 * On error, the variable @x is set to zero.
19716 */
19717
19718+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19719+#define __get_user(x, ptr) get_user((x), (ptr))
19720+#else
19721 #define __get_user(x, ptr) \
19722 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19723+#endif
19724
19725 /**
19726 * __put_user: - Write a simple value into user space, with less checking.
19727@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19728 * Returns zero on success, or -EFAULT on error.
19729 */
19730
19731+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19732+#define __put_user(x, ptr) put_user((x), (ptr))
19733+#else
19734 #define __put_user(x, ptr) \
19735 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19736+#endif
19737
19738 #define __get_user_unaligned __get_user
19739 #define __put_user_unaligned __put_user
19740@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19741 #define get_user_ex(x, ptr) do { \
19742 unsigned long __gue_val; \
19743 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19744- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19745+ (x) = (__typeof__(*(ptr)))__gue_val; \
19746 } while (0)
19747
19748 #define put_user_try uaccess_try
19749@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19750 extern __must_check long strnlen_user(const char __user *str, long n);
19751
19752 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19753-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19754+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19755
19756 extern void __cmpxchg_wrong_size(void)
19757 __compiletime_error("Bad argument size for cmpxchg");
19758@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19759 __typeof__(ptr) __uval = (uval); \
19760 __typeof__(*(ptr)) __old = (old); \
19761 __typeof__(*(ptr)) __new = (new); \
19762+ pax_open_userland(); \
19763 switch (size) { \
19764 case 1: \
19765 { \
19766 asm volatile("\t" ASM_STAC "\n" \
19767- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19768+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19769 "2:\t" ASM_CLAC "\n" \
19770 "\t.section .fixup, \"ax\"\n" \
19771 "3:\tmov %3, %0\n" \
19772 "\tjmp 2b\n" \
19773 "\t.previous\n" \
19774 _ASM_EXTABLE(1b, 3b) \
19775- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19776+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19777 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19778 : "memory" \
19779 ); \
19780@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19781 case 2: \
19782 { \
19783 asm volatile("\t" ASM_STAC "\n" \
19784- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19785+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19786 "2:\t" ASM_CLAC "\n" \
19787 "\t.section .fixup, \"ax\"\n" \
19788 "3:\tmov %3, %0\n" \
19789 "\tjmp 2b\n" \
19790 "\t.previous\n" \
19791 _ASM_EXTABLE(1b, 3b) \
19792- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19793+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19794 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19795 : "memory" \
19796 ); \
19797@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19798 case 4: \
19799 { \
19800 asm volatile("\t" ASM_STAC "\n" \
19801- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19802+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19803 "2:\t" ASM_CLAC "\n" \
19804 "\t.section .fixup, \"ax\"\n" \
19805 "3:\tmov %3, %0\n" \
19806 "\tjmp 2b\n" \
19807 "\t.previous\n" \
19808 _ASM_EXTABLE(1b, 3b) \
19809- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19810+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19811 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19812 : "memory" \
19813 ); \
19814@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19815 __cmpxchg_wrong_size(); \
19816 \
19817 asm volatile("\t" ASM_STAC "\n" \
19818- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19819+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19820 "2:\t" ASM_CLAC "\n" \
19821 "\t.section .fixup, \"ax\"\n" \
19822 "3:\tmov %3, %0\n" \
19823 "\tjmp 2b\n" \
19824 "\t.previous\n" \
19825 _ASM_EXTABLE(1b, 3b) \
19826- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19827+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19828 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19829 : "memory" \
19830 ); \
19831@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19832 default: \
19833 __cmpxchg_wrong_size(); \
19834 } \
19835+ pax_close_userland(); \
19836 *__uval = __old; \
19837 __ret; \
19838 })
19839@@ -636,17 +715,6 @@ extern struct movsl_mask {
19840
19841 #define ARCH_HAS_NOCACHE_UACCESS 1
19842
19843-#ifdef CONFIG_X86_32
19844-# include <asm/uaccess_32.h>
19845-#else
19846-# include <asm/uaccess_64.h>
19847-#endif
19848-
19849-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19850- unsigned n);
19851-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19852- unsigned n);
19853-
19854 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19855 # define copy_user_diag __compiletime_error
19856 #else
19857@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19858 extern void copy_user_diag("copy_from_user() buffer size is too small")
19859 copy_from_user_overflow(void);
19860 extern void copy_user_diag("copy_to_user() buffer size is too small")
19861-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19862+copy_to_user_overflow(void);
19863
19864 #undef copy_user_diag
19865
19866@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19867
19868 extern void
19869 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19870-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19871+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19872 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19873
19874 #else
19875@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19876
19877 #endif
19878
19879+#ifdef CONFIG_X86_32
19880+# include <asm/uaccess_32.h>
19881+#else
19882+# include <asm/uaccess_64.h>
19883+#endif
19884+
19885 static inline unsigned long __must_check
19886 copy_from_user(void *to, const void __user *from, unsigned long n)
19887 {
19888- int sz = __compiletime_object_size(to);
19889+ size_t sz = __compiletime_object_size(to);
19890
19891 might_fault();
19892
19893@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19894 * case, and do only runtime checking for non-constant sizes.
19895 */
19896
19897- if (likely(sz < 0 || sz >= n))
19898- n = _copy_from_user(to, from, n);
19899- else if(__builtin_constant_p(n))
19900- copy_from_user_overflow();
19901- else
19902- __copy_from_user_overflow(sz, n);
19903+ if (likely(sz != (size_t)-1 && sz < n)) {
19904+ if(__builtin_constant_p(n))
19905+ copy_from_user_overflow();
19906+ else
19907+ __copy_from_user_overflow(sz, n);
19908+ } else if (access_ok(VERIFY_READ, from, n))
19909+ n = __copy_from_user(to, from, n);
19910+ else if ((long)n > 0)
19911+ memset(to, 0, n);
19912
19913 return n;
19914 }
19915@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19916 static inline unsigned long __must_check
19917 copy_to_user(void __user *to, const void *from, unsigned long n)
19918 {
19919- int sz = __compiletime_object_size(from);
19920+ size_t sz = __compiletime_object_size(from);
19921
19922 might_fault();
19923
19924 /* See the comment in copy_from_user() above. */
19925- if (likely(sz < 0 || sz >= n))
19926- n = _copy_to_user(to, from, n);
19927- else if(__builtin_constant_p(n))
19928- copy_to_user_overflow();
19929- else
19930- __copy_to_user_overflow(sz, n);
19931+ if (likely(sz != (size_t)-1 && sz < n)) {
19932+ if(__builtin_constant_p(n))
19933+ copy_to_user_overflow();
19934+ else
19935+ __copy_to_user_overflow(sz, n);
19936+ } else if (access_ok(VERIFY_WRITE, to, n))
19937+ n = __copy_to_user(to, from, n);
19938
19939 return n;
19940 }
19941diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19942index 3c03a5d..edb68ae 100644
19943--- a/arch/x86/include/asm/uaccess_32.h
19944+++ b/arch/x86/include/asm/uaccess_32.h
19945@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19946 * anything, so this is accurate.
19947 */
19948
19949-static __always_inline unsigned long __must_check
19950+static __always_inline __size_overflow(3) unsigned long __must_check
19951 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
19952 {
19953+ if ((long)n < 0)
19954+ return n;
19955+
19956+ check_object_size(from, n, true);
19957+
19958 if (__builtin_constant_p(n)) {
19959 unsigned long ret;
19960
19961@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
19962 __copy_to_user(void __user *to, const void *from, unsigned long n)
19963 {
19964 might_fault();
19965+
19966 return __copy_to_user_inatomic(to, from, n);
19967 }
19968
19969-static __always_inline unsigned long
19970+static __always_inline __size_overflow(3) unsigned long
19971 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
19972 {
19973+ if ((long)n < 0)
19974+ return n;
19975+
19976 /* Avoid zeroing the tail if the copy fails..
19977 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
19978 * but as the zeroing behaviour is only significant when n is not
19979@@ -137,6 +146,12 @@ static __always_inline unsigned long
19980 __copy_from_user(void *to, const void __user *from, unsigned long n)
19981 {
19982 might_fault();
19983+
19984+ if ((long)n < 0)
19985+ return n;
19986+
19987+ check_object_size(to, n, false);
19988+
19989 if (__builtin_constant_p(n)) {
19990 unsigned long ret;
19991
19992@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
19993 const void __user *from, unsigned long n)
19994 {
19995 might_fault();
19996+
19997+ if ((long)n < 0)
19998+ return n;
19999+
20000 if (__builtin_constant_p(n)) {
20001 unsigned long ret;
20002
20003@@ -181,7 +200,10 @@ static __always_inline unsigned long
20004 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20005 unsigned long n)
20006 {
20007- return __copy_from_user_ll_nocache_nozero(to, from, n);
20008+ if ((long)n < 0)
20009+ return n;
20010+
20011+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20012 }
20013
20014 #endif /* _ASM_X86_UACCESS_32_H */
20015diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20016index f2f9b39..2ae1bf8 100644
20017--- a/arch/x86/include/asm/uaccess_64.h
20018+++ b/arch/x86/include/asm/uaccess_64.h
20019@@ -10,6 +10,9 @@
20020 #include <asm/alternative.h>
20021 #include <asm/cpufeature.h>
20022 #include <asm/page.h>
20023+#include <asm/pgtable.h>
20024+
20025+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20026
20027 /*
20028 * Copy To/From Userspace
20029@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20030 __must_check unsigned long
20031 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20032
20033-static __always_inline __must_check unsigned long
20034-copy_user_generic(void *to, const void *from, unsigned len)
20035+static __always_inline __must_check __size_overflow(3) unsigned long
20036+copy_user_generic(void *to, const void *from, unsigned long len)
20037 {
20038 unsigned ret;
20039
20040@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20041 }
20042
20043 __must_check unsigned long
20044-copy_in_user(void __user *to, const void __user *from, unsigned len);
20045+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20046
20047 static __always_inline __must_check
20048-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20049+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20050 {
20051- int ret = 0;
20052+ size_t sz = __compiletime_object_size(dst);
20053+ unsigned ret = 0;
20054+
20055+ if (size > INT_MAX)
20056+ return size;
20057+
20058+ check_object_size(dst, size, false);
20059+
20060+#ifdef CONFIG_PAX_MEMORY_UDEREF
20061+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20062+ return size;
20063+#endif
20064+
20065+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20066+ if(__builtin_constant_p(size))
20067+ copy_from_user_overflow();
20068+ else
20069+ __copy_from_user_overflow(sz, size);
20070+ return size;
20071+ }
20072
20073 if (!__builtin_constant_p(size))
20074- return copy_user_generic(dst, (__force void *)src, size);
20075+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20076 switch (size) {
20077- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20078+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20079 ret, "b", "b", "=q", 1);
20080 return ret;
20081- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20082+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20083 ret, "w", "w", "=r", 2);
20084 return ret;
20085- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20086+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20087 ret, "l", "k", "=r", 4);
20088 return ret;
20089- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20090+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20091 ret, "q", "", "=r", 8);
20092 return ret;
20093 case 10:
20094- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20095+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20096 ret, "q", "", "=r", 10);
20097 if (unlikely(ret))
20098 return ret;
20099 __get_user_asm(*(u16 *)(8 + (char *)dst),
20100- (u16 __user *)(8 + (char __user *)src),
20101+ (const u16 __user *)(8 + (const char __user *)src),
20102 ret, "w", "w", "=r", 2);
20103 return ret;
20104 case 16:
20105- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20106+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20107 ret, "q", "", "=r", 16);
20108 if (unlikely(ret))
20109 return ret;
20110 __get_user_asm(*(u64 *)(8 + (char *)dst),
20111- (u64 __user *)(8 + (char __user *)src),
20112+ (const u64 __user *)(8 + (const char __user *)src),
20113 ret, "q", "", "=r", 8);
20114 return ret;
20115 default:
20116- return copy_user_generic(dst, (__force void *)src, size);
20117+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20118 }
20119 }
20120
20121 static __always_inline __must_check
20122-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20123+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20124 {
20125 might_fault();
20126 return __copy_from_user_nocheck(dst, src, size);
20127 }
20128
20129 static __always_inline __must_check
20130-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20131+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20132 {
20133- int ret = 0;
20134+ size_t sz = __compiletime_object_size(src);
20135+ unsigned ret = 0;
20136+
20137+ if (size > INT_MAX)
20138+ return size;
20139+
20140+ check_object_size(src, size, true);
20141+
20142+#ifdef CONFIG_PAX_MEMORY_UDEREF
20143+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20144+ return size;
20145+#endif
20146+
20147+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20148+ if(__builtin_constant_p(size))
20149+ copy_to_user_overflow();
20150+ else
20151+ __copy_to_user_overflow(sz, size);
20152+ return size;
20153+ }
20154
20155 if (!__builtin_constant_p(size))
20156- return copy_user_generic((__force void *)dst, src, size);
20157+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20158 switch (size) {
20159- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20160+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20161 ret, "b", "b", "iq", 1);
20162 return ret;
20163- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20164+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20165 ret, "w", "w", "ir", 2);
20166 return ret;
20167- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20168+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20169 ret, "l", "k", "ir", 4);
20170 return ret;
20171- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20172+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20173 ret, "q", "", "er", 8);
20174 return ret;
20175 case 10:
20176- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20177+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20178 ret, "q", "", "er", 10);
20179 if (unlikely(ret))
20180 return ret;
20181 asm("":::"memory");
20182- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20183+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20184 ret, "w", "w", "ir", 2);
20185 return ret;
20186 case 16:
20187- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20188+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20189 ret, "q", "", "er", 16);
20190 if (unlikely(ret))
20191 return ret;
20192 asm("":::"memory");
20193- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20194+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20195 ret, "q", "", "er", 8);
20196 return ret;
20197 default:
20198- return copy_user_generic((__force void *)dst, src, size);
20199+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20200 }
20201 }
20202
20203 static __always_inline __must_check
20204-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20205+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20206 {
20207 might_fault();
20208 return __copy_to_user_nocheck(dst, src, size);
20209 }
20210
20211 static __always_inline __must_check
20212-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20213+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20214 {
20215- int ret = 0;
20216+ unsigned ret = 0;
20217
20218 might_fault();
20219+
20220+ if (size > INT_MAX)
20221+ return size;
20222+
20223+#ifdef CONFIG_PAX_MEMORY_UDEREF
20224+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20225+ return size;
20226+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20227+ return size;
20228+#endif
20229+
20230 if (!__builtin_constant_p(size))
20231- return copy_user_generic((__force void *)dst,
20232- (__force void *)src, size);
20233+ return copy_user_generic((__force_kernel void *)____m(dst),
20234+ (__force_kernel const void *)____m(src), size);
20235 switch (size) {
20236 case 1: {
20237 u8 tmp;
20238- __get_user_asm(tmp, (u8 __user *)src,
20239+ __get_user_asm(tmp, (const u8 __user *)src,
20240 ret, "b", "b", "=q", 1);
20241 if (likely(!ret))
20242 __put_user_asm(tmp, (u8 __user *)dst,
20243@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20244 }
20245 case 2: {
20246 u16 tmp;
20247- __get_user_asm(tmp, (u16 __user *)src,
20248+ __get_user_asm(tmp, (const u16 __user *)src,
20249 ret, "w", "w", "=r", 2);
20250 if (likely(!ret))
20251 __put_user_asm(tmp, (u16 __user *)dst,
20252@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20253
20254 case 4: {
20255 u32 tmp;
20256- __get_user_asm(tmp, (u32 __user *)src,
20257+ __get_user_asm(tmp, (const u32 __user *)src,
20258 ret, "l", "k", "=r", 4);
20259 if (likely(!ret))
20260 __put_user_asm(tmp, (u32 __user *)dst,
20261@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20262 }
20263 case 8: {
20264 u64 tmp;
20265- __get_user_asm(tmp, (u64 __user *)src,
20266+ __get_user_asm(tmp, (const u64 __user *)src,
20267 ret, "q", "", "=r", 8);
20268 if (likely(!ret))
20269 __put_user_asm(tmp, (u64 __user *)dst,
20270@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20271 return ret;
20272 }
20273 default:
20274- return copy_user_generic((__force void *)dst,
20275- (__force void *)src, size);
20276+ return copy_user_generic((__force_kernel void *)____m(dst),
20277+ (__force_kernel const void *)____m(src), size);
20278 }
20279 }
20280
20281-static __must_check __always_inline int
20282-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20283+static __must_check __always_inline unsigned long
20284+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20285 {
20286 return __copy_from_user_nocheck(dst, src, size);
20287 }
20288
20289-static __must_check __always_inline int
20290-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20291+static __must_check __always_inline unsigned long
20292+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20293 {
20294 return __copy_to_user_nocheck(dst, src, size);
20295 }
20296
20297-extern long __copy_user_nocache(void *dst, const void __user *src,
20298- unsigned size, int zerorest);
20299+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20300+ unsigned long size, int zerorest);
20301
20302-static inline int
20303-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20304+static inline unsigned long
20305+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20306 {
20307 might_fault();
20308+
20309+ if (size > INT_MAX)
20310+ return size;
20311+
20312+#ifdef CONFIG_PAX_MEMORY_UDEREF
20313+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20314+ return size;
20315+#endif
20316+
20317 return __copy_user_nocache(dst, src, size, 1);
20318 }
20319
20320-static inline int
20321+static inline unsigned long
20322 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20323- unsigned size)
20324+ unsigned long size)
20325 {
20326+ if (size > INT_MAX)
20327+ return size;
20328+
20329+#ifdef CONFIG_PAX_MEMORY_UDEREF
20330+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20331+ return size;
20332+#endif
20333+
20334 return __copy_user_nocache(dst, src, size, 0);
20335 }
20336
20337 unsigned long
20338-copy_user_handle_tail(char *to, char *from, unsigned len);
20339+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20340
20341 #endif /* _ASM_X86_UACCESS_64_H */
20342diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20343index 5b238981..77fdd78 100644
20344--- a/arch/x86/include/asm/word-at-a-time.h
20345+++ b/arch/x86/include/asm/word-at-a-time.h
20346@@ -11,7 +11,7 @@
20347 * and shift, for example.
20348 */
20349 struct word_at_a_time {
20350- const unsigned long one_bits, high_bits;
20351+ unsigned long one_bits, high_bits;
20352 };
20353
20354 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20355diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20356index f58a9c7..dc378042a 100644
20357--- a/arch/x86/include/asm/x86_init.h
20358+++ b/arch/x86/include/asm/x86_init.h
20359@@ -129,7 +129,7 @@ struct x86_init_ops {
20360 struct x86_init_timers timers;
20361 struct x86_init_iommu iommu;
20362 struct x86_init_pci pci;
20363-};
20364+} __no_const;
20365
20366 /**
20367 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20368@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20369 void (*setup_percpu_clockev)(void);
20370 void (*early_percpu_clock_init)(void);
20371 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20372-};
20373+} __no_const;
20374
20375 struct timespec;
20376
20377@@ -168,7 +168,7 @@ struct x86_platform_ops {
20378 void (*save_sched_clock_state)(void);
20379 void (*restore_sched_clock_state)(void);
20380 void (*apic_post_init)(void);
20381-};
20382+} __no_const;
20383
20384 struct pci_dev;
20385 struct msi_msg;
20386@@ -182,7 +182,7 @@ struct x86_msi_ops {
20387 void (*teardown_msi_irqs)(struct pci_dev *dev);
20388 void (*restore_msi_irqs)(struct pci_dev *dev);
20389 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20390-};
20391+} __no_const;
20392
20393 struct IO_APIC_route_entry;
20394 struct io_apic_irq_attr;
20395@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20396 unsigned int destination, int vector,
20397 struct io_apic_irq_attr *attr);
20398 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20399-};
20400+} __no_const;
20401
20402 extern struct x86_init_ops x86_init;
20403 extern struct x86_cpuinit_ops x86_cpuinit;
20404diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20405index c44a5d5..7f83cfc 100644
20406--- a/arch/x86/include/asm/xen/page.h
20407+++ b/arch/x86/include/asm/xen/page.h
20408@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20409 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20410 * cases needing an extended handling.
20411 */
20412-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20413+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20414 {
20415 unsigned long mfn;
20416
20417diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20418index c9a6d68..cb57f42 100644
20419--- a/arch/x86/include/asm/xsave.h
20420+++ b/arch/x86/include/asm/xsave.h
20421@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20422 if (unlikely(err))
20423 return -EFAULT;
20424
20425+ pax_open_userland();
20426 __asm__ __volatile__(ASM_STAC "\n"
20427- "1:"XSAVE"\n"
20428+ "1:"
20429+ __copyuser_seg
20430+ XSAVE"\n"
20431 "2: " ASM_CLAC "\n"
20432 xstate_fault
20433 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20434 : "memory");
20435+ pax_close_userland();
20436 return err;
20437 }
20438
20439@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20440 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20441 {
20442 int err = 0;
20443- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20444+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20445 u32 lmask = mask;
20446 u32 hmask = mask >> 32;
20447
20448+ pax_open_userland();
20449 __asm__ __volatile__(ASM_STAC "\n"
20450- "1:"XRSTOR"\n"
20451+ "1:"
20452+ __copyuser_seg
20453+ XRSTOR"\n"
20454 "2: " ASM_CLAC "\n"
20455 xstate_fault
20456 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20457 : "memory"); /* memory required? */
20458+ pax_close_userland();
20459 return err;
20460 }
20461
20462diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20463index 960a8a9..404daf7 100644
20464--- a/arch/x86/include/uapi/asm/e820.h
20465+++ b/arch/x86/include/uapi/asm/e820.h
20466@@ -68,7 +68,7 @@ struct e820map {
20467 #define ISA_START_ADDRESS 0xa0000
20468 #define ISA_END_ADDRESS 0x100000
20469
20470-#define BIOS_BEGIN 0x000a0000
20471+#define BIOS_BEGIN 0x000c0000
20472 #define BIOS_END 0x00100000
20473
20474 #define BIOS_ROM_BASE 0xffe00000
20475diff --git a/arch/x86/include/uapi/asm/sigcontext.h b/arch/x86/include/uapi/asm/sigcontext.h
20476index 16dc4e8..d8b9f908 100644
20477--- a/arch/x86/include/uapi/asm/sigcontext.h
20478+++ b/arch/x86/include/uapi/asm/sigcontext.h
20479@@ -177,24 +177,9 @@ struct sigcontext {
20480 __u64 rip;
20481 __u64 eflags; /* RFLAGS */
20482 __u16 cs;
20483-
20484- /*
20485- * Prior to 2.5.64 ("[PATCH] x86-64 updates for 2.5.64-bk3"),
20486- * Linux saved and restored fs and gs in these slots. This
20487- * was counterproductive, as fsbase and gsbase were never
20488- * saved, so arch_prctl was presumably unreliable.
20489- *
20490- * If these slots are ever needed for any other purpose, there
20491- * is some risk that very old 64-bit binaries could get
20492- * confused. I doubt that many such binaries still work,
20493- * though, since the same patch in 2.5.64 also removed the
20494- * 64-bit set_thread_area syscall, so it appears that there is
20495- * no TLS API that works in both pre- and post-2.5.64 kernels.
20496- */
20497- __u16 __pad2; /* Was gs. */
20498- __u16 __pad1; /* Was fs. */
20499-
20500- __u16 ss;
20501+ __u16 gs;
20502+ __u16 fs;
20503+ __u16 __pad0;
20504 __u64 err;
20505 __u64 trapno;
20506 __u64 oldmask;
20507diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20508index 9bcd0b5..750f1b7 100644
20509--- a/arch/x86/kernel/Makefile
20510+++ b/arch/x86/kernel/Makefile
20511@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20512 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20513 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20514 obj-y += probe_roms.o
20515-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20516+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20517 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20518 obj-$(CONFIG_X86_64) += mcount_64.o
20519 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20520diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20521index dbe76a1..e2ec334 100644
20522--- a/arch/x86/kernel/acpi/boot.c
20523+++ b/arch/x86/kernel/acpi/boot.c
20524@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20525 * If your system is blacklisted here, but you find that acpi=force
20526 * works for you, please contact linux-acpi@vger.kernel.org
20527 */
20528-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20529+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20530 /*
20531 * Boxes that need ACPI disabled
20532 */
20533@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20534 };
20535
20536 /* second table for DMI checks that should run after early-quirks */
20537-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20538+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20539 /*
20540 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20541 * which includes some code which overrides all temperature
20542diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20543index d1daead..acd77e2 100644
20544--- a/arch/x86/kernel/acpi/sleep.c
20545+++ b/arch/x86/kernel/acpi/sleep.c
20546@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20547 #else /* CONFIG_64BIT */
20548 #ifdef CONFIG_SMP
20549 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20550+
20551+ pax_open_kernel();
20552 early_gdt_descr.address =
20553 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20554+ pax_close_kernel();
20555+
20556 initial_gs = per_cpu_offset(smp_processor_id());
20557 #endif
20558 initial_code = (unsigned long)wakeup_long64;
20559diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20560index 665c6b7..eae4d56 100644
20561--- a/arch/x86/kernel/acpi/wakeup_32.S
20562+++ b/arch/x86/kernel/acpi/wakeup_32.S
20563@@ -29,13 +29,11 @@ wakeup_pmode_return:
20564 # and restore the stack ... but you need gdt for this to work
20565 movl saved_context_esp, %esp
20566
20567- movl %cs:saved_magic, %eax
20568- cmpl $0x12345678, %eax
20569+ cmpl $0x12345678, saved_magic
20570 jne bogus_magic
20571
20572 # jump to place where we left off
20573- movl saved_eip, %eax
20574- jmp *%eax
20575+ jmp *(saved_eip)
20576
20577 bogus_magic:
20578 jmp bogus_magic
20579diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20580index aef6531..d7ca83a 100644
20581--- a/arch/x86/kernel/alternative.c
20582+++ b/arch/x86/kernel/alternative.c
20583@@ -248,7 +248,9 @@ static void __init_or_module add_nops(void *insns, unsigned int len)
20584 unsigned int noplen = len;
20585 if (noplen > ASM_NOP_MAX)
20586 noplen = ASM_NOP_MAX;
20587+ pax_open_kernel();
20588 memcpy(insns, ideal_nops[noplen], noplen);
20589+ pax_close_kernel();
20590 insns += noplen;
20591 len -= noplen;
20592 }
20593@@ -276,6 +278,13 @@ recompute_jump(struct alt_instr *a, u8 *orig_insn, u8 *repl_insn, u8 *insnbuf)
20594 if (a->replacementlen != 5)
20595 return;
20596
20597+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20598+ if (orig_insn < (u8 *)_text || (u8 *)_einittext <= orig_insn)
20599+ orig_insn = ktva_ktla(orig_insn);
20600+ else
20601+ orig_insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20602+#endif
20603+
20604 o_dspl = *(s32 *)(insnbuf + 1);
20605
20606 /* next_rip of the replacement JMP */
20607@@ -346,6 +355,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20608 {
20609 struct alt_instr *a;
20610 u8 *instr, *replacement;
20611+ u8 *vinstr, *vreplacement;
20612 u8 insnbuf[MAX_PATCH_LEN];
20613
20614 DPRINTK("alt table %p -> %p", start, end);
20615@@ -361,46 +371,71 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20616 for (a = start; a < end; a++) {
20617 int insnbuf_sz = 0;
20618
20619- instr = (u8 *)&a->instr_offset + a->instr_offset;
20620- replacement = (u8 *)&a->repl_offset + a->repl_offset;
20621+ vinstr = instr = (u8 *)&a->instr_offset + a->instr_offset;
20622+
20623+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20624+ if ((u8 *)_text - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR) <= instr &&
20625+ instr < (u8 *)_einittext - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR)) {
20626+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20627+ vinstr = ktla_ktva(instr);
20628+ } else if ((u8 *)_text <= instr && instr < (u8 *)_einittext) {
20629+ vinstr = ktla_ktva(instr);
20630+ } else {
20631+ instr = ktva_ktla(instr);
20632+ }
20633+#endif
20634+
20635+ vreplacement = replacement = (u8 *)&a->repl_offset + a->repl_offset;
20636+
20637+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20638+ if ((u8 *)_text - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR) <= replacement &&
20639+ replacement < (u8 *)_einittext - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR)) {
20640+ replacement += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20641+ vreplacement = ktla_ktva(replacement);
20642+ } else if ((u8 *)_text <= replacement && replacement < (u8 *)_einittext) {
20643+ vreplacement = ktla_ktva(replacement);
20644+ } else
20645+ replacement = ktva_ktla(replacement);
20646+#endif
20647+
20648 BUG_ON(a->instrlen > sizeof(insnbuf));
20649 BUG_ON(a->cpuid >= (NCAPINTS + NBUGINTS) * 32);
20650 if (!boot_cpu_has(a->cpuid)) {
20651 if (a->padlen > 1)
20652- optimize_nops(a, instr);
20653+ optimize_nops(a, vinstr);
20654
20655 continue;
20656 }
20657
20658- DPRINTK("feat: %d*32+%d, old: (%p, len: %d), repl: (%p, len: %d), pad: %d",
20659+ DPRINTK("feat: %d*32+%d, old: (%p/%p, len: %d), repl: (%p, len: %d), pad: %d",
20660 a->cpuid >> 5,
20661 a->cpuid & 0x1f,
20662- instr, a->instrlen,
20663- replacement, a->replacementlen, a->padlen);
20664+ instr, vinstr, a->instrlen,
20665+ vreplacement, a->replacementlen, a->padlen);
20666
20667- DUMP_BYTES(instr, a->instrlen, "%p: old_insn: ", instr);
20668- DUMP_BYTES(replacement, a->replacementlen, "%p: rpl_insn: ", replacement);
20669+ DUMP_BYTES(vinstr, a->instrlen, "%p: old_insn: ", vinstr);
20670+ DUMP_BYTES(vreplacement, a->replacementlen, "%p: rpl_insn: ", vreplacement);
20671
20672- memcpy(insnbuf, replacement, a->replacementlen);
20673+ memcpy(insnbuf, vreplacement, a->replacementlen);
20674 insnbuf_sz = a->replacementlen;
20675
20676 /* 0xe8 is a relative jump; fix the offset. */
20677 if (*insnbuf == 0xe8 && a->replacementlen == 5) {
20678- *(s32 *)(insnbuf + 1) += replacement - instr;
20679+ *(s32 *)(insnbuf + 1) += vreplacement - vinstr;
20680 DPRINTK("Fix CALL offset: 0x%x, CALL 0x%lx",
20681 *(s32 *)(insnbuf + 1),
20682- (unsigned long)instr + *(s32 *)(insnbuf + 1) + 5);
20683+ (unsigned long)vinstr + *(s32 *)(insnbuf + 1) + 5);
20684 }
20685
20686- if (a->replacementlen && is_jmp(replacement[0]))
20687- recompute_jump(a, instr, replacement, insnbuf);
20688+ if (a->replacementlen && is_jmp(vreplacement[0]))
20689+ recompute_jump(a, instr, vreplacement, insnbuf);
20690
20691 if (a->instrlen > a->replacementlen) {
20692 add_nops(insnbuf + a->replacementlen,
20693 a->instrlen - a->replacementlen);
20694 insnbuf_sz += a->instrlen - a->replacementlen;
20695 }
20696- DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", instr);
20697+ DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", vinstr);
20698
20699 text_poke_early(instr, insnbuf, insnbuf_sz);
20700 }
20701@@ -416,10 +451,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20702 for (poff = start; poff < end; poff++) {
20703 u8 *ptr = (u8 *)poff + *poff;
20704
20705+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20706+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20707+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20708+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20709+#endif
20710+
20711 if (!*poff || ptr < text || ptr >= text_end)
20712 continue;
20713 /* turn DS segment override prefix into lock prefix */
20714- if (*ptr == 0x3e)
20715+ if (*ktla_ktva(ptr) == 0x3e)
20716 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20717 }
20718 mutex_unlock(&text_mutex);
20719@@ -434,10 +475,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20720 for (poff = start; poff < end; poff++) {
20721 u8 *ptr = (u8 *)poff + *poff;
20722
20723+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20724+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20725+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20726+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20727+#endif
20728+
20729 if (!*poff || ptr < text || ptr >= text_end)
20730 continue;
20731 /* turn lock prefix into DS segment override prefix */
20732- if (*ptr == 0xf0)
20733+ if (*ktla_ktva(ptr) == 0xf0)
20734 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20735 }
20736 mutex_unlock(&text_mutex);
20737@@ -574,7 +621,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20738
20739 BUG_ON(p->len > MAX_PATCH_LEN);
20740 /* prep the buffer with the original instructions */
20741- memcpy(insnbuf, p->instr, p->len);
20742+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20743 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20744 (unsigned long)p->instr, p->len);
20745
20746@@ -621,7 +668,7 @@ void __init alternative_instructions(void)
20747 if (!uniproc_patched || num_possible_cpus() == 1)
20748 free_init_pages("SMP alternatives",
20749 (unsigned long)__smp_locks,
20750- (unsigned long)__smp_locks_end);
20751+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20752 #endif
20753
20754 apply_paravirt(__parainstructions, __parainstructions_end);
20755@@ -641,13 +688,17 @@ void __init alternative_instructions(void)
20756 * instructions. And on the local CPU you need to be protected again NMI or MCE
20757 * handlers seeing an inconsistent instruction while you patch.
20758 */
20759-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20760+void *__kprobes text_poke_early(void *addr, const void *opcode,
20761 size_t len)
20762 {
20763 unsigned long flags;
20764 local_irq_save(flags);
20765- memcpy(addr, opcode, len);
20766+
20767+ pax_open_kernel();
20768+ memcpy(ktla_ktva(addr), opcode, len);
20769 sync_core();
20770+ pax_close_kernel();
20771+
20772 local_irq_restore(flags);
20773 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20774 that causes hangs on some VIA CPUs. */
20775@@ -669,36 +720,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20776 */
20777 void *text_poke(void *addr, const void *opcode, size_t len)
20778 {
20779- unsigned long flags;
20780- char *vaddr;
20781+ unsigned char *vaddr = ktla_ktva(addr);
20782 struct page *pages[2];
20783- int i;
20784+ size_t i;
20785
20786 if (!core_kernel_text((unsigned long)addr)) {
20787- pages[0] = vmalloc_to_page(addr);
20788- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20789+ pages[0] = vmalloc_to_page(vaddr);
20790+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20791 } else {
20792- pages[0] = virt_to_page(addr);
20793+ pages[0] = virt_to_page(vaddr);
20794 WARN_ON(!PageReserved(pages[0]));
20795- pages[1] = virt_to_page(addr + PAGE_SIZE);
20796+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20797 }
20798 BUG_ON(!pages[0]);
20799- local_irq_save(flags);
20800- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20801- if (pages[1])
20802- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20803- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20804- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20805- clear_fixmap(FIX_TEXT_POKE0);
20806- if (pages[1])
20807- clear_fixmap(FIX_TEXT_POKE1);
20808- local_flush_tlb();
20809- sync_core();
20810- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20811- that causes hangs on some VIA CPUs. */
20812+ text_poke_early(addr, opcode, len);
20813 for (i = 0; i < len; i++)
20814- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20815- local_irq_restore(flags);
20816+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20817 return addr;
20818 }
20819
20820@@ -752,7 +789,7 @@ int poke_int3_handler(struct pt_regs *regs)
20821 */
20822 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20823 {
20824- unsigned char int3 = 0xcc;
20825+ const unsigned char int3 = 0xcc;
20826
20827 bp_int3_handler = handler;
20828 bp_int3_addr = (u8 *)addr + sizeof(int3);
20829diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20830index dcb5285..cc79e9d 100644
20831--- a/arch/x86/kernel/apic/apic.c
20832+++ b/arch/x86/kernel/apic/apic.c
20833@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20834 /*
20835 * Debug level, exported for io_apic.c
20836 */
20837-unsigned int apic_verbosity;
20838+int apic_verbosity;
20839
20840 int pic_mode;
20841
20842@@ -1857,7 +1857,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20843 apic_write(APIC_ESR, 0);
20844 v = apic_read(APIC_ESR);
20845 ack_APIC_irq();
20846- atomic_inc(&irq_err_count);
20847+ atomic_inc_unchecked(&irq_err_count);
20848
20849 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20850 smp_processor_id(), v);
20851diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20852index de918c4..32eed23 100644
20853--- a/arch/x86/kernel/apic/apic_flat_64.c
20854+++ b/arch/x86/kernel/apic/apic_flat_64.c
20855@@ -154,7 +154,7 @@ static int flat_probe(void)
20856 return 1;
20857 }
20858
20859-static struct apic apic_flat = {
20860+static struct apic apic_flat __read_only = {
20861 .name = "flat",
20862 .probe = flat_probe,
20863 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20864@@ -260,7 +260,7 @@ static int physflat_probe(void)
20865 return 0;
20866 }
20867
20868-static struct apic apic_physflat = {
20869+static struct apic apic_physflat __read_only = {
20870
20871 .name = "physical flat",
20872 .probe = physflat_probe,
20873diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20874index b205cdb..d8503ff 100644
20875--- a/arch/x86/kernel/apic/apic_noop.c
20876+++ b/arch/x86/kernel/apic/apic_noop.c
20877@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20878 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20879 }
20880
20881-struct apic apic_noop = {
20882+struct apic apic_noop __read_only = {
20883 .name = "noop",
20884 .probe = noop_probe,
20885 .acpi_madt_oem_check = NULL,
20886diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20887index c4a8d63..fe893ac 100644
20888--- a/arch/x86/kernel/apic/bigsmp_32.c
20889+++ b/arch/x86/kernel/apic/bigsmp_32.c
20890@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20891 return dmi_bigsmp;
20892 }
20893
20894-static struct apic apic_bigsmp = {
20895+static struct apic apic_bigsmp __read_only = {
20896
20897 .name = "bigsmp",
20898 .probe = probe_bigsmp,
20899diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20900index f4dc246..fbab133 100644
20901--- a/arch/x86/kernel/apic/io_apic.c
20902+++ b/arch/x86/kernel/apic/io_apic.c
20903@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20904 return ret;
20905 }
20906
20907-atomic_t irq_mis_count;
20908+atomic_unchecked_t irq_mis_count;
20909
20910 #ifdef CONFIG_GENERIC_PENDING_IRQ
20911 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20912@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20913 * at the cpu.
20914 */
20915 if (!(v & (1 << (i & 0x1f)))) {
20916- atomic_inc(&irq_mis_count);
20917+ atomic_inc_unchecked(&irq_mis_count);
20918
20919 eoi_ioapic_irq(irq, cfg);
20920 }
20921@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20922 ioapic_irqd_unmask(data, cfg, masked);
20923 }
20924
20925-static struct irq_chip ioapic_chip __read_mostly = {
20926+static struct irq_chip ioapic_chip = {
20927 .name = "IO-APIC",
20928 .irq_startup = startup_ioapic_irq,
20929 .irq_mask = mask_ioapic_irq,
20930@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20931 ack_APIC_irq();
20932 }
20933
20934-static struct irq_chip lapic_chip __read_mostly = {
20935+static struct irq_chip lapic_chip = {
20936 .name = "local-APIC",
20937 .irq_mask = mask_lapic_irq,
20938 .irq_unmask = unmask_lapic_irq,
20939diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20940index bda4886..f9c7195 100644
20941--- a/arch/x86/kernel/apic/probe_32.c
20942+++ b/arch/x86/kernel/apic/probe_32.c
20943@@ -72,7 +72,7 @@ static int probe_default(void)
20944 return 1;
20945 }
20946
20947-static struct apic apic_default = {
20948+static struct apic apic_default __read_only = {
20949
20950 .name = "default",
20951 .probe = probe_default,
20952diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20953index 6cedd79..023ff8e 100644
20954--- a/arch/x86/kernel/apic/vector.c
20955+++ b/arch/x86/kernel/apic/vector.c
20956@@ -21,7 +21,7 @@
20957
20958 static DEFINE_RAW_SPINLOCK(vector_lock);
20959
20960-void lock_vector_lock(void)
20961+void lock_vector_lock(void) __acquires(vector_lock)
20962 {
20963 /* Used to the online set of cpus does not change
20964 * during assign_irq_vector.
20965@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20966 raw_spin_lock(&vector_lock);
20967 }
20968
20969-void unlock_vector_lock(void)
20970+void unlock_vector_lock(void) __releases(vector_lock)
20971 {
20972 raw_spin_unlock(&vector_lock);
20973 }
20974diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20975index ab3219b..e8033eb 100644
20976--- a/arch/x86/kernel/apic/x2apic_cluster.c
20977+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20978@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20979 return notifier_from_errno(err);
20980 }
20981
20982-static struct notifier_block __refdata x2apic_cpu_notifier = {
20983+static struct notifier_block x2apic_cpu_notifier = {
20984 .notifier_call = update_clusterinfo,
20985 };
20986
20987@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20988 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20989 }
20990
20991-static struct apic apic_x2apic_cluster = {
20992+static struct apic apic_x2apic_cluster __read_only = {
20993
20994 .name = "cluster x2apic",
20995 .probe = x2apic_cluster_probe,
20996diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20997index 6fae733..5ca17af 100644
20998--- a/arch/x86/kernel/apic/x2apic_phys.c
20999+++ b/arch/x86/kernel/apic/x2apic_phys.c
21000@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
21001 return apic == &apic_x2apic_phys;
21002 }
21003
21004-static struct apic apic_x2apic_phys = {
21005+static struct apic apic_x2apic_phys __read_only = {
21006
21007 .name = "physical x2apic",
21008 .probe = x2apic_phys_probe,
21009diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
21010index c8d9295..9af2d03 100644
21011--- a/arch/x86/kernel/apic/x2apic_uv_x.c
21012+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
21013@@ -375,7 +375,7 @@ static int uv_probe(void)
21014 return apic == &apic_x2apic_uv_x;
21015 }
21016
21017-static struct apic __refdata apic_x2apic_uv_x = {
21018+static struct apic apic_x2apic_uv_x __read_only = {
21019
21020 .name = "UV large system",
21021 .probe = uv_probe,
21022diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
21023index 927ec92..de68f32 100644
21024--- a/arch/x86/kernel/apm_32.c
21025+++ b/arch/x86/kernel/apm_32.c
21026@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
21027 * This is for buggy BIOS's that refer to (real mode) segment 0x40
21028 * even though they are called in protected mode.
21029 */
21030-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
21031+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21032 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21033
21034 static const char driver_version[] = "1.16ac"; /* no spaces */
21035@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
21036 BUG_ON(cpu != 0);
21037 gdt = get_cpu_gdt_table(cpu);
21038 save_desc_40 = gdt[0x40 / 8];
21039+
21040+ pax_open_kernel();
21041 gdt[0x40 / 8] = bad_bios_desc;
21042+ pax_close_kernel();
21043
21044 apm_irq_save(flags);
21045 APM_DO_SAVE_SEGS;
21046@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
21047 &call->esi);
21048 APM_DO_RESTORE_SEGS;
21049 apm_irq_restore(flags);
21050+
21051+ pax_open_kernel();
21052 gdt[0x40 / 8] = save_desc_40;
21053+ pax_close_kernel();
21054+
21055 put_cpu();
21056
21057 return call->eax & 0xff;
21058@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21059 BUG_ON(cpu != 0);
21060 gdt = get_cpu_gdt_table(cpu);
21061 save_desc_40 = gdt[0x40 / 8];
21062+
21063+ pax_open_kernel();
21064 gdt[0x40 / 8] = bad_bios_desc;
21065+ pax_close_kernel();
21066
21067 apm_irq_save(flags);
21068 APM_DO_SAVE_SEGS;
21069@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21070 &call->eax);
21071 APM_DO_RESTORE_SEGS;
21072 apm_irq_restore(flags);
21073+
21074+ pax_open_kernel();
21075 gdt[0x40 / 8] = save_desc_40;
21076+ pax_close_kernel();
21077+
21078 put_cpu();
21079 return error;
21080 }
21081@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21082 return 0;
21083 }
21084
21085-static struct dmi_system_id __initdata apm_dmi_table[] = {
21086+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21087 {
21088 print_if_true,
21089 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21090@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21091 * code to that CPU.
21092 */
21093 gdt = get_cpu_gdt_table(0);
21094+
21095+ pax_open_kernel();
21096 set_desc_base(&gdt[APM_CS >> 3],
21097 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21098 set_desc_base(&gdt[APM_CS_16 >> 3],
21099 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21100 set_desc_base(&gdt[APM_DS >> 3],
21101 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21102+ pax_close_kernel();
21103
21104 proc_create("apm", 0, NULL, &apm_file_ops);
21105
21106diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21107index 9f6b934..cf5ffb3 100644
21108--- a/arch/x86/kernel/asm-offsets.c
21109+++ b/arch/x86/kernel/asm-offsets.c
21110@@ -32,6 +32,8 @@ void common(void) {
21111 OFFSET(TI_flags, thread_info, flags);
21112 OFFSET(TI_status, thread_info, status);
21113 OFFSET(TI_addr_limit, thread_info, addr_limit);
21114+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21115+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21116
21117 BLANK();
21118 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21119@@ -52,8 +54,26 @@ void common(void) {
21120 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21121 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21122 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21123+
21124+#ifdef CONFIG_PAX_KERNEXEC
21125+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21126 #endif
21127
21128+#ifdef CONFIG_PAX_MEMORY_UDEREF
21129+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21130+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21131+#ifdef CONFIG_X86_64
21132+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21133+#endif
21134+#endif
21135+
21136+#endif
21137+
21138+ BLANK();
21139+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21140+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21141+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21142+
21143 #ifdef CONFIG_XEN
21144 BLANK();
21145 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21146diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21147index 5ce6f2d..9e738f3 100644
21148--- a/arch/x86/kernel/asm-offsets_64.c
21149+++ b/arch/x86/kernel/asm-offsets_64.c
21150@@ -80,6 +80,7 @@ int main(void)
21151 BLANK();
21152 #undef ENTRY
21153
21154+ DEFINE(TSS_size, sizeof(struct tss_struct));
21155 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21156 OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
21157 BLANK();
21158diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21159index 9bff687..5b899fb 100644
21160--- a/arch/x86/kernel/cpu/Makefile
21161+++ b/arch/x86/kernel/cpu/Makefile
21162@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21163 CFLAGS_REMOVE_perf_event.o = -pg
21164 endif
21165
21166-# Make sure load_percpu_segment has no stackprotector
21167-nostackp := $(call cc-option, -fno-stack-protector)
21168-CFLAGS_common.o := $(nostackp)
21169-
21170 obj-y := intel_cacheinfo.o scattered.o topology.o
21171 obj-y += common.o
21172 obj-y += rdrand.o
21173diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21174index e4cf633..941f450 100644
21175--- a/arch/x86/kernel/cpu/amd.c
21176+++ b/arch/x86/kernel/cpu/amd.c
21177@@ -729,7 +729,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21178 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21179 {
21180 /* AMD errata T13 (order #21922) */
21181- if ((c->x86 == 6)) {
21182+ if (c->x86 == 6) {
21183 /* Duron Rev A0 */
21184 if (c->x86_model == 3 && c->x86_mask == 0)
21185 size = 64;
21186diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21187index a62cf04..a55415c 100644
21188--- a/arch/x86/kernel/cpu/common.c
21189+++ b/arch/x86/kernel/cpu/common.c
21190@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21191
21192 static const struct cpu_dev *this_cpu = &default_cpu;
21193
21194-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21195-#ifdef CONFIG_X86_64
21196- /*
21197- * We need valid kernel segments for data and code in long mode too
21198- * IRET will check the segment types kkeil 2000/10/28
21199- * Also sysret mandates a special GDT layout
21200- *
21201- * TLS descriptors are currently at a different place compared to i386.
21202- * Hopefully nobody expects them at a fixed place (Wine?)
21203- */
21204- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21205- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21206- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21207- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21208- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21209- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21210-#else
21211- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21212- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21213- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21214- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21215- /*
21216- * Segments used for calling PnP BIOS have byte granularity.
21217- * They code segments and data segments have fixed 64k limits,
21218- * the transfer segment sizes are set at run time.
21219- */
21220- /* 32-bit code */
21221- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21222- /* 16-bit code */
21223- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21224- /* 16-bit data */
21225- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21226- /* 16-bit data */
21227- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21228- /* 16-bit data */
21229- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21230- /*
21231- * The APM segments have byte granularity and their bases
21232- * are set at run time. All have 64k limits.
21233- */
21234- /* 32-bit code */
21235- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21236- /* 16-bit code */
21237- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21238- /* data */
21239- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21240-
21241- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21242- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21243- GDT_STACK_CANARY_INIT
21244-#endif
21245-} };
21246-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21247-
21248 static int __init x86_xsave_setup(char *s)
21249 {
21250 if (strlen(s))
21251@@ -306,6 +252,109 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21252 }
21253 }
21254
21255+#ifdef CONFIG_PAX_MEMORY_UDEREF
21256+#ifdef CONFIG_X86_64
21257+static bool uderef_enabled __read_only = true;
21258+unsigned long pax_user_shadow_base __read_only;
21259+EXPORT_SYMBOL(pax_user_shadow_base);
21260+extern char pax_enter_kernel_user[];
21261+extern char pax_exit_kernel_user[];
21262+
21263+static int __init setup_pax_weakuderef(char *str)
21264+{
21265+ if (uderef_enabled)
21266+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21267+ return 1;
21268+}
21269+__setup("pax_weakuderef", setup_pax_weakuderef);
21270+#endif
21271+
21272+static int __init setup_pax_nouderef(char *str)
21273+{
21274+#ifdef CONFIG_X86_32
21275+ unsigned int cpu;
21276+ struct desc_struct *gdt;
21277+
21278+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
21279+ gdt = get_cpu_gdt_table(cpu);
21280+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
21281+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
21282+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
21283+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
21284+ }
21285+ loadsegment(ds, __KERNEL_DS);
21286+ loadsegment(es, __KERNEL_DS);
21287+ loadsegment(ss, __KERNEL_DS);
21288+#else
21289+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
21290+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
21291+ clone_pgd_mask = ~(pgdval_t)0UL;
21292+ pax_user_shadow_base = 0UL;
21293+ setup_clear_cpu_cap(X86_FEATURE_PCIDUDEREF);
21294+ uderef_enabled = false;
21295+#endif
21296+
21297+ return 0;
21298+}
21299+early_param("pax_nouderef", setup_pax_nouderef);
21300+#endif
21301+
21302+#ifdef CONFIG_X86_64
21303+static __init int setup_disable_pcid(char *arg)
21304+{
21305+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21306+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21307+
21308+#ifdef CONFIG_PAX_MEMORY_UDEREF
21309+ if (uderef_enabled)
21310+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21311+#endif
21312+
21313+ return 1;
21314+}
21315+__setup("nopcid", setup_disable_pcid);
21316+
21317+static void setup_pcid(struct cpuinfo_x86 *c)
21318+{
21319+ if (cpu_has(c, X86_FEATURE_PCID)) {
21320+ printk("PAX: PCID detected\n");
21321+ cr4_set_bits(X86_CR4_PCIDE);
21322+ } else
21323+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21324+
21325+ if (cpu_has(c, X86_FEATURE_INVPCID))
21326+ printk("PAX: INVPCID detected\n");
21327+
21328+#ifdef CONFIG_PAX_MEMORY_UDEREF
21329+ if (!uderef_enabled) {
21330+ printk("PAX: UDEREF disabled\n");
21331+ return;
21332+ }
21333+
21334+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21335+ pax_open_kernel();
21336+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21337+ pax_close_kernel();
21338+ printk("PAX: slow and weak UDEREF enabled\n");
21339+ return;
21340+ }
21341+
21342+ set_cpu_cap(c, X86_FEATURE_PCIDUDEREF);
21343+
21344+ pax_open_kernel();
21345+ clone_pgd_mask = ~(pgdval_t)0UL;
21346+ pax_close_kernel();
21347+ if (pax_user_shadow_base)
21348+ printk("PAX: weak UDEREF enabled\n");
21349+ else {
21350+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21351+ printk("PAX: strong UDEREF enabled\n");
21352+ }
21353+#endif
21354+
21355+}
21356+#endif
21357+
21358 /*
21359 * Some CPU features depend on higher CPUID levels, which may not always
21360 * be available due to CPUID level capping or broken virtualization
21361@@ -406,7 +455,7 @@ void switch_to_new_gdt(int cpu)
21362 {
21363 struct desc_ptr gdt_descr;
21364
21365- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21366+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21367 gdt_descr.size = GDT_SIZE - 1;
21368 load_gdt(&gdt_descr);
21369 /* Reload the per-cpu base */
21370@@ -935,6 +984,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21371 setup_smep(c);
21372 setup_smap(c);
21373
21374+#ifdef CONFIG_X86_32
21375+#ifdef CONFIG_PAX_PAGEEXEC
21376+ if (!(__supported_pte_mask & _PAGE_NX))
21377+ clear_cpu_cap(c, X86_FEATURE_PSE);
21378+#endif
21379+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21380+ clear_cpu_cap(c, X86_FEATURE_SEP);
21381+#endif
21382+#endif
21383+
21384+#ifdef CONFIG_X86_64
21385+ setup_pcid(c);
21386+#endif
21387+
21388 /*
21389 * The vendor-specific functions might have changed features.
21390 * Now we do "generic changes."
21391@@ -1009,7 +1072,7 @@ void enable_sep_cpu(void)
21392 int cpu;
21393
21394 cpu = get_cpu();
21395- tss = &per_cpu(cpu_tss, cpu);
21396+ tss = cpu_tss + cpu;
21397
21398 if (!boot_cpu_has(X86_FEATURE_SEP))
21399 goto out;
21400@@ -1155,14 +1218,16 @@ static __init int setup_disablecpuid(char *arg)
21401 }
21402 __setup("clearcpuid=", setup_disablecpuid);
21403
21404+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21405+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21406+
21407 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21408- (unsigned long)&init_thread_union + THREAD_SIZE;
21409+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21410 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21411
21412 #ifdef CONFIG_X86_64
21413-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21414-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21415- (unsigned long) debug_idt_table };
21416+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21417+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21418
21419 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21420 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21421@@ -1367,7 +1432,7 @@ void cpu_init(void)
21422 */
21423 load_ucode_ap();
21424
21425- t = &per_cpu(cpu_tss, cpu);
21426+ t = cpu_tss + cpu;
21427 oist = &per_cpu(orig_ist, cpu);
21428
21429 #ifdef CONFIG_NUMA
21430@@ -1399,7 +1464,6 @@ void cpu_init(void)
21431 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21432 barrier();
21433
21434- x86_configure_nx();
21435 x2apic_setup();
21436
21437 /*
21438@@ -1451,7 +1515,7 @@ void cpu_init(void)
21439 {
21440 int cpu = smp_processor_id();
21441 struct task_struct *curr = current;
21442- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
21443+ struct tss_struct *t = cpu_tss + cpu;
21444 struct thread_struct *thread = &curr->thread;
21445
21446 wait_for_master_cpu(cpu);
21447diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21448index edcb0e2..a138233 100644
21449--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21450+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21451@@ -519,25 +519,23 @@ cache_private_attrs_is_visible(struct kobject *kobj,
21452 return 0;
21453 }
21454
21455+static struct attribute *amd_l3_attrs[4];
21456+
21457 static struct attribute_group cache_private_group = {
21458 .is_visible = cache_private_attrs_is_visible,
21459+ .attrs = amd_l3_attrs,
21460 };
21461
21462 static void init_amd_l3_attrs(void)
21463 {
21464 int n = 1;
21465- static struct attribute **amd_l3_attrs;
21466-
21467- if (amd_l3_attrs) /* already initialized */
21468- return;
21469
21470 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21471 n += 2;
21472 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21473 n += 1;
21474
21475- amd_l3_attrs = kcalloc(n, sizeof(*amd_l3_attrs), GFP_KERNEL);
21476- if (!amd_l3_attrs)
21477+ if (n > 1 && amd_l3_attrs[0]) /* already initialized */
21478 return;
21479
21480 n = 0;
21481@@ -547,8 +545,6 @@ static void init_amd_l3_attrs(void)
21482 }
21483 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21484 amd_l3_attrs[n++] = &dev_attr_subcaches.attr;
21485-
21486- cache_private_group.attrs = amd_l3_attrs;
21487 }
21488
21489 const struct attribute_group *
21490@@ -559,7 +555,7 @@ cache_get_priv_group(struct cacheinfo *this_leaf)
21491 if (this_leaf->level < 3 || !nb)
21492 return NULL;
21493
21494- if (nb && nb->l3_cache.indices)
21495+ if (nb->l3_cache.indices)
21496 init_amd_l3_attrs();
21497
21498 return &cache_private_group;
21499diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21500index 20190bd..cadb2ab 100644
21501--- a/arch/x86/kernel/cpu/mcheck/mce.c
21502+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21503@@ -47,6 +47,7 @@
21504 #include <asm/tlbflush.h>
21505 #include <asm/mce.h>
21506 #include <asm/msr.h>
21507+#include <asm/local.h>
21508
21509 #include "mce-internal.h"
21510
21511@@ -256,7 +257,7 @@ static void print_mce(struct mce *m)
21512 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21513 m->cs, m->ip);
21514
21515- if (m->cs == __KERNEL_CS)
21516+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21517 print_symbol("{%s}", m->ip);
21518 pr_cont("\n");
21519 }
21520@@ -289,10 +290,10 @@ static void print_mce(struct mce *m)
21521
21522 #define PANIC_TIMEOUT 5 /* 5 seconds */
21523
21524-static atomic_t mce_panicked;
21525+static atomic_unchecked_t mce_panicked;
21526
21527 static int fake_panic;
21528-static atomic_t mce_fake_panicked;
21529+static atomic_unchecked_t mce_fake_panicked;
21530
21531 /* Panic in progress. Enable interrupts and wait for final IPI */
21532 static void wait_for_panic(void)
21533@@ -316,7 +317,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21534 /*
21535 * Make sure only one CPU runs in machine check panic
21536 */
21537- if (atomic_inc_return(&mce_panicked) > 1)
21538+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21539 wait_for_panic();
21540 barrier();
21541
21542@@ -324,7 +325,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21543 console_verbose();
21544 } else {
21545 /* Don't log too much for fake panic */
21546- if (atomic_inc_return(&mce_fake_panicked) > 1)
21547+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21548 return;
21549 }
21550 /* First print corrected ones that are still unlogged */
21551@@ -363,7 +364,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21552 if (!fake_panic) {
21553 if (panic_timeout == 0)
21554 panic_timeout = mca_cfg.panic_timeout;
21555- panic(msg);
21556+ panic("%s", msg);
21557 } else
21558 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21559 }
21560@@ -749,7 +750,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21561 * might have been modified by someone else.
21562 */
21563 rmb();
21564- if (atomic_read(&mce_panicked))
21565+ if (atomic_read_unchecked(&mce_panicked))
21566 wait_for_panic();
21567 if (!mca_cfg.monarch_timeout)
21568 goto out;
21569@@ -1679,7 +1680,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21570 }
21571
21572 /* Call the installed machine check handler for this CPU setup. */
21573-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21574+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21575 unexpected_machine_check;
21576
21577 /*
21578@@ -1702,7 +1703,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21579 return;
21580 }
21581
21582+ pax_open_kernel();
21583 machine_check_vector = do_machine_check;
21584+ pax_close_kernel();
21585
21586 __mcheck_cpu_init_generic();
21587 __mcheck_cpu_init_vendor(c);
21588@@ -1716,7 +1719,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21589 */
21590
21591 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21592-static int mce_chrdev_open_count; /* #times opened */
21593+static local_t mce_chrdev_open_count; /* #times opened */
21594 static int mce_chrdev_open_exclu; /* already open exclusive? */
21595
21596 static int mce_chrdev_open(struct inode *inode, struct file *file)
21597@@ -1724,7 +1727,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21598 spin_lock(&mce_chrdev_state_lock);
21599
21600 if (mce_chrdev_open_exclu ||
21601- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21602+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21603 spin_unlock(&mce_chrdev_state_lock);
21604
21605 return -EBUSY;
21606@@ -1732,7 +1735,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21607
21608 if (file->f_flags & O_EXCL)
21609 mce_chrdev_open_exclu = 1;
21610- mce_chrdev_open_count++;
21611+ local_inc(&mce_chrdev_open_count);
21612
21613 spin_unlock(&mce_chrdev_state_lock);
21614
21615@@ -1743,7 +1746,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21616 {
21617 spin_lock(&mce_chrdev_state_lock);
21618
21619- mce_chrdev_open_count--;
21620+ local_dec(&mce_chrdev_open_count);
21621 mce_chrdev_open_exclu = 0;
21622
21623 spin_unlock(&mce_chrdev_state_lock);
21624@@ -2419,7 +2422,7 @@ static __init void mce_init_banks(void)
21625
21626 for (i = 0; i < mca_cfg.banks; i++) {
21627 struct mce_bank *b = &mce_banks[i];
21628- struct device_attribute *a = &b->attr;
21629+ device_attribute_no_const *a = &b->attr;
21630
21631 sysfs_attr_init(&a->attr);
21632 a->attr.name = b->attrname;
21633@@ -2526,7 +2529,7 @@ struct dentry *mce_get_debugfs_dir(void)
21634 static void mce_reset(void)
21635 {
21636 cpu_missing = 0;
21637- atomic_set(&mce_fake_panicked, 0);
21638+ atomic_set_unchecked(&mce_fake_panicked, 0);
21639 atomic_set(&mce_executing, 0);
21640 atomic_set(&mce_callin, 0);
21641 atomic_set(&global_nwo, 0);
21642diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21643index 737b0ad..09ec66e 100644
21644--- a/arch/x86/kernel/cpu/mcheck/p5.c
21645+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21646@@ -12,6 +12,7 @@
21647 #include <asm/tlbflush.h>
21648 #include <asm/mce.h>
21649 #include <asm/msr.h>
21650+#include <asm/pgtable.h>
21651
21652 /* By default disabled */
21653 int mce_p5_enabled __read_mostly;
21654@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21655 if (!cpu_has(c, X86_FEATURE_MCE))
21656 return;
21657
21658+ pax_open_kernel();
21659 machine_check_vector = pentium_machine_check;
21660+ pax_close_kernel();
21661 /* Make sure the vector pointer is visible before we enable MCEs: */
21662 wmb();
21663
21664diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21665index 44f1382..315b292 100644
21666--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21667+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21668@@ -11,6 +11,7 @@
21669 #include <asm/tlbflush.h>
21670 #include <asm/mce.h>
21671 #include <asm/msr.h>
21672+#include <asm/pgtable.h>
21673
21674 /* Machine check handler for WinChip C6: */
21675 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21676@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21677 {
21678 u32 lo, hi;
21679
21680+ pax_open_kernel();
21681 machine_check_vector = winchip_machine_check;
21682+ pax_close_kernel();
21683 /* Make sure the vector pointer is visible before we enable MCEs: */
21684 wmb();
21685
21686diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21687index 36a8361..e7058c2 100644
21688--- a/arch/x86/kernel/cpu/microcode/core.c
21689+++ b/arch/x86/kernel/cpu/microcode/core.c
21690@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21691 return NOTIFY_OK;
21692 }
21693
21694-static struct notifier_block __refdata mc_cpu_notifier = {
21695+static struct notifier_block mc_cpu_notifier = {
21696 .notifier_call = mc_cpu_callback,
21697 };
21698
21699diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21700index a41bead..4e3685b 100644
21701--- a/arch/x86/kernel/cpu/microcode/intel.c
21702+++ b/arch/x86/kernel/cpu/microcode/intel.c
21703@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21704
21705 static int get_ucode_user(void *to, const void *from, size_t n)
21706 {
21707- return copy_from_user(to, from, n);
21708+ return copy_from_user(to, (const void __force_user *)from, n);
21709 }
21710
21711 static enum ucode_state
21712 request_microcode_user(int cpu, const void __user *buf, size_t size)
21713 {
21714- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21715+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21716 }
21717
21718 static void microcode_fini_cpu(int cpu)
21719diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21720index ea5f363..cb0e905 100644
21721--- a/arch/x86/kernel/cpu/mtrr/main.c
21722+++ b/arch/x86/kernel/cpu/mtrr/main.c
21723@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21724 u64 size_or_mask, size_and_mask;
21725 static bool mtrr_aps_delayed_init;
21726
21727-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21728+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21729
21730 const struct mtrr_ops *mtrr_if;
21731
21732diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21733index df5e41f..816c719 100644
21734--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21735+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21736@@ -25,7 +25,7 @@ struct mtrr_ops {
21737 int (*validate_add_page)(unsigned long base, unsigned long size,
21738 unsigned int type);
21739 int (*have_wrcomb)(void);
21740-};
21741+} __do_const;
21742
21743 extern int generic_get_free_region(unsigned long base, unsigned long size,
21744 int replace_reg);
21745diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21746index aa4e3a7..469370f 100644
21747--- a/arch/x86/kernel/cpu/perf_event.c
21748+++ b/arch/x86/kernel/cpu/perf_event.c
21749@@ -1509,7 +1509,7 @@ static void __init pmu_check_apic(void)
21750
21751 }
21752
21753-static struct attribute_group x86_pmu_format_group = {
21754+static attribute_group_no_const x86_pmu_format_group = {
21755 .name = "format",
21756 .attrs = NULL,
21757 };
21758@@ -1608,7 +1608,7 @@ static struct attribute *events_attr[] = {
21759 NULL,
21760 };
21761
21762-static struct attribute_group x86_pmu_events_group = {
21763+static attribute_group_no_const x86_pmu_events_group = {
21764 .name = "events",
21765 .attrs = events_attr,
21766 };
21767@@ -2181,7 +2181,7 @@ static unsigned long get_segment_base(unsigned int segment)
21768 if (idx > GDT_ENTRIES)
21769 return 0;
21770
21771- desc = raw_cpu_ptr(gdt_page.gdt);
21772+ desc = get_cpu_gdt_table(smp_processor_id());
21773 }
21774
21775 return get_desc_base(desc + idx);
21776@@ -2271,7 +2271,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21777 break;
21778
21779 perf_callchain_store(entry, frame.return_address);
21780- fp = frame.next_frame;
21781+ fp = (const void __force_user *)frame.next_frame;
21782 }
21783 }
21784
21785diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21786index 97242a9..cf9c30e 100644
21787--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21788+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21789@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21790 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21791 {
21792 struct attribute **attrs;
21793- struct attribute_group *attr_group;
21794+ attribute_group_no_const *attr_group;
21795 int i = 0, j;
21796
21797 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21798diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21799index 2813ea0..3ef5969c8 100644
21800--- a/arch/x86/kernel/cpu/perf_event_intel.c
21801+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21802@@ -3033,10 +3033,10 @@ __init int intel_pmu_init(void)
21803 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21804
21805 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21806- u64 capabilities;
21807+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21808
21809- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21810- x86_pmu.intel_cap.capabilities = capabilities;
21811+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21812+ x86_pmu.intel_cap.capabilities = capabilities;
21813 }
21814
21815 intel_ds_init();
21816diff --git a/arch/x86/kernel/cpu/perf_event_intel_bts.c b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21817index 7795f3f..3535b76 100644
21818--- a/arch/x86/kernel/cpu/perf_event_intel_bts.c
21819+++ b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21820@@ -252,7 +252,7 @@ static void bts_event_start(struct perf_event *event, int flags)
21821 __bts_event_start(event);
21822
21823 /* PMI handler: this counter is running and likely generating PMIs */
21824- ACCESS_ONCE(bts->started) = 1;
21825+ ACCESS_ONCE_RW(bts->started) = 1;
21826 }
21827
21828 static void __bts_event_stop(struct perf_event *event)
21829@@ -266,7 +266,7 @@ static void __bts_event_stop(struct perf_event *event)
21830 if (event->hw.state & PERF_HES_STOPPED)
21831 return;
21832
21833- ACCESS_ONCE(event->hw.state) |= PERF_HES_STOPPED;
21834+ ACCESS_ONCE_RW(event->hw.state) |= PERF_HES_STOPPED;
21835 }
21836
21837 static void bts_event_stop(struct perf_event *event, int flags)
21838@@ -274,7 +274,7 @@ static void bts_event_stop(struct perf_event *event, int flags)
21839 struct bts_ctx *bts = this_cpu_ptr(&bts_ctx);
21840
21841 /* PMI handler: don't restart this counter */
21842- ACCESS_ONCE(bts->started) = 0;
21843+ ACCESS_ONCE_RW(bts->started) = 0;
21844
21845 __bts_event_stop(event);
21846
21847diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21848index cb77b11..8867302 100644
21849--- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21850+++ b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21851@@ -1360,7 +1360,9 @@ static int __init intel_cqm_init(void)
21852 goto out;
21853 }
21854
21855- event_attr_intel_cqm_llc_scale.event_str = str;
21856+ pax_open_kernel();
21857+ *(const char **)&event_attr_intel_cqm_llc_scale.event_str = str;
21858+ pax_close_kernel();
21859
21860 ret = intel_cqm_setup_rmid_cache();
21861 if (ret)
21862diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21863index 123ff1b..d53e500 100644
21864--- a/arch/x86/kernel/cpu/perf_event_intel_pt.c
21865+++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21866@@ -116,16 +116,12 @@ static const struct attribute_group *pt_attr_groups[] = {
21867
21868 static int __init pt_pmu_hw_init(void)
21869 {
21870- struct dev_ext_attribute *de_attrs;
21871- struct attribute **attrs;
21872- size_t size;
21873- int ret;
21874+ static struct dev_ext_attribute de_attrs[ARRAY_SIZE(pt_caps)];
21875+ static struct attribute *attrs[ARRAY_SIZE(pt_caps)];
21876 long i;
21877
21878- attrs = NULL;
21879- ret = -ENODEV;
21880 if (!test_cpu_cap(&boot_cpu_data, X86_FEATURE_INTEL_PT))
21881- goto fail;
21882+ return -ENODEV;
21883
21884 for (i = 0; i < PT_CPUID_LEAVES; i++) {
21885 cpuid_count(20, i,
21886@@ -135,39 +131,25 @@ static int __init pt_pmu_hw_init(void)
21887 &pt_pmu.caps[CR_EDX + i*4]);
21888 }
21889
21890- ret = -ENOMEM;
21891- size = sizeof(struct attribute *) * (ARRAY_SIZE(pt_caps)+1);
21892- attrs = kzalloc(size, GFP_KERNEL);
21893- if (!attrs)
21894- goto fail;
21895-
21896- size = sizeof(struct dev_ext_attribute) * (ARRAY_SIZE(pt_caps)+1);
21897- de_attrs = kzalloc(size, GFP_KERNEL);
21898- if (!de_attrs)
21899- goto fail;
21900-
21901+ pax_open_kernel();
21902 for (i = 0; i < ARRAY_SIZE(pt_caps); i++) {
21903- struct dev_ext_attribute *de_attr = de_attrs + i;
21904+ struct dev_ext_attribute *de_attr = &de_attrs[i];
21905
21906- de_attr->attr.attr.name = pt_caps[i].name;
21907+ *(const char **)&de_attr->attr.attr.name = pt_caps[i].name;
21908
21909 sysfs_attr_init(&de_attr->attr.attr);
21910
21911- de_attr->attr.attr.mode = S_IRUGO;
21912- de_attr->attr.show = pt_cap_show;
21913- de_attr->var = (void *)i;
21914+ *(umode_t *)&de_attr->attr.attr.mode = S_IRUGO;
21915+ *(void **)&de_attr->attr.show = pt_cap_show;
21916+ *(void **)&de_attr->var = (void *)i;
21917
21918 attrs[i] = &de_attr->attr.attr;
21919 }
21920
21921- pt_cap_group.attrs = attrs;
21922+ *(struct attribute ***)&pt_cap_group.attrs = attrs;
21923+ pax_close_kernel();
21924
21925 return 0;
21926-
21927-fail:
21928- kfree(attrs);
21929-
21930- return ret;
21931 }
21932
21933 #define PT_CONFIG_MASK (RTIT_CTL_TSC_EN | RTIT_CTL_DISRETC)
21934@@ -928,7 +910,7 @@ static void pt_event_start(struct perf_event *event, int mode)
21935 return;
21936 }
21937
21938- ACCESS_ONCE(pt->handle_nmi) = 1;
21939+ ACCESS_ONCE_RW(pt->handle_nmi) = 1;
21940 event->hw.state = 0;
21941
21942 pt_config_buffer(buf->cur->table, buf->cur_idx,
21943@@ -945,7 +927,7 @@ static void pt_event_stop(struct perf_event *event, int mode)
21944 * Protect against the PMI racing with disabling wrmsr,
21945 * see comment in intel_pt_interrupt().
21946 */
21947- ACCESS_ONCE(pt->handle_nmi) = 0;
21948+ ACCESS_ONCE_RW(pt->handle_nmi) = 0;
21949 pt_config_start(false);
21950
21951 if (event->hw.state == PERF_HES_STOPPED)
21952diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21953index 358c54a..f068235 100644
21954--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21955+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21956@@ -487,7 +487,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21957 NULL,
21958 };
21959
21960-static struct attribute_group rapl_pmu_events_group = {
21961+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21962 .name = "events",
21963 .attrs = NULL, /* patched at runtime */
21964 };
21965diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21966index 90b7c50..7863ae3 100644
21967--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21968+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21969@@ -732,7 +732,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21970 static int __init uncore_type_init(struct intel_uncore_type *type)
21971 {
21972 struct intel_uncore_pmu *pmus;
21973- struct attribute_group *attr_group;
21974+ attribute_group_no_const *attr_group;
21975 struct attribute **attrs;
21976 int i, j;
21977
21978diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21979index ceac8f5..a562de7 100644
21980--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21981+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21982@@ -115,7 +115,7 @@ struct intel_uncore_box {
21983 struct uncore_event_desc {
21984 struct kobj_attribute attr;
21985 const char *config;
21986-};
21987+} __do_const;
21988
21989 ssize_t uncore_event_show(struct kobject *kobj,
21990 struct kobj_attribute *attr, char *buf);
21991diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21992index 83741a7..bd3507d 100644
21993--- a/arch/x86/kernel/cpuid.c
21994+++ b/arch/x86/kernel/cpuid.c
21995@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21996 return notifier_from_errno(err);
21997 }
21998
21999-static struct notifier_block __refdata cpuid_class_cpu_notifier =
22000+static struct notifier_block cpuid_class_cpu_notifier =
22001 {
22002 .notifier_call = cpuid_class_cpu_callback,
22003 };
22004diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
22005index afa64ad..dce67dd 100644
22006--- a/arch/x86/kernel/crash_dump_64.c
22007+++ b/arch/x86/kernel/crash_dump_64.c
22008@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
22009 return -ENOMEM;
22010
22011 if (userbuf) {
22012- if (copy_to_user(buf, vaddr + offset, csize)) {
22013+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
22014 iounmap(vaddr);
22015 return -EFAULT;
22016 }
22017diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
22018index f6dfd93..892ade4 100644
22019--- a/arch/x86/kernel/doublefault.c
22020+++ b/arch/x86/kernel/doublefault.c
22021@@ -12,7 +12,7 @@
22022
22023 #define DOUBLEFAULT_STACKSIZE (1024)
22024 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
22025-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
22026+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
22027
22028 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
22029
22030@@ -22,7 +22,7 @@ static void doublefault_fn(void)
22031 unsigned long gdt, tss;
22032
22033 native_store_gdt(&gdt_desc);
22034- gdt = gdt_desc.address;
22035+ gdt = (unsigned long)gdt_desc.address;
22036
22037 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
22038
22039@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
22040 /* 0x2 bit is always set */
22041 .flags = X86_EFLAGS_SF | 0x2,
22042 .sp = STACK_START,
22043- .es = __USER_DS,
22044+ .es = __KERNEL_DS,
22045 .cs = __KERNEL_CS,
22046 .ss = __KERNEL_DS,
22047- .ds = __USER_DS,
22048+ .ds = __KERNEL_DS,
22049 .fs = __KERNEL_PERCPU,
22050
22051 .__cr3 = __pa_nodebug(swapper_pg_dir),
22052diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
22053index 9c30acf..8cf2411 100644
22054--- a/arch/x86/kernel/dumpstack.c
22055+++ b/arch/x86/kernel/dumpstack.c
22056@@ -2,6 +2,9 @@
22057 * Copyright (C) 1991, 1992 Linus Torvalds
22058 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
22059 */
22060+#ifdef CONFIG_GRKERNSEC_HIDESYM
22061+#define __INCLUDED_BY_HIDESYM 1
22062+#endif
22063 #include <linux/kallsyms.h>
22064 #include <linux/kprobes.h>
22065 #include <linux/uaccess.h>
22066@@ -35,23 +38,21 @@ static void printk_stack_address(unsigned long address, int reliable,
22067
22068 void printk_address(unsigned long address)
22069 {
22070- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
22071+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
22072 }
22073
22074 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
22075 static void
22076 print_ftrace_graph_addr(unsigned long addr, void *data,
22077 const struct stacktrace_ops *ops,
22078- struct thread_info *tinfo, int *graph)
22079+ struct task_struct *task, int *graph)
22080 {
22081- struct task_struct *task;
22082 unsigned long ret_addr;
22083 int index;
22084
22085 if (addr != (unsigned long)return_to_handler)
22086 return;
22087
22088- task = tinfo->task;
22089 index = task->curr_ret_stack;
22090
22091 if (!task->ret_stack || index < *graph)
22092@@ -68,7 +69,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
22093 static inline void
22094 print_ftrace_graph_addr(unsigned long addr, void *data,
22095 const struct stacktrace_ops *ops,
22096- struct thread_info *tinfo, int *graph)
22097+ struct task_struct *task, int *graph)
22098 { }
22099 #endif
22100
22101@@ -79,10 +80,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
22102 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
22103 */
22104
22105-static inline int valid_stack_ptr(struct thread_info *tinfo,
22106- void *p, unsigned int size, void *end)
22107+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
22108 {
22109- void *t = tinfo;
22110 if (end) {
22111 if (p < end && p >= (end-THREAD_SIZE))
22112 return 1;
22113@@ -93,14 +92,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
22114 }
22115
22116 unsigned long
22117-print_context_stack(struct thread_info *tinfo,
22118+print_context_stack(struct task_struct *task, void *stack_start,
22119 unsigned long *stack, unsigned long bp,
22120 const struct stacktrace_ops *ops, void *data,
22121 unsigned long *end, int *graph)
22122 {
22123 struct stack_frame *frame = (struct stack_frame *)bp;
22124
22125- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
22126+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
22127 unsigned long addr;
22128
22129 addr = *stack;
22130@@ -112,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
22131 } else {
22132 ops->address(data, addr, 0);
22133 }
22134- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22135+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22136 }
22137 stack++;
22138 }
22139@@ -121,7 +120,7 @@ print_context_stack(struct thread_info *tinfo,
22140 EXPORT_SYMBOL_GPL(print_context_stack);
22141
22142 unsigned long
22143-print_context_stack_bp(struct thread_info *tinfo,
22144+print_context_stack_bp(struct task_struct *task, void *stack_start,
22145 unsigned long *stack, unsigned long bp,
22146 const struct stacktrace_ops *ops, void *data,
22147 unsigned long *end, int *graph)
22148@@ -129,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22149 struct stack_frame *frame = (struct stack_frame *)bp;
22150 unsigned long *ret_addr = &frame->return_address;
22151
22152- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
22153+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
22154 unsigned long addr = *ret_addr;
22155
22156 if (!__kernel_text_address(addr))
22157@@ -138,7 +137,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22158 ops->address(data, addr, 1);
22159 frame = frame->next_frame;
22160 ret_addr = &frame->return_address;
22161- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22162+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22163 }
22164
22165 return (unsigned long)frame;
22166@@ -226,6 +225,8 @@ unsigned long oops_begin(void)
22167 EXPORT_SYMBOL_GPL(oops_begin);
22168 NOKPROBE_SYMBOL(oops_begin);
22169
22170+extern void gr_handle_kernel_exploit(void);
22171+
22172 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22173 {
22174 if (regs && kexec_should_crash(current))
22175@@ -247,7 +248,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22176 panic("Fatal exception in interrupt");
22177 if (panic_on_oops)
22178 panic("Fatal exception");
22179- do_exit(signr);
22180+
22181+ gr_handle_kernel_exploit();
22182+
22183+ do_group_exit(signr);
22184 }
22185 NOKPROBE_SYMBOL(oops_end);
22186
22187diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22188index 464ffd6..01f2cda 100644
22189--- a/arch/x86/kernel/dumpstack_32.c
22190+++ b/arch/x86/kernel/dumpstack_32.c
22191@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22192 bp = stack_frame(task, regs);
22193
22194 for (;;) {
22195- struct thread_info *context;
22196+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22197 void *end_stack;
22198
22199 end_stack = is_hardirq_stack(stack, cpu);
22200 if (!end_stack)
22201 end_stack = is_softirq_stack(stack, cpu);
22202
22203- context = task_thread_info(task);
22204- bp = ops->walk_stack(context, stack, bp, ops, data,
22205+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22206 end_stack, &graph);
22207
22208 /* Stop if not on irq stack */
22209@@ -137,16 +136,17 @@ void show_regs(struct pt_regs *regs)
22210 unsigned int code_len = code_bytes;
22211 unsigned char c;
22212 u8 *ip;
22213+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22214
22215 pr_emerg("Stack:\n");
22216 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22217
22218 pr_emerg("Code:");
22219
22220- ip = (u8 *)regs->ip - code_prologue;
22221+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22222 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22223 /* try starting at IP */
22224- ip = (u8 *)regs->ip;
22225+ ip = (u8 *)regs->ip + cs_base;
22226 code_len = code_len - code_prologue + 1;
22227 }
22228 for (i = 0; i < code_len; i++, ip++) {
22229@@ -155,7 +155,7 @@ void show_regs(struct pt_regs *regs)
22230 pr_cont(" Bad EIP value.");
22231 break;
22232 }
22233- if (ip == (u8 *)regs->ip)
22234+ if (ip == (u8 *)regs->ip + cs_base)
22235 pr_cont(" <%02x>", c);
22236 else
22237 pr_cont(" %02x", c);
22238@@ -168,6 +168,7 @@ int is_valid_bugaddr(unsigned long ip)
22239 {
22240 unsigned short ud2;
22241
22242+ ip = ktla_ktva(ip);
22243 if (ip < PAGE_OFFSET)
22244 return 0;
22245 if (probe_kernel_address((unsigned short *)ip, ud2))
22246@@ -175,3 +176,15 @@ int is_valid_bugaddr(unsigned long ip)
22247
22248 return ud2 == 0x0b0f;
22249 }
22250+
22251+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22252+void __used pax_check_alloca(unsigned long size)
22253+{
22254+ unsigned long sp = (unsigned long)&sp, stack_left;
22255+
22256+ /* all kernel stacks are of the same size */
22257+ stack_left = sp & (THREAD_SIZE - 1);
22258+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22259+}
22260+EXPORT_SYMBOL(pax_check_alloca);
22261+#endif
22262diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22263index 5f1c626..1cba97e 100644
22264--- a/arch/x86/kernel/dumpstack_64.c
22265+++ b/arch/x86/kernel/dumpstack_64.c
22266@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22267 const struct stacktrace_ops *ops, void *data)
22268 {
22269 const unsigned cpu = get_cpu();
22270- struct thread_info *tinfo;
22271 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22272 unsigned long dummy;
22273 unsigned used = 0;
22274 int graph = 0;
22275 int done = 0;
22276+ void *stack_start;
22277
22278 if (!task)
22279 task = current;
22280@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22281 * current stack address. If the stacks consist of nested
22282 * exceptions
22283 */
22284- tinfo = task_thread_info(task);
22285 while (!done) {
22286 unsigned long *stack_end;
22287 enum stack_type stype;
22288@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22289 if (ops->stack(data, id) < 0)
22290 break;
22291
22292- bp = ops->walk_stack(tinfo, stack, bp, ops,
22293+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22294 data, stack_end, &graph);
22295 ops->stack(data, "<EOE>");
22296 /*
22297@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22298 * second-to-last pointer (index -2 to end) in the
22299 * exception stack:
22300 */
22301+ if ((u16)stack_end[-1] != __KERNEL_DS)
22302+ goto out;
22303 stack = (unsigned long *) stack_end[-2];
22304 done = 0;
22305 break;
22306@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22307
22308 if (ops->stack(data, "IRQ") < 0)
22309 break;
22310- bp = ops->walk_stack(tinfo, stack, bp,
22311+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22312 ops, data, stack_end, &graph);
22313 /*
22314 * We link to the next stack (which would be
22315@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22316 /*
22317 * This handles the process stack:
22318 */
22319- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22320+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22321+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22322+out:
22323 put_cpu();
22324 }
22325 EXPORT_SYMBOL(dump_trace);
22326@@ -347,8 +350,55 @@ int is_valid_bugaddr(unsigned long ip)
22327 {
22328 unsigned short ud2;
22329
22330- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22331+ if (probe_kernel_address((unsigned short *)ip, ud2))
22332 return 0;
22333
22334 return ud2 == 0x0b0f;
22335 }
22336+
22337+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22338+void __used pax_check_alloca(unsigned long size)
22339+{
22340+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22341+ unsigned cpu, used;
22342+ char *id;
22343+
22344+ /* check the process stack first */
22345+ stack_start = (unsigned long)task_stack_page(current);
22346+ stack_end = stack_start + THREAD_SIZE;
22347+ if (likely(stack_start <= sp && sp < stack_end)) {
22348+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22349+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22350+ return;
22351+ }
22352+
22353+ cpu = get_cpu();
22354+
22355+ /* check the irq stacks */
22356+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22357+ stack_start = stack_end - IRQ_STACK_SIZE;
22358+ if (stack_start <= sp && sp < stack_end) {
22359+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22360+ put_cpu();
22361+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22362+ return;
22363+ }
22364+
22365+ /* check the exception stacks */
22366+ used = 0;
22367+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22368+ stack_start = stack_end - EXCEPTION_STKSZ;
22369+ if (stack_end && stack_start <= sp && sp < stack_end) {
22370+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22371+ put_cpu();
22372+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22373+ return;
22374+ }
22375+
22376+ put_cpu();
22377+
22378+ /* unknown stack */
22379+ BUG();
22380+}
22381+EXPORT_SYMBOL(pax_check_alloca);
22382+#endif
22383diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22384index e2ce85d..00ccad0 100644
22385--- a/arch/x86/kernel/e820.c
22386+++ b/arch/x86/kernel/e820.c
22387@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22388
22389 static void early_panic(char *msg)
22390 {
22391- early_printk(msg);
22392- panic(msg);
22393+ early_printk("%s", msg);
22394+ panic("%s", msg);
22395 }
22396
22397 static int userdef __initdata;
22398diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22399index 89427d8..00c0d52 100644
22400--- a/arch/x86/kernel/early_printk.c
22401+++ b/arch/x86/kernel/early_printk.c
22402@@ -7,6 +7,7 @@
22403 #include <linux/pci_regs.h>
22404 #include <linux/pci_ids.h>
22405 #include <linux/errno.h>
22406+#include <linux/sched.h>
22407 #include <asm/io.h>
22408 #include <asm/processor.h>
22409 #include <asm/fcntl.h>
22410diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22411index 1c30976..71b41b9 100644
22412--- a/arch/x86/kernel/entry_32.S
22413+++ b/arch/x86/kernel/entry_32.S
22414@@ -177,13 +177,154 @@
22415 /*CFI_REL_OFFSET gs, PT_GS*/
22416 .endm
22417 .macro SET_KERNEL_GS reg
22418+
22419+#ifdef CONFIG_CC_STACKPROTECTOR
22420 movl $(__KERNEL_STACK_CANARY), \reg
22421+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22422+ movl $(__USER_DS), \reg
22423+#else
22424+ xorl \reg, \reg
22425+#endif
22426+
22427 movl \reg, %gs
22428 .endm
22429
22430 #endif /* CONFIG_X86_32_LAZY_GS */
22431
22432-.macro SAVE_ALL
22433+.macro pax_enter_kernel
22434+#ifdef CONFIG_PAX_KERNEXEC
22435+ call pax_enter_kernel
22436+#endif
22437+.endm
22438+
22439+.macro pax_exit_kernel
22440+#ifdef CONFIG_PAX_KERNEXEC
22441+ call pax_exit_kernel
22442+#endif
22443+.endm
22444+
22445+#ifdef CONFIG_PAX_KERNEXEC
22446+ENTRY(pax_enter_kernel)
22447+#ifdef CONFIG_PARAVIRT
22448+ pushl %eax
22449+ pushl %ecx
22450+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22451+ mov %eax, %esi
22452+#else
22453+ mov %cr0, %esi
22454+#endif
22455+ bts $X86_CR0_WP_BIT, %esi
22456+ jnc 1f
22457+ mov %cs, %esi
22458+ cmp $__KERNEL_CS, %esi
22459+ jz 3f
22460+ ljmp $__KERNEL_CS, $3f
22461+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22462+2:
22463+#ifdef CONFIG_PARAVIRT
22464+ mov %esi, %eax
22465+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22466+#else
22467+ mov %esi, %cr0
22468+#endif
22469+3:
22470+#ifdef CONFIG_PARAVIRT
22471+ popl %ecx
22472+ popl %eax
22473+#endif
22474+ ret
22475+ENDPROC(pax_enter_kernel)
22476+
22477+ENTRY(pax_exit_kernel)
22478+#ifdef CONFIG_PARAVIRT
22479+ pushl %eax
22480+ pushl %ecx
22481+#endif
22482+ mov %cs, %esi
22483+ cmp $__KERNEXEC_KERNEL_CS, %esi
22484+ jnz 2f
22485+#ifdef CONFIG_PARAVIRT
22486+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22487+ mov %eax, %esi
22488+#else
22489+ mov %cr0, %esi
22490+#endif
22491+ btr $X86_CR0_WP_BIT, %esi
22492+ ljmp $__KERNEL_CS, $1f
22493+1:
22494+#ifdef CONFIG_PARAVIRT
22495+ mov %esi, %eax
22496+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22497+#else
22498+ mov %esi, %cr0
22499+#endif
22500+2:
22501+#ifdef CONFIG_PARAVIRT
22502+ popl %ecx
22503+ popl %eax
22504+#endif
22505+ ret
22506+ENDPROC(pax_exit_kernel)
22507+#endif
22508+
22509+ .macro pax_erase_kstack
22510+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22511+ call pax_erase_kstack
22512+#endif
22513+ .endm
22514+
22515+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22516+/*
22517+ * ebp: thread_info
22518+ */
22519+ENTRY(pax_erase_kstack)
22520+ pushl %edi
22521+ pushl %ecx
22522+ pushl %eax
22523+
22524+ mov TI_lowest_stack(%ebp), %edi
22525+ mov $-0xBEEF, %eax
22526+ std
22527+
22528+1: mov %edi, %ecx
22529+ and $THREAD_SIZE_asm - 1, %ecx
22530+ shr $2, %ecx
22531+ repne scasl
22532+ jecxz 2f
22533+
22534+ cmp $2*16, %ecx
22535+ jc 2f
22536+
22537+ mov $2*16, %ecx
22538+ repe scasl
22539+ jecxz 2f
22540+ jne 1b
22541+
22542+2: cld
22543+ or $2*4, %edi
22544+ mov %esp, %ecx
22545+ sub %edi, %ecx
22546+
22547+ cmp $THREAD_SIZE_asm, %ecx
22548+ jb 3f
22549+ ud2
22550+3:
22551+
22552+ shr $2, %ecx
22553+ rep stosl
22554+
22555+ mov TI_task_thread_sp0(%ebp), %edi
22556+ sub $128, %edi
22557+ mov %edi, TI_lowest_stack(%ebp)
22558+
22559+ popl %eax
22560+ popl %ecx
22561+ popl %edi
22562+ ret
22563+ENDPROC(pax_erase_kstack)
22564+#endif
22565+
22566+.macro __SAVE_ALL _DS
22567 cld
22568 PUSH_GS
22569 pushl_cfi %fs
22570@@ -206,7 +347,7 @@
22571 CFI_REL_OFFSET ecx, 0
22572 pushl_cfi %ebx
22573 CFI_REL_OFFSET ebx, 0
22574- movl $(__USER_DS), %edx
22575+ movl $\_DS, %edx
22576 movl %edx, %ds
22577 movl %edx, %es
22578 movl $(__KERNEL_PERCPU), %edx
22579@@ -214,6 +355,15 @@
22580 SET_KERNEL_GS %edx
22581 .endm
22582
22583+.macro SAVE_ALL
22584+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22585+ __SAVE_ALL __KERNEL_DS
22586+ pax_enter_kernel
22587+#else
22588+ __SAVE_ALL __USER_DS
22589+#endif
22590+.endm
22591+
22592 .macro RESTORE_INT_REGS
22593 popl_cfi %ebx
22594 CFI_RESTORE ebx
22595@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22596 popfl_cfi
22597 jmp syscall_exit
22598 CFI_ENDPROC
22599-END(ret_from_fork)
22600+ENDPROC(ret_from_fork)
22601
22602 ENTRY(ret_from_kernel_thread)
22603 CFI_STARTPROC
22604@@ -340,7 +490,15 @@ ret_from_intr:
22605 andl $SEGMENT_RPL_MASK, %eax
22606 #endif
22607 cmpl $USER_RPL, %eax
22608+
22609+#ifdef CONFIG_PAX_KERNEXEC
22610+ jae resume_userspace
22611+
22612+ pax_exit_kernel
22613+ jmp resume_kernel
22614+#else
22615 jb resume_kernel # not returning to v8086 or userspace
22616+#endif
22617
22618 ENTRY(resume_userspace)
22619 LOCKDEP_SYS_EXIT
22620@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22621 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22622 # int/exception return?
22623 jne work_pending
22624- jmp restore_all
22625-END(ret_from_exception)
22626+ jmp restore_all_pax
22627+ENDPROC(ret_from_exception)
22628
22629 #ifdef CONFIG_PREEMPT
22630 ENTRY(resume_kernel)
22631@@ -365,7 +523,7 @@ need_resched:
22632 jz restore_all
22633 call preempt_schedule_irq
22634 jmp need_resched
22635-END(resume_kernel)
22636+ENDPROC(resume_kernel)
22637 #endif
22638 CFI_ENDPROC
22639
22640@@ -395,33 +553,45 @@ sysenter_past_esp:
22641 /*CFI_REL_OFFSET cs, 0*/
22642 /*
22643 * Push current_thread_info()->sysenter_return to the stack.
22644- * A tiny bit of offset fixup is necessary: TI_sysenter_return
22645- * is relative to thread_info, which is at the bottom of the
22646- * kernel stack page. 4*4 means the 4 words pushed above;
22647- * TOP_OF_KERNEL_STACK_PADDING takes us to the top of the stack;
22648- * and THREAD_SIZE takes us to the bottom.
22649 */
22650- pushl_cfi ((TI_sysenter_return) - THREAD_SIZE + TOP_OF_KERNEL_STACK_PADDING + 4*4)(%esp)
22651+ pushl_cfi $0
22652 CFI_REL_OFFSET eip, 0
22653
22654 pushl_cfi %eax
22655 SAVE_ALL
22656+ GET_THREAD_INFO(%ebp)
22657+ movl TI_sysenter_return(%ebp),%ebp
22658+ movl %ebp,PT_EIP(%esp)
22659 ENABLE_INTERRUPTS(CLBR_NONE)
22660
22661 /*
22662 * Load the potential sixth argument from user stack.
22663 * Careful about security.
22664 */
22665+ movl PT_OLDESP(%esp),%ebp
22666+
22667+#ifdef CONFIG_PAX_MEMORY_UDEREF
22668+ mov PT_OLDSS(%esp),%ds
22669+1: movl %ds:(%ebp),%ebp
22670+ push %ss
22671+ pop %ds
22672+#else
22673 cmpl $__PAGE_OFFSET-3,%ebp
22674 jae syscall_fault
22675 ASM_STAC
22676 1: movl (%ebp),%ebp
22677 ASM_CLAC
22678+#endif
22679+
22680 movl %ebp,PT_EBP(%esp)
22681 _ASM_EXTABLE(1b,syscall_fault)
22682
22683 GET_THREAD_INFO(%ebp)
22684
22685+#ifdef CONFIG_PAX_RANDKSTACK
22686+ pax_erase_kstack
22687+#endif
22688+
22689 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22690 jnz sysenter_audit
22691 sysenter_do_call:
22692@@ -437,12 +607,24 @@ sysenter_after_call:
22693 testl $_TIF_ALLWORK_MASK, %ecx
22694 jnz sysexit_audit
22695 sysenter_exit:
22696+
22697+#ifdef CONFIG_PAX_RANDKSTACK
22698+ pushl_cfi %eax
22699+ movl %esp, %eax
22700+ call pax_randomize_kstack
22701+ popl_cfi %eax
22702+#endif
22703+
22704+ pax_erase_kstack
22705+
22706 /* if something modifies registers it must also disable sysexit */
22707 movl PT_EIP(%esp), %edx
22708 movl PT_OLDESP(%esp), %ecx
22709 xorl %ebp,%ebp
22710 TRACE_IRQS_ON
22711 1: mov PT_FS(%esp), %fs
22712+2: mov PT_DS(%esp), %ds
22713+3: mov PT_ES(%esp), %es
22714 PTGS_TO_GS
22715 ENABLE_INTERRUPTS_SYSEXIT
22716
22717@@ -456,6 +638,9 @@ sysenter_audit:
22718 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22719 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22720 call __audit_syscall_entry
22721+
22722+ pax_erase_kstack
22723+
22724 popl_cfi %ecx /* get that remapped edx off the stack */
22725 popl_cfi %ecx /* get that remapped esi off the stack */
22726 movl PT_EAX(%esp),%eax /* reload syscall number */
22727@@ -482,10 +667,16 @@ sysexit_audit:
22728
22729 CFI_ENDPROC
22730 .pushsection .fixup,"ax"
22731-2: movl $0,PT_FS(%esp)
22732+4: movl $0,PT_FS(%esp)
22733+ jmp 1b
22734+5: movl $0,PT_DS(%esp)
22735+ jmp 1b
22736+6: movl $0,PT_ES(%esp)
22737 jmp 1b
22738 .popsection
22739- _ASM_EXTABLE(1b,2b)
22740+ _ASM_EXTABLE(1b,4b)
22741+ _ASM_EXTABLE(2b,5b)
22742+ _ASM_EXTABLE(3b,6b)
22743 PTGS_TO_GS_EX
22744 ENDPROC(ia32_sysenter_target)
22745
22746@@ -496,6 +687,11 @@ ENTRY(system_call)
22747 pushl_cfi %eax # save orig_eax
22748 SAVE_ALL
22749 GET_THREAD_INFO(%ebp)
22750+
22751+#ifdef CONFIG_PAX_RANDKSTACK
22752+ pax_erase_kstack
22753+#endif
22754+
22755 # system call tracing in operation / emulation
22756 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22757 jnz syscall_trace_entry
22758@@ -515,6 +711,15 @@ syscall_exit:
22759 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22760 jnz syscall_exit_work
22761
22762+restore_all_pax:
22763+
22764+#ifdef CONFIG_PAX_RANDKSTACK
22765+ movl %esp, %eax
22766+ call pax_randomize_kstack
22767+#endif
22768+
22769+ pax_erase_kstack
22770+
22771 restore_all:
22772 TRACE_IRQS_IRET
22773 restore_all_notrace:
22774@@ -569,14 +774,34 @@ ldt_ss:
22775 * compensating for the offset by changing to the ESPFIX segment with
22776 * a base address that matches for the difference.
22777 */
22778-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22779+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22780 mov %esp, %edx /* load kernel esp */
22781 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22782 mov %dx, %ax /* eax: new kernel esp */
22783 sub %eax, %edx /* offset (low word is 0) */
22784+#ifdef CONFIG_SMP
22785+ movl PER_CPU_VAR(cpu_number), %ebx
22786+ shll $PAGE_SHIFT_asm, %ebx
22787+ addl $cpu_gdt_table, %ebx
22788+#else
22789+ movl $cpu_gdt_table, %ebx
22790+#endif
22791 shr $16, %edx
22792- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22793- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22794+
22795+#ifdef CONFIG_PAX_KERNEXEC
22796+ mov %cr0, %esi
22797+ btr $X86_CR0_WP_BIT, %esi
22798+ mov %esi, %cr0
22799+#endif
22800+
22801+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22802+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22803+
22804+#ifdef CONFIG_PAX_KERNEXEC
22805+ bts $X86_CR0_WP_BIT, %esi
22806+ mov %esi, %cr0
22807+#endif
22808+
22809 pushl_cfi $__ESPFIX_SS
22810 pushl_cfi %eax /* new kernel esp */
22811 /* Disable interrupts, but do not irqtrace this section: we
22812@@ -606,20 +831,18 @@ work_resched:
22813 movl TI_flags(%ebp), %ecx
22814 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22815 # than syscall tracing?
22816- jz restore_all
22817+ jz restore_all_pax
22818 testb $_TIF_NEED_RESCHED, %cl
22819 jnz work_resched
22820
22821 work_notifysig: # deal with pending signals and
22822 # notify-resume requests
22823+ movl %esp, %eax
22824 #ifdef CONFIG_VM86
22825 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22826- movl %esp, %eax
22827 jnz work_notifysig_v86 # returning to kernel-space or
22828 # vm86-space
22829 1:
22830-#else
22831- movl %esp, %eax
22832 #endif
22833 TRACE_IRQS_ON
22834 ENABLE_INTERRUPTS(CLBR_NONE)
22835@@ -640,7 +863,7 @@ work_notifysig_v86:
22836 movl %eax, %esp
22837 jmp 1b
22838 #endif
22839-END(work_pending)
22840+ENDPROC(work_pending)
22841
22842 # perform syscall exit tracing
22843 ALIGN
22844@@ -648,11 +871,14 @@ syscall_trace_entry:
22845 movl $-ENOSYS,PT_EAX(%esp)
22846 movl %esp, %eax
22847 call syscall_trace_enter
22848+
22849+ pax_erase_kstack
22850+
22851 /* What it returned is what we'll actually use. */
22852 cmpl $(NR_syscalls), %eax
22853 jnae syscall_call
22854 jmp syscall_exit
22855-END(syscall_trace_entry)
22856+ENDPROC(syscall_trace_entry)
22857
22858 # perform syscall exit tracing
22859 ALIGN
22860@@ -665,26 +891,30 @@ syscall_exit_work:
22861 movl %esp, %eax
22862 call syscall_trace_leave
22863 jmp resume_userspace
22864-END(syscall_exit_work)
22865+ENDPROC(syscall_exit_work)
22866 CFI_ENDPROC
22867
22868 RING0_INT_FRAME # can't unwind into user space anyway
22869 syscall_fault:
22870+#ifdef CONFIG_PAX_MEMORY_UDEREF
22871+ push %ss
22872+ pop %ds
22873+#endif
22874 ASM_CLAC
22875 GET_THREAD_INFO(%ebp)
22876 movl $-EFAULT,PT_EAX(%esp)
22877 jmp resume_userspace
22878-END(syscall_fault)
22879+ENDPROC(syscall_fault)
22880
22881 syscall_badsys:
22882 movl $-ENOSYS,%eax
22883 jmp syscall_after_call
22884-END(syscall_badsys)
22885+ENDPROC(syscall_badsys)
22886
22887 sysenter_badsys:
22888 movl $-ENOSYS,%eax
22889 jmp sysenter_after_call
22890-END(sysenter_badsys)
22891+ENDPROC(sysenter_badsys)
22892 CFI_ENDPROC
22893
22894 .macro FIXUP_ESPFIX_STACK
22895@@ -697,8 +927,15 @@ END(sysenter_badsys)
22896 */
22897 #ifdef CONFIG_X86_ESPFIX32
22898 /* fixup the stack */
22899- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22900- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22901+#ifdef CONFIG_SMP
22902+ movl PER_CPU_VAR(cpu_number), %ebx
22903+ shll $PAGE_SHIFT_asm, %ebx
22904+ addl $cpu_gdt_table, %ebx
22905+#else
22906+ movl $cpu_gdt_table, %ebx
22907+#endif
22908+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22909+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22910 shl $16, %eax
22911 addl %esp, %eax /* the adjusted stack pointer */
22912 pushl_cfi $__KERNEL_DS
22913@@ -737,7 +974,7 @@ ENTRY(irq_entries_start)
22914 CFI_ADJUST_CFA_OFFSET -4
22915 .align 8
22916 .endr
22917-END(irq_entries_start)
22918+ENDPROC(irq_entries_start)
22919
22920 /*
22921 * the CPU automatically disables interrupts when executing an IRQ vector,
22922@@ -790,7 +1027,7 @@ ENTRY(coprocessor_error)
22923 pushl_cfi $do_coprocessor_error
22924 jmp error_code
22925 CFI_ENDPROC
22926-END(coprocessor_error)
22927+ENDPROC(coprocessor_error)
22928
22929 ENTRY(simd_coprocessor_error)
22930 RING0_INT_FRAME
22931@@ -806,7 +1043,7 @@ ENTRY(simd_coprocessor_error)
22932 #endif
22933 jmp error_code
22934 CFI_ENDPROC
22935-END(simd_coprocessor_error)
22936+ENDPROC(simd_coprocessor_error)
22937
22938 ENTRY(device_not_available)
22939 RING0_INT_FRAME
22940@@ -815,18 +1052,18 @@ ENTRY(device_not_available)
22941 pushl_cfi $do_device_not_available
22942 jmp error_code
22943 CFI_ENDPROC
22944-END(device_not_available)
22945+ENDPROC(device_not_available)
22946
22947 #ifdef CONFIG_PARAVIRT
22948 ENTRY(native_iret)
22949 iret
22950 _ASM_EXTABLE(native_iret, iret_exc)
22951-END(native_iret)
22952+ENDPROC(native_iret)
22953
22954 ENTRY(native_irq_enable_sysexit)
22955 sti
22956 sysexit
22957-END(native_irq_enable_sysexit)
22958+ENDPROC(native_irq_enable_sysexit)
22959 #endif
22960
22961 ENTRY(overflow)
22962@@ -836,7 +1073,7 @@ ENTRY(overflow)
22963 pushl_cfi $do_overflow
22964 jmp error_code
22965 CFI_ENDPROC
22966-END(overflow)
22967+ENDPROC(overflow)
22968
22969 ENTRY(bounds)
22970 RING0_INT_FRAME
22971@@ -845,7 +1082,7 @@ ENTRY(bounds)
22972 pushl_cfi $do_bounds
22973 jmp error_code
22974 CFI_ENDPROC
22975-END(bounds)
22976+ENDPROC(bounds)
22977
22978 ENTRY(invalid_op)
22979 RING0_INT_FRAME
22980@@ -854,7 +1091,7 @@ ENTRY(invalid_op)
22981 pushl_cfi $do_invalid_op
22982 jmp error_code
22983 CFI_ENDPROC
22984-END(invalid_op)
22985+ENDPROC(invalid_op)
22986
22987 ENTRY(coprocessor_segment_overrun)
22988 RING0_INT_FRAME
22989@@ -863,7 +1100,7 @@ ENTRY(coprocessor_segment_overrun)
22990 pushl_cfi $do_coprocessor_segment_overrun
22991 jmp error_code
22992 CFI_ENDPROC
22993-END(coprocessor_segment_overrun)
22994+ENDPROC(coprocessor_segment_overrun)
22995
22996 ENTRY(invalid_TSS)
22997 RING0_EC_FRAME
22998@@ -871,7 +1108,7 @@ ENTRY(invalid_TSS)
22999 pushl_cfi $do_invalid_TSS
23000 jmp error_code
23001 CFI_ENDPROC
23002-END(invalid_TSS)
23003+ENDPROC(invalid_TSS)
23004
23005 ENTRY(segment_not_present)
23006 RING0_EC_FRAME
23007@@ -879,7 +1116,7 @@ ENTRY(segment_not_present)
23008 pushl_cfi $do_segment_not_present
23009 jmp error_code
23010 CFI_ENDPROC
23011-END(segment_not_present)
23012+ENDPROC(segment_not_present)
23013
23014 ENTRY(stack_segment)
23015 RING0_EC_FRAME
23016@@ -887,7 +1124,7 @@ ENTRY(stack_segment)
23017 pushl_cfi $do_stack_segment
23018 jmp error_code
23019 CFI_ENDPROC
23020-END(stack_segment)
23021+ENDPROC(stack_segment)
23022
23023 ENTRY(alignment_check)
23024 RING0_EC_FRAME
23025@@ -895,7 +1132,7 @@ ENTRY(alignment_check)
23026 pushl_cfi $do_alignment_check
23027 jmp error_code
23028 CFI_ENDPROC
23029-END(alignment_check)
23030+ENDPROC(alignment_check)
23031
23032 ENTRY(divide_error)
23033 RING0_INT_FRAME
23034@@ -904,7 +1141,7 @@ ENTRY(divide_error)
23035 pushl_cfi $do_divide_error
23036 jmp error_code
23037 CFI_ENDPROC
23038-END(divide_error)
23039+ENDPROC(divide_error)
23040
23041 #ifdef CONFIG_X86_MCE
23042 ENTRY(machine_check)
23043@@ -914,7 +1151,7 @@ ENTRY(machine_check)
23044 pushl_cfi machine_check_vector
23045 jmp error_code
23046 CFI_ENDPROC
23047-END(machine_check)
23048+ENDPROC(machine_check)
23049 #endif
23050
23051 ENTRY(spurious_interrupt_bug)
23052@@ -924,7 +1161,7 @@ ENTRY(spurious_interrupt_bug)
23053 pushl_cfi $do_spurious_interrupt_bug
23054 jmp error_code
23055 CFI_ENDPROC
23056-END(spurious_interrupt_bug)
23057+ENDPROC(spurious_interrupt_bug)
23058
23059 #ifdef CONFIG_XEN
23060 /* Xen doesn't set %esp to be precisely what the normal sysenter
23061@@ -1033,7 +1270,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
23062
23063 ENTRY(mcount)
23064 ret
23065-END(mcount)
23066+ENDPROC(mcount)
23067
23068 ENTRY(ftrace_caller)
23069 pushl %eax
23070@@ -1063,7 +1300,7 @@ ftrace_graph_call:
23071 .globl ftrace_stub
23072 ftrace_stub:
23073 ret
23074-END(ftrace_caller)
23075+ENDPROC(ftrace_caller)
23076
23077 ENTRY(ftrace_regs_caller)
23078 pushf /* push flags before compare (in cs location) */
23079@@ -1161,7 +1398,7 @@ trace:
23080 popl %ecx
23081 popl %eax
23082 jmp ftrace_stub
23083-END(mcount)
23084+ENDPROC(mcount)
23085 #endif /* CONFIG_DYNAMIC_FTRACE */
23086 #endif /* CONFIG_FUNCTION_TRACER */
23087
23088@@ -1179,7 +1416,7 @@ ENTRY(ftrace_graph_caller)
23089 popl %ecx
23090 popl %eax
23091 ret
23092-END(ftrace_graph_caller)
23093+ENDPROC(ftrace_graph_caller)
23094
23095 .globl return_to_handler
23096 return_to_handler:
23097@@ -1233,15 +1470,18 @@ error_code:
23098 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
23099 REG_TO_PTGS %ecx
23100 SET_KERNEL_GS %ecx
23101- movl $(__USER_DS), %ecx
23102+ movl $(__KERNEL_DS), %ecx
23103 movl %ecx, %ds
23104 movl %ecx, %es
23105+
23106+ pax_enter_kernel
23107+
23108 TRACE_IRQS_OFF
23109 movl %esp,%eax # pt_regs pointer
23110 call *%edi
23111 jmp ret_from_exception
23112 CFI_ENDPROC
23113-END(page_fault)
23114+ENDPROC(page_fault)
23115
23116 /*
23117 * Debug traps and NMI can happen at the one SYSENTER instruction
23118@@ -1284,7 +1524,7 @@ debug_stack_correct:
23119 call do_debug
23120 jmp ret_from_exception
23121 CFI_ENDPROC
23122-END(debug)
23123+ENDPROC(debug)
23124
23125 /*
23126 * NMI is doubly nasty. It can happen _while_ we're handling
23127@@ -1324,6 +1564,9 @@ nmi_stack_correct:
23128 xorl %edx,%edx # zero error code
23129 movl %esp,%eax # pt_regs pointer
23130 call do_nmi
23131+
23132+ pax_exit_kernel
23133+
23134 jmp restore_all_notrace
23135 CFI_ENDPROC
23136
23137@@ -1361,13 +1604,16 @@ nmi_espfix_stack:
23138 FIXUP_ESPFIX_STACK # %eax == %esp
23139 xorl %edx,%edx # zero error code
23140 call do_nmi
23141+
23142+ pax_exit_kernel
23143+
23144 RESTORE_REGS
23145 lss 12+4(%esp), %esp # back to espfix stack
23146 CFI_ADJUST_CFA_OFFSET -24
23147 jmp irq_return
23148 #endif
23149 CFI_ENDPROC
23150-END(nmi)
23151+ENDPROC(nmi)
23152
23153 ENTRY(int3)
23154 RING0_INT_FRAME
23155@@ -1380,14 +1626,14 @@ ENTRY(int3)
23156 call do_int3
23157 jmp ret_from_exception
23158 CFI_ENDPROC
23159-END(int3)
23160+ENDPROC(int3)
23161
23162 ENTRY(general_protection)
23163 RING0_EC_FRAME
23164 pushl_cfi $do_general_protection
23165 jmp error_code
23166 CFI_ENDPROC
23167-END(general_protection)
23168+ENDPROC(general_protection)
23169
23170 #ifdef CONFIG_KVM_GUEST
23171 ENTRY(async_page_fault)
23172@@ -1396,6 +1642,6 @@ ENTRY(async_page_fault)
23173 pushl_cfi $do_async_page_fault
23174 jmp error_code
23175 CFI_ENDPROC
23176-END(async_page_fault)
23177+ENDPROC(async_page_fault)
23178 #endif
23179
23180diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23181index 4bd6c19..a0eba01 100644
23182--- a/arch/x86/kernel/entry_64.S
23183+++ b/arch/x86/kernel/entry_64.S
23184@@ -46,6 +46,8 @@
23185 #include <asm/smap.h>
23186 #include <asm/pgtable_types.h>
23187 #include <linux/err.h>
23188+#include <asm/pgtable.h>
23189+#include <asm/alternative-asm.h>
23190
23191 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23192 #include <linux/elf-em.h>
23193@@ -64,6 +66,401 @@ ENTRY(native_usergs_sysret64)
23194 ENDPROC(native_usergs_sysret64)
23195 #endif /* CONFIG_PARAVIRT */
23196
23197+ .macro ljmpq sel, off
23198+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23199+ .byte 0x48; ljmp *1234f(%rip)
23200+ .pushsection .rodata
23201+ .align 16
23202+ 1234: .quad \off; .word \sel
23203+ .popsection
23204+#else
23205+ pushq $\sel
23206+ pushq $\off
23207+ lretq
23208+#endif
23209+ .endm
23210+
23211+ .macro pax_enter_kernel
23212+ pax_set_fptr_mask
23213+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23214+ call pax_enter_kernel
23215+#endif
23216+ .endm
23217+
23218+ .macro pax_exit_kernel
23219+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23220+ call pax_exit_kernel
23221+#endif
23222+ .endm
23223+
23224+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23225+ENTRY(pax_enter_kernel)
23226+ pushq %rdi
23227+
23228+#ifdef CONFIG_PARAVIRT
23229+ PV_SAVE_REGS(CLBR_RDI)
23230+#endif
23231+
23232+#ifdef CONFIG_PAX_KERNEXEC
23233+ GET_CR0_INTO_RDI
23234+ bts $X86_CR0_WP_BIT,%rdi
23235+ jnc 3f
23236+ mov %cs,%edi
23237+ cmp $__KERNEL_CS,%edi
23238+ jnz 2f
23239+1:
23240+#endif
23241+
23242+#ifdef CONFIG_PAX_MEMORY_UDEREF
23243+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23244+ GET_CR3_INTO_RDI
23245+ cmp $0,%dil
23246+ jnz 112f
23247+ mov $__KERNEL_DS,%edi
23248+ mov %edi,%ss
23249+ jmp 111f
23250+112: cmp $1,%dil
23251+ jz 113f
23252+ ud2
23253+113: sub $4097,%rdi
23254+ bts $63,%rdi
23255+ SET_RDI_INTO_CR3
23256+ mov $__UDEREF_KERNEL_DS,%edi
23257+ mov %edi,%ss
23258+111:
23259+#endif
23260+
23261+#ifdef CONFIG_PARAVIRT
23262+ PV_RESTORE_REGS(CLBR_RDI)
23263+#endif
23264+
23265+ popq %rdi
23266+ pax_force_retaddr
23267+ retq
23268+
23269+#ifdef CONFIG_PAX_KERNEXEC
23270+2: ljmpq __KERNEL_CS,1b
23271+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23272+4: SET_RDI_INTO_CR0
23273+ jmp 1b
23274+#endif
23275+ENDPROC(pax_enter_kernel)
23276+
23277+ENTRY(pax_exit_kernel)
23278+ pushq %rdi
23279+
23280+#ifdef CONFIG_PARAVIRT
23281+ PV_SAVE_REGS(CLBR_RDI)
23282+#endif
23283+
23284+#ifdef CONFIG_PAX_KERNEXEC
23285+ mov %cs,%rdi
23286+ cmp $__KERNEXEC_KERNEL_CS,%edi
23287+ jz 2f
23288+ GET_CR0_INTO_RDI
23289+ bts $X86_CR0_WP_BIT,%rdi
23290+ jnc 4f
23291+1:
23292+#endif
23293+
23294+#ifdef CONFIG_PAX_MEMORY_UDEREF
23295+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23296+ mov %ss,%edi
23297+ cmp $__UDEREF_KERNEL_DS,%edi
23298+ jnz 111f
23299+ GET_CR3_INTO_RDI
23300+ cmp $0,%dil
23301+ jz 112f
23302+ ud2
23303+112: add $4097,%rdi
23304+ bts $63,%rdi
23305+ SET_RDI_INTO_CR3
23306+ mov $__KERNEL_DS,%edi
23307+ mov %edi,%ss
23308+111:
23309+#endif
23310+
23311+#ifdef CONFIG_PARAVIRT
23312+ PV_RESTORE_REGS(CLBR_RDI);
23313+#endif
23314+
23315+ popq %rdi
23316+ pax_force_retaddr
23317+ retq
23318+
23319+#ifdef CONFIG_PAX_KERNEXEC
23320+2: GET_CR0_INTO_RDI
23321+ btr $X86_CR0_WP_BIT,%rdi
23322+ jnc 4f
23323+ ljmpq __KERNEL_CS,3f
23324+3: SET_RDI_INTO_CR0
23325+ jmp 1b
23326+4: ud2
23327+ jmp 4b
23328+#endif
23329+ENDPROC(pax_exit_kernel)
23330+#endif
23331+
23332+ .macro pax_enter_kernel_user
23333+ pax_set_fptr_mask
23334+#ifdef CONFIG_PAX_MEMORY_UDEREF
23335+ call pax_enter_kernel_user
23336+#endif
23337+ .endm
23338+
23339+ .macro pax_exit_kernel_user
23340+#ifdef CONFIG_PAX_MEMORY_UDEREF
23341+ call pax_exit_kernel_user
23342+#endif
23343+#ifdef CONFIG_PAX_RANDKSTACK
23344+ pushq %rax
23345+ pushq %r11
23346+ call pax_randomize_kstack
23347+ popq %r11
23348+ popq %rax
23349+#endif
23350+ .endm
23351+
23352+#ifdef CONFIG_PAX_MEMORY_UDEREF
23353+ENTRY(pax_enter_kernel_user)
23354+ pushq %rdi
23355+ pushq %rbx
23356+
23357+#ifdef CONFIG_PARAVIRT
23358+ PV_SAVE_REGS(CLBR_RDI)
23359+#endif
23360+
23361+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23362+ GET_CR3_INTO_RDI
23363+ cmp $1,%dil
23364+ jnz 4f
23365+ sub $4097,%rdi
23366+ bts $63,%rdi
23367+ SET_RDI_INTO_CR3
23368+ jmp 3f
23369+111:
23370+
23371+ GET_CR3_INTO_RDI
23372+ mov %rdi,%rbx
23373+ add $__START_KERNEL_map,%rbx
23374+ sub phys_base(%rip),%rbx
23375+
23376+#ifdef CONFIG_PARAVIRT
23377+ cmpl $0, pv_info+PARAVIRT_enabled
23378+ jz 1f
23379+ pushq %rdi
23380+ i = 0
23381+ .rept USER_PGD_PTRS
23382+ mov i*8(%rbx),%rsi
23383+ mov $0,%sil
23384+ lea i*8(%rbx),%rdi
23385+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23386+ i = i + 1
23387+ .endr
23388+ popq %rdi
23389+ jmp 2f
23390+1:
23391+#endif
23392+
23393+ i = 0
23394+ .rept USER_PGD_PTRS
23395+ movb $0,i*8(%rbx)
23396+ i = i + 1
23397+ .endr
23398+
23399+2: SET_RDI_INTO_CR3
23400+
23401+#ifdef CONFIG_PAX_KERNEXEC
23402+ GET_CR0_INTO_RDI
23403+ bts $X86_CR0_WP_BIT,%rdi
23404+ SET_RDI_INTO_CR0
23405+#endif
23406+
23407+3:
23408+
23409+#ifdef CONFIG_PARAVIRT
23410+ PV_RESTORE_REGS(CLBR_RDI)
23411+#endif
23412+
23413+ popq %rbx
23414+ popq %rdi
23415+ pax_force_retaddr
23416+ retq
23417+4: ud2
23418+ENDPROC(pax_enter_kernel_user)
23419+
23420+ENTRY(pax_exit_kernel_user)
23421+ pushq %rdi
23422+ pushq %rbx
23423+
23424+#ifdef CONFIG_PARAVIRT
23425+ PV_SAVE_REGS(CLBR_RDI)
23426+#endif
23427+
23428+ GET_CR3_INTO_RDI
23429+ ALTERNATIVE "jmp 1f", "", X86_FEATURE_PCID
23430+ cmp $0,%dil
23431+ jnz 3f
23432+ add $4097,%rdi
23433+ bts $63,%rdi
23434+ SET_RDI_INTO_CR3
23435+ jmp 2f
23436+1:
23437+
23438+ mov %rdi,%rbx
23439+
23440+#ifdef CONFIG_PAX_KERNEXEC
23441+ GET_CR0_INTO_RDI
23442+ btr $X86_CR0_WP_BIT,%rdi
23443+ jnc 3f
23444+ SET_RDI_INTO_CR0
23445+#endif
23446+
23447+ add $__START_KERNEL_map,%rbx
23448+ sub phys_base(%rip),%rbx
23449+
23450+#ifdef CONFIG_PARAVIRT
23451+ cmpl $0, pv_info+PARAVIRT_enabled
23452+ jz 1f
23453+ i = 0
23454+ .rept USER_PGD_PTRS
23455+ mov i*8(%rbx),%rsi
23456+ mov $0x67,%sil
23457+ lea i*8(%rbx),%rdi
23458+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23459+ i = i + 1
23460+ .endr
23461+ jmp 2f
23462+1:
23463+#endif
23464+
23465+ i = 0
23466+ .rept USER_PGD_PTRS
23467+ movb $0x67,i*8(%rbx)
23468+ i = i + 1
23469+ .endr
23470+2:
23471+
23472+#ifdef CONFIG_PARAVIRT
23473+ PV_RESTORE_REGS(CLBR_RDI)
23474+#endif
23475+
23476+ popq %rbx
23477+ popq %rdi
23478+ pax_force_retaddr
23479+ retq
23480+3: ud2
23481+ENDPROC(pax_exit_kernel_user)
23482+#endif
23483+
23484+ .macro pax_enter_kernel_nmi
23485+ pax_set_fptr_mask
23486+
23487+#ifdef CONFIG_PAX_KERNEXEC
23488+ GET_CR0_INTO_RDI
23489+ bts $X86_CR0_WP_BIT,%rdi
23490+ jc 110f
23491+ SET_RDI_INTO_CR0
23492+ or $2,%ebx
23493+110:
23494+#endif
23495+
23496+#ifdef CONFIG_PAX_MEMORY_UDEREF
23497+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23498+ GET_CR3_INTO_RDI
23499+ cmp $0,%dil
23500+ jz 111f
23501+ sub $4097,%rdi
23502+ or $4,%ebx
23503+ bts $63,%rdi
23504+ SET_RDI_INTO_CR3
23505+ mov $__UDEREF_KERNEL_DS,%edi
23506+ mov %edi,%ss
23507+111:
23508+#endif
23509+ .endm
23510+
23511+ .macro pax_exit_kernel_nmi
23512+#ifdef CONFIG_PAX_KERNEXEC
23513+ btr $1,%ebx
23514+ jnc 110f
23515+ GET_CR0_INTO_RDI
23516+ btr $X86_CR0_WP_BIT,%rdi
23517+ SET_RDI_INTO_CR0
23518+110:
23519+#endif
23520+
23521+#ifdef CONFIG_PAX_MEMORY_UDEREF
23522+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23523+ btr $2,%ebx
23524+ jnc 111f
23525+ GET_CR3_INTO_RDI
23526+ add $4097,%rdi
23527+ bts $63,%rdi
23528+ SET_RDI_INTO_CR3
23529+ mov $__KERNEL_DS,%edi
23530+ mov %edi,%ss
23531+111:
23532+#endif
23533+ .endm
23534+
23535+ .macro pax_erase_kstack
23536+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23537+ call pax_erase_kstack
23538+#endif
23539+ .endm
23540+
23541+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23542+ENTRY(pax_erase_kstack)
23543+ pushq %rdi
23544+ pushq %rcx
23545+ pushq %rax
23546+ pushq %r11
23547+
23548+ GET_THREAD_INFO(%r11)
23549+ mov TI_lowest_stack(%r11), %rdi
23550+ mov $-0xBEEF, %rax
23551+ std
23552+
23553+1: mov %edi, %ecx
23554+ and $THREAD_SIZE_asm - 1, %ecx
23555+ shr $3, %ecx
23556+ repne scasq
23557+ jecxz 2f
23558+
23559+ cmp $2*8, %ecx
23560+ jc 2f
23561+
23562+ mov $2*8, %ecx
23563+ repe scasq
23564+ jecxz 2f
23565+ jne 1b
23566+
23567+2: cld
23568+ or $2*8, %rdi
23569+ mov %esp, %ecx
23570+ sub %edi, %ecx
23571+
23572+ cmp $THREAD_SIZE_asm, %rcx
23573+ jb 3f
23574+ ud2
23575+3:
23576+
23577+ shr $3, %ecx
23578+ rep stosq
23579+
23580+ mov TI_task_thread_sp0(%r11), %rdi
23581+ sub $256, %rdi
23582+ mov %rdi, TI_lowest_stack(%r11)
23583+
23584+ popq %r11
23585+ popq %rax
23586+ popq %rcx
23587+ popq %rdi
23588+ pax_force_retaddr
23589+ ret
23590+ENDPROC(pax_erase_kstack)
23591+#endif
23592
23593 .macro TRACE_IRQS_IRETQ
23594 #ifdef CONFIG_TRACE_IRQFLAGS
23595@@ -100,7 +497,7 @@ ENDPROC(native_usergs_sysret64)
23596 .endm
23597
23598 .macro TRACE_IRQS_IRETQ_DEBUG
23599- bt $9,EFLAGS(%rsp) /* interrupts off? */
23600+ bt $X86_EFLAGS_IF_BIT,EFLAGS(%rsp) /* interrupts off? */
23601 jnc 1f
23602 TRACE_IRQS_ON_DEBUG
23603 1:
23604@@ -221,14 +618,6 @@ GLOBAL(system_call_after_swapgs)
23605 /* Construct struct pt_regs on stack */
23606 pushq_cfi $__USER_DS /* pt_regs->ss */
23607 pushq_cfi PER_CPU_VAR(rsp_scratch) /* pt_regs->sp */
23608- /*
23609- * Re-enable interrupts.
23610- * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23611- * must execute atomically in the face of possible interrupt-driven
23612- * task preemption. We must enable interrupts only after we're done
23613- * with using rsp_scratch:
23614- */
23615- ENABLE_INTERRUPTS(CLBR_NONE)
23616 pushq_cfi %r11 /* pt_regs->flags */
23617 pushq_cfi $__USER_CS /* pt_regs->cs */
23618 pushq_cfi %rcx /* pt_regs->ip */
23619@@ -246,7 +635,27 @@ GLOBAL(system_call_after_swapgs)
23620 sub $(6*8),%rsp /* pt_regs->bp,bx,r12-15 not saved */
23621 CFI_ADJUST_CFA_OFFSET 6*8
23622
23623- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23624+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
23625+ movq_cfi r12, R12
23626+#endif
23627+
23628+ pax_enter_kernel_user
23629+
23630+#ifdef CONFIG_PAX_RANDKSTACK
23631+ pax_erase_kstack
23632+#endif
23633+
23634+ /*
23635+ * Re-enable interrupts.
23636+ * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23637+ * must execute atomically in the face of possible interrupt-driven
23638+ * task preemption. We must enable interrupts only after we're done
23639+ * with using rsp_scratch:
23640+ */
23641+ ENABLE_INTERRUPTS(CLBR_NONE)
23642+
23643+ GET_THREAD_INFO(%rcx)
23644+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23645 jnz tracesys
23646 system_call_fastpath:
23647 #if __SYSCALL_MASK == ~0
23648@@ -279,10 +688,13 @@ system_call_fastpath:
23649 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23650 * very bad.
23651 */
23652- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23653+ GET_THREAD_INFO(%rcx)
23654+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23655 jnz int_ret_from_sys_call_irqs_off /* Go to the slow path */
23656
23657 CFI_REMEMBER_STATE
23658+ pax_exit_kernel_user
23659+ pax_erase_kstack
23660
23661 RESTORE_C_REGS_EXCEPT_RCX_R11
23662 movq RIP(%rsp),%rcx
23663@@ -316,6 +728,9 @@ tracesys:
23664 call syscall_trace_enter_phase1
23665 test %rax, %rax
23666 jnz tracesys_phase2 /* if needed, run the slow path */
23667+
23668+ pax_erase_kstack
23669+
23670 RESTORE_C_REGS_EXCEPT_RAX /* else restore clobbered regs */
23671 movq ORIG_RAX(%rsp), %rax
23672 jmp system_call_fastpath /* and return to the fast path */
23673@@ -327,6 +742,8 @@ tracesys_phase2:
23674 movq %rax,%rdx
23675 call syscall_trace_enter_phase2
23676
23677+ pax_erase_kstack
23678+
23679 /*
23680 * Reload registers from stack in case ptrace changed them.
23681 * We don't reload %rax because syscall_trace_entry_phase2() returned
23682@@ -364,6 +781,8 @@ GLOBAL(int_with_check)
23683 andl %edi,%edx
23684 jnz int_careful
23685 andl $~TS_COMPAT,TI_status(%rcx)
23686+ pax_exit_kernel_user
23687+ pax_erase_kstack
23688 jmp syscall_return
23689
23690 /* Either reschedule or signal or syscall exit tracking needed. */
23691@@ -485,7 +904,7 @@ opportunistic_sysret_failed:
23692 SWAPGS
23693 jmp restore_c_regs_and_iret
23694 CFI_ENDPROC
23695-END(system_call)
23696+ENDPROC(system_call)
23697
23698
23699 .macro FORK_LIKE func
23700@@ -495,7 +914,7 @@ ENTRY(stub_\func)
23701 SAVE_EXTRA_REGS 8
23702 jmp sys_\func
23703 CFI_ENDPROC
23704-END(stub_\func)
23705+ENDPROC(stub_\func)
23706 .endm
23707
23708 FORK_LIKE clone
23709@@ -519,7 +938,7 @@ return_from_execve:
23710 movq %rax,RAX(%rsp)
23711 jmp int_ret_from_sys_call
23712 CFI_ENDPROC
23713-END(stub_execve)
23714+ENDPROC(stub_execve)
23715 /*
23716 * Remaining execve stubs are only 7 bytes long.
23717 * ENTRY() often aligns to 16 bytes, which in this case has no benefits.
23718@@ -531,7 +950,7 @@ GLOBAL(stub_execveat)
23719 call sys_execveat
23720 jmp return_from_execve
23721 CFI_ENDPROC
23722-END(stub_execveat)
23723+ENDPROC(stub_execveat)
23724
23725 #ifdef CONFIG_X86_X32_ABI
23726 .align 8
23727@@ -541,7 +960,7 @@ GLOBAL(stub_x32_execve)
23728 call compat_sys_execve
23729 jmp return_from_execve
23730 CFI_ENDPROC
23731-END(stub_x32_execve)
23732+ENDPROC(stub_x32_execve)
23733 .align 8
23734 GLOBAL(stub_x32_execveat)
23735 CFI_STARTPROC
23736@@ -549,7 +968,7 @@ GLOBAL(stub_x32_execveat)
23737 call compat_sys_execveat
23738 jmp return_from_execve
23739 CFI_ENDPROC
23740-END(stub_x32_execveat)
23741+ENDPROC(stub_x32_execveat)
23742 #endif
23743
23744 #ifdef CONFIG_IA32_EMULATION
23745@@ -592,7 +1011,7 @@ return_from_stub:
23746 movq %rax,RAX(%rsp)
23747 jmp int_ret_from_sys_call
23748 CFI_ENDPROC
23749-END(stub_rt_sigreturn)
23750+ENDPROC(stub_rt_sigreturn)
23751
23752 #ifdef CONFIG_X86_X32_ABI
23753 ENTRY(stub_x32_rt_sigreturn)
23754@@ -602,7 +1021,7 @@ ENTRY(stub_x32_rt_sigreturn)
23755 call sys32_x32_rt_sigreturn
23756 jmp return_from_stub
23757 CFI_ENDPROC
23758-END(stub_x32_rt_sigreturn)
23759+ENDPROC(stub_x32_rt_sigreturn)
23760 #endif
23761
23762 /*
23763@@ -622,7 +1041,7 @@ ENTRY(ret_from_fork)
23764
23765 RESTORE_EXTRA_REGS
23766
23767- testl $3,CS(%rsp) # from kernel_thread?
23768+ testb $3,CS(%rsp) # from kernel_thread?
23769
23770 /*
23771 * By the time we get here, we have no idea whether our pt_regs,
23772@@ -641,7 +1060,7 @@ ENTRY(ret_from_fork)
23773 RESTORE_EXTRA_REGS
23774 jmp int_ret_from_sys_call
23775 CFI_ENDPROC
23776-END(ret_from_fork)
23777+ENDPROC(ret_from_fork)
23778
23779 /*
23780 * Build the entry stubs with some assembler magic.
23781@@ -659,7 +1078,7 @@ ENTRY(irq_entries_start)
23782 .align 8
23783 .endr
23784 CFI_ENDPROC
23785-END(irq_entries_start)
23786+ENDPROC(irq_entries_start)
23787
23788 /*
23789 * Interrupt entry/exit.
23790@@ -672,21 +1091,13 @@ END(irq_entries_start)
23791 /* 0(%rsp): ~(interrupt number) */
23792 .macro interrupt func
23793 cld
23794- /*
23795- * Since nothing in interrupt handling code touches r12...r15 members
23796- * of "struct pt_regs", and since interrupts can nest, we can save
23797- * four stack slots and simultaneously provide
23798- * an unwind-friendly stack layout by saving "truncated" pt_regs
23799- * exactly up to rbp slot, without these members.
23800- */
23801- ALLOC_PT_GPREGS_ON_STACK -RBP
23802- SAVE_C_REGS -RBP
23803- /* this goes to 0(%rsp) for unwinder, not for saving the value: */
23804- SAVE_EXTRA_REGS_RBP -RBP
23805+ ALLOC_PT_GPREGS_ON_STACK
23806+ SAVE_C_REGS
23807+ SAVE_EXTRA_REGS
23808
23809- leaq -RBP(%rsp),%rdi /* arg1 for \func (pointer to pt_regs) */
23810+ movq %rsp,%rdi /* arg1 for \func (pointer to pt_regs) */
23811
23812- testl $3, CS-RBP(%rsp)
23813+ testb $3, CS(%rsp)
23814 je 1f
23815 SWAPGS
23816 1:
23817@@ -709,8 +1120,20 @@ END(irq_entries_start)
23818 CFI_ESCAPE 0x0f /* DW_CFA_def_cfa_expression */, 6, \
23819 0x77 /* DW_OP_breg7 (rsp) */, 0, \
23820 0x06 /* DW_OP_deref */, \
23821- 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS-RBP, \
23822+ 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS, \
23823 0x22 /* DW_OP_plus */
23824+
23825+#ifdef CONFIG_PAX_MEMORY_UDEREF
23826+ testb $3, CS(%rdi)
23827+ jnz 1f
23828+ pax_enter_kernel
23829+ jmp 2f
23830+1: pax_enter_kernel_user
23831+2:
23832+#else
23833+ pax_enter_kernel
23834+#endif
23835+
23836 /* We entered an interrupt context - irqs are off: */
23837 TRACE_IRQS_OFF
23838
23839@@ -735,13 +1158,12 @@ ret_from_intr:
23840
23841 /* Restore saved previous stack */
23842 popq %rsi
23843- CFI_DEF_CFA rsi,SIZEOF_PTREGS-RBP /* reg/off reset after def_cfa_expr */
23844- /* return code expects complete pt_regs - adjust rsp accordingly: */
23845- leaq -RBP(%rsi),%rsp
23846+ CFI_DEF_CFA rsi,SIZEOF_PTREGS /* reg/off reset after def_cfa_expr */
23847+ movq %rsi, %rsp
23848 CFI_DEF_CFA_REGISTER rsp
23849- CFI_ADJUST_CFA_OFFSET RBP
23850+ CFI_ADJUST_CFA_OFFSET 0
23851
23852- testl $3,CS(%rsp)
23853+ testb $3,CS(%rsp)
23854 je retint_kernel
23855 /* Interrupt came from user space */
23856
23857@@ -763,6 +1185,8 @@ retint_swapgs: /* return to user-space */
23858 * The iretq could re-enable interrupts:
23859 */
23860 DISABLE_INTERRUPTS(CLBR_ANY)
23861+ pax_exit_kernel_user
23862+# pax_erase_kstack
23863 TRACE_IRQS_IRETQ
23864
23865 SWAPGS
23866@@ -781,6 +1205,21 @@ retint_kernel:
23867 jmp 0b
23868 1:
23869 #endif
23870+
23871+ pax_exit_kernel
23872+
23873+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23874+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23875+ * namely calling EFI runtime services with a phys mapping. We're
23876+ * starting off with NOPs and patch in the real instrumentation
23877+ * (BTS/OR) before starting any userland process; even before starting
23878+ * up the APs.
23879+ */
23880+ ALTERNATIVE "", "pax_force_retaddr 16*8", X86_FEATURE_ALWAYS
23881+#else
23882+ pax_force_retaddr RIP
23883+#endif
23884+
23885 /*
23886 * The iretq could re-enable interrupts:
23887 */
23888@@ -822,15 +1261,15 @@ native_irq_return_ldt:
23889 SWAPGS
23890 movq PER_CPU_VAR(espfix_waddr),%rdi
23891 movq %rax,(0*8)(%rdi) /* RAX */
23892- movq (2*8)(%rsp),%rax /* RIP */
23893+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23894 movq %rax,(1*8)(%rdi)
23895- movq (3*8)(%rsp),%rax /* CS */
23896+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23897 movq %rax,(2*8)(%rdi)
23898- movq (4*8)(%rsp),%rax /* RFLAGS */
23899+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23900 movq %rax,(3*8)(%rdi)
23901- movq (6*8)(%rsp),%rax /* SS */
23902+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23903 movq %rax,(5*8)(%rdi)
23904- movq (5*8)(%rsp),%rax /* RSP */
23905+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23906 movq %rax,(4*8)(%rdi)
23907 andl $0xffff0000,%eax
23908 popq_cfi %rdi
23909@@ -873,7 +1312,7 @@ retint_signal:
23910 jmp retint_with_reschedule
23911
23912 CFI_ENDPROC
23913-END(common_interrupt)
23914+ENDPROC(common_interrupt)
23915
23916 /*
23917 * APIC interrupts.
23918@@ -887,7 +1326,7 @@ ENTRY(\sym)
23919 interrupt \do_sym
23920 jmp ret_from_intr
23921 CFI_ENDPROC
23922-END(\sym)
23923+ENDPROC(\sym)
23924 .endm
23925
23926 #ifdef CONFIG_TRACING
23927@@ -960,7 +1399,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23928 /*
23929 * Exception entry points.
23930 */
23931-#define CPU_TSS_IST(x) PER_CPU_VAR(cpu_tss) + (TSS_ist + ((x) - 1) * 8)
23932+#define CPU_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23933
23934 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23935 ENTRY(\sym)
23936@@ -1016,6 +1455,12 @@ ENTRY(\sym)
23937 .endif
23938
23939 .if \shift_ist != -1
23940+#ifdef CONFIG_SMP
23941+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23942+ lea cpu_tss(%r13), %r13
23943+#else
23944+ lea cpu_tss(%rip), %r13
23945+#endif
23946 subq $EXCEPTION_STKSZ, CPU_TSS_IST(\shift_ist)
23947 .endif
23948
23949@@ -1063,7 +1508,7 @@ ENTRY(\sym)
23950 .endif
23951
23952 CFI_ENDPROC
23953-END(\sym)
23954+ENDPROC(\sym)
23955 .endm
23956
23957 #ifdef CONFIG_TRACING
23958@@ -1104,9 +1549,10 @@ gs_change:
23959 2: mfence /* workaround */
23960 SWAPGS
23961 popfq_cfi
23962+ pax_force_retaddr
23963 ret
23964 CFI_ENDPROC
23965-END(native_load_gs_index)
23966+ENDPROC(native_load_gs_index)
23967
23968 _ASM_EXTABLE(gs_change,bad_gs)
23969 .section .fixup,"ax"
23970@@ -1134,9 +1580,10 @@ ENTRY(do_softirq_own_stack)
23971 CFI_DEF_CFA_REGISTER rsp
23972 CFI_ADJUST_CFA_OFFSET -8
23973 decl PER_CPU_VAR(irq_count)
23974+ pax_force_retaddr
23975 ret
23976 CFI_ENDPROC
23977-END(do_softirq_own_stack)
23978+ENDPROC(do_softirq_own_stack)
23979
23980 #ifdef CONFIG_XEN
23981 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
23982@@ -1177,7 +1624,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23983 #endif
23984 jmp error_exit
23985 CFI_ENDPROC
23986-END(xen_do_hypervisor_callback)
23987+ENDPROC(xen_do_hypervisor_callback)
23988
23989 /*
23990 * Hypervisor uses this for application faults while it executes.
23991@@ -1238,7 +1685,7 @@ ENTRY(xen_failsafe_callback)
23992 SAVE_EXTRA_REGS
23993 jmp error_exit
23994 CFI_ENDPROC
23995-END(xen_failsafe_callback)
23996+ENDPROC(xen_failsafe_callback)
23997
23998 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23999 xen_hvm_callback_vector xen_evtchn_do_upcall
24000@@ -1284,9 +1731,39 @@ ENTRY(paranoid_entry)
24001 js 1f /* negative -> in kernel */
24002 SWAPGS
24003 xorl %ebx,%ebx
24004-1: ret
24005+1:
24006+#ifdef CONFIG_PAX_MEMORY_UDEREF
24007+ testb $3, CS+8(%rsp)
24008+ jnz 1f
24009+ pax_enter_kernel
24010+ jmp 2f
24011+1: pax_enter_kernel_user
24012+2:
24013+#else
24014+ pax_enter_kernel
24015+#endif
24016+ pax_force_retaddr
24017+ ret
24018 CFI_ENDPROC
24019-END(paranoid_entry)
24020+ENDPROC(paranoid_entry)
24021+
24022+ENTRY(paranoid_entry_nmi)
24023+ XCPT_FRAME 1 15*8
24024+ cld
24025+ SAVE_C_REGS 8
24026+ SAVE_EXTRA_REGS 8
24027+ movl $1,%ebx
24028+ movl $MSR_GS_BASE,%ecx
24029+ rdmsr
24030+ testl %edx,%edx
24031+ js 1f /* negative -> in kernel */
24032+ SWAPGS
24033+ xorl %ebx,%ebx
24034+1: pax_enter_kernel_nmi
24035+ pax_force_retaddr
24036+ ret
24037+ CFI_ENDPROC
24038+ENDPROC(paranoid_entry_nmi)
24039
24040 /*
24041 * "Paranoid" exit path from exception stack. This is invoked
24042@@ -1303,20 +1780,27 @@ ENTRY(paranoid_exit)
24043 DEFAULT_FRAME
24044 DISABLE_INTERRUPTS(CLBR_NONE)
24045 TRACE_IRQS_OFF_DEBUG
24046- testl %ebx,%ebx /* swapgs needed? */
24047+ testl $1,%ebx /* swapgs needed? */
24048 jnz paranoid_exit_no_swapgs
24049+#ifdef CONFIG_PAX_MEMORY_UDEREF
24050+ pax_exit_kernel_user
24051+#else
24052+ pax_exit_kernel
24053+#endif
24054 TRACE_IRQS_IRETQ
24055 SWAPGS_UNSAFE_STACK
24056 jmp paranoid_exit_restore
24057 paranoid_exit_no_swapgs:
24058+ pax_exit_kernel
24059 TRACE_IRQS_IRETQ_DEBUG
24060 paranoid_exit_restore:
24061 RESTORE_EXTRA_REGS
24062 RESTORE_C_REGS
24063 REMOVE_PT_GPREGS_FROM_STACK 8
24064+ pax_force_retaddr_bts
24065 INTERRUPT_RETURN
24066 CFI_ENDPROC
24067-END(paranoid_exit)
24068+ENDPROC(paranoid_exit)
24069
24070 /*
24071 * Save all registers in pt_regs, and switch gs if needed.
24072@@ -1328,12 +1812,23 @@ ENTRY(error_entry)
24073 SAVE_C_REGS 8
24074 SAVE_EXTRA_REGS 8
24075 xorl %ebx,%ebx
24076- testl $3,CS+8(%rsp)
24077+ testb $3,CS+8(%rsp)
24078 je error_kernelspace
24079 error_swapgs:
24080 SWAPGS
24081 error_sti:
24082+#ifdef CONFIG_PAX_MEMORY_UDEREF
24083+ testb $3, CS+8(%rsp)
24084+ jnz 1f
24085+ pax_enter_kernel
24086+ jmp 2f
24087+1: pax_enter_kernel_user
24088+2:
24089+#else
24090+ pax_enter_kernel
24091+#endif
24092 TRACE_IRQS_OFF
24093+ pax_force_retaddr
24094 ret
24095
24096 /*
24097@@ -1368,7 +1863,7 @@ error_bad_iret:
24098 decl %ebx /* Return to usergs */
24099 jmp error_sti
24100 CFI_ENDPROC
24101-END(error_entry)
24102+ENDPROC(error_entry)
24103
24104
24105 /* On entry, ebx is "no swapgs" flag (1: don't need swapgs, 0: need it) */
24106@@ -1379,7 +1874,7 @@ ENTRY(error_exit)
24107 DISABLE_INTERRUPTS(CLBR_NONE)
24108 TRACE_IRQS_OFF
24109 GET_THREAD_INFO(%rcx)
24110- testl %eax,%eax
24111+ testl $1,%eax
24112 jne retint_kernel
24113 LOCKDEP_SYS_EXIT_IRQ
24114 movl TI_flags(%rcx),%edx
24115@@ -1388,7 +1883,7 @@ ENTRY(error_exit)
24116 jnz retint_careful
24117 jmp retint_swapgs
24118 CFI_ENDPROC
24119-END(error_exit)
24120+ENDPROC(error_exit)
24121
24122 /* Runs on exception stack */
24123 ENTRY(nmi)
24124@@ -1473,6 +1968,12 @@ ENTRY(nmi)
24125 pushq %r14 /* pt_regs->r14 */
24126 pushq %r15 /* pt_regs->r15 */
24127
24128+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24129+ xorl %ebx,%ebx
24130+#endif
24131+
24132+ pax_enter_kernel_nmi
24133+
24134 /*
24135 * At this point we no longer need to worry about stack damage
24136 * due to nesting -- we're on the normal thread stack and we're
24137@@ -1482,12 +1983,19 @@ ENTRY(nmi)
24138 movq $-1, %rsi
24139 call do_nmi
24140
24141+ pax_exit_kernel_nmi
24142+
24143 /*
24144 * Return back to user mode. We must *not* do the normal exit
24145 * work, because we don't want to enable interrupts. Fortunately,
24146 * do_nmi doesn't modify pt_regs.
24147 */
24148 SWAPGS
24149+
24150+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24151+ movq_cfi_restore RBX, rbx
24152+#endif
24153+
24154 jmp restore_c_regs_and_iret
24155
24156 .Lnmi_from_kernel:
24157@@ -1595,8 +2103,7 @@ nested_nmi:
24158 * Modify the "iret" frame to point to repeat_nmi, forcing another
24159 * iteration of NMI handling.
24160 */
24161- leaq -1*8(%rsp), %rdx
24162- movq %rdx, %rsp
24163+ subq $8, %rsp
24164 CFI_ADJUST_CFA_OFFSET 1*8
24165 leaq -10*8(%rsp), %rdx
24166 pushq_cfi $__KERNEL_DS
24167@@ -1614,6 +2121,7 @@ nested_nmi_out:
24168 CFI_RESTORE rdx
24169
24170 /* We are returning to kernel mode, so this cannot result in a fault. */
24171+# pax_force_retaddr_bts
24172 INTERRUPT_RETURN
24173
24174 CFI_RESTORE_STATE
24175@@ -1679,13 +2187,13 @@ end_repeat_nmi:
24176 ALLOC_PT_GPREGS_ON_STACK
24177
24178 /*
24179- * Use paranoid_entry to handle SWAPGS, but no need to use paranoid_exit
24180+ * Use paranoid_entry_nmi to handle SWAPGS, but no need to use paranoid_exit
24181 * as we should not be calling schedule in NMI context.
24182 * Even with normal interrupts enabled. An NMI should not be
24183 * setting NEED_RESCHED or anything that normal interrupts and
24184 * exceptions might do.
24185 */
24186- call paranoid_entry
24187+ call paranoid_entry_nmi
24188 DEFAULT_FRAME 0
24189
24190 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24191@@ -1693,7 +2201,9 @@ end_repeat_nmi:
24192 movq $-1,%rsi
24193 call do_nmi
24194
24195- testl %ebx,%ebx /* swapgs needed? */
24196+ pax_exit_kernel_nmi
24197+
24198+ testl $1,%ebx /* swapgs needed? */
24199 jnz nmi_restore
24200 nmi_swapgs:
24201 SWAPGS_UNSAFE_STACK
24202@@ -1704,6 +2214,8 @@ nmi_restore:
24203 /* Point RSP at the "iret" frame. */
24204 REMOVE_PT_GPREGS_FROM_STACK 6*8
24205
24206+ pax_force_retaddr_bts
24207+
24208 /*
24209 * Clear "NMI executing". Set DF first so that we can easily
24210 * distinguish the remaining code between here and IRET from
24211@@ -1722,12 +2234,12 @@ nmi_restore:
24212 */
24213 INTERRUPT_RETURN
24214 CFI_ENDPROC
24215-END(nmi)
24216+ENDPROC(nmi)
24217
24218 ENTRY(ignore_sysret)
24219 CFI_STARTPROC
24220 mov $-ENOSYS,%eax
24221 sysret
24222 CFI_ENDPROC
24223-END(ignore_sysret)
24224+ENDPROC(ignore_sysret)
24225
24226diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24227index f5d0730..5bce89c 100644
24228--- a/arch/x86/kernel/espfix_64.c
24229+++ b/arch/x86/kernel/espfix_64.c
24230@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24231 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24232 static void *espfix_pages[ESPFIX_MAX_PAGES];
24233
24234-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24235- __aligned(PAGE_SIZE);
24236+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24237
24238 static unsigned int page_random, slot_random;
24239
24240@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24241 void __init init_espfix_bsp(void)
24242 {
24243 pgd_t *pgd_p;
24244+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24245
24246 /* Install the espfix pud into the kernel page directory */
24247- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24248+ pgd_p = &init_level4_pgt[index];
24249 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24250
24251+#ifdef CONFIG_PAX_PER_CPU_PGD
24252+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24253+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24254+#endif
24255+
24256 /* Randomize the locations */
24257 init_espfix_random();
24258
24259@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24260 set_pte(&pte_p[n*PTE_STRIDE], pte);
24261
24262 /* Job is done for this CPU and any CPU which shares this page */
24263- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24264+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24265
24266 unlock_done:
24267 mutex_unlock(&espfix_init_mutex);
24268diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24269index 8b7b0a5..02219db 100644
24270--- a/arch/x86/kernel/ftrace.c
24271+++ b/arch/x86/kernel/ftrace.c
24272@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24273 * kernel identity mapping to modify code.
24274 */
24275 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24276- ip = (unsigned long)__va(__pa_symbol(ip));
24277+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24278
24279 return ip;
24280 }
24281@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24282 {
24283 unsigned char replaced[MCOUNT_INSN_SIZE];
24284
24285+ ip = ktla_ktva(ip);
24286+
24287 /*
24288 * Note: Due to modules and __init, code can
24289 * disappear and change, we need to protect against faulting
24290@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24291 unsigned char old[MCOUNT_INSN_SIZE];
24292 int ret;
24293
24294- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24295+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24296
24297 ftrace_update_func = ip;
24298 /* Make sure the breakpoints see the ftrace_update_func update */
24299@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24300 unsigned char replaced[MCOUNT_INSN_SIZE];
24301 unsigned char brk = BREAKPOINT_INSTRUCTION;
24302
24303- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24304+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24305 return -EFAULT;
24306
24307 /* Make sure it is what we expect it to be */
24308@@ -670,11 +672,11 @@ static unsigned char *ftrace_jmp_replace(unsigned long ip, unsigned long addr)
24309 /* Module allocation simplifies allocating memory for code */
24310 static inline void *alloc_tramp(unsigned long size)
24311 {
24312- return module_alloc(size);
24313+ return module_alloc_exec(size);
24314 }
24315 static inline void tramp_free(void *tramp)
24316 {
24317- module_memfree(tramp);
24318+ module_memfree_exec(tramp);
24319 }
24320 #else
24321 /* Trampolines can only be created if modules are supported */
24322@@ -753,7 +755,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24323 *tramp_size = size + MCOUNT_INSN_SIZE + sizeof(void *);
24324
24325 /* Copy ftrace_caller onto the trampoline memory */
24326+ pax_open_kernel();
24327 ret = probe_kernel_read(trampoline, (void *)start_offset, size);
24328+ pax_close_kernel();
24329 if (WARN_ON(ret < 0)) {
24330 tramp_free(trampoline);
24331 return 0;
24332@@ -763,6 +767,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24333
24334 /* The trampoline ends with a jmp to ftrace_return */
24335 jmp = ftrace_jmp_replace(ip, (unsigned long)ftrace_return);
24336+ pax_open_kernel();
24337 memcpy(trampoline + size, jmp, MCOUNT_INSN_SIZE);
24338
24339 /*
24340@@ -775,6 +780,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24341
24342 ptr = (unsigned long *)(trampoline + size + MCOUNT_INSN_SIZE);
24343 *ptr = (unsigned long)ops;
24344+ pax_close_kernel();
24345
24346 op_offset -= start_offset;
24347 memcpy(&op_ptr, trampoline + op_offset, OP_REF_SIZE);
24348@@ -792,7 +798,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24349 op_ptr.offset = offset;
24350
24351 /* put in the new offset to the ftrace_ops */
24352+ pax_open_kernel();
24353 memcpy(trampoline + op_offset, &op_ptr, OP_REF_SIZE);
24354+ pax_close_kernel();
24355
24356 /* ALLOC_TRAMP flags lets us know we created it */
24357 ops->flags |= FTRACE_OPS_FL_ALLOC_TRAMP;
24358diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24359index f129a9a..af8f6da 100644
24360--- a/arch/x86/kernel/head64.c
24361+++ b/arch/x86/kernel/head64.c
24362@@ -68,12 +68,12 @@ again:
24363 pgd = *pgd_p;
24364
24365 /*
24366- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24367- * critical -- __PAGE_OFFSET would point us back into the dynamic
24368+ * The use of __early_va rather than __va here is critical:
24369+ * __va would point us back into the dynamic
24370 * range and we might end up looping forever...
24371 */
24372 if (pgd)
24373- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24374+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24375 else {
24376 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24377 reset_early_page_tables();
24378@@ -83,13 +83,13 @@ again:
24379 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24380 for (i = 0; i < PTRS_PER_PUD; i++)
24381 pud_p[i] = 0;
24382- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24383+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24384 }
24385 pud_p += pud_index(address);
24386 pud = *pud_p;
24387
24388 if (pud)
24389- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24390+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24391 else {
24392 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24393 reset_early_page_tables();
24394@@ -99,7 +99,7 @@ again:
24395 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24396 for (i = 0; i < PTRS_PER_PMD; i++)
24397 pmd_p[i] = 0;
24398- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24399+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24400 }
24401 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24402 pmd_p[pmd_index(address)] = pmd;
24403@@ -163,8 +163,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24404
24405 clear_bss();
24406
24407- clear_page(init_level4_pgt);
24408-
24409 kasan_early_init();
24410
24411 for (i = 0; i < NUM_EXCEPTION_VECTORS; i++)
24412diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24413index 7e429c9..7244a52 100644
24414--- a/arch/x86/kernel/head_32.S
24415+++ b/arch/x86/kernel/head_32.S
24416@@ -27,6 +27,12 @@
24417 /* Physical address */
24418 #define pa(X) ((X) - __PAGE_OFFSET)
24419
24420+#ifdef CONFIG_PAX_KERNEXEC
24421+#define ta(X) (X)
24422+#else
24423+#define ta(X) ((X) - __PAGE_OFFSET)
24424+#endif
24425+
24426 /*
24427 * References to members of the new_cpu_data structure.
24428 */
24429@@ -56,11 +62,7 @@
24430 * and small than max_low_pfn, otherwise will waste some page table entries
24431 */
24432
24433-#if PTRS_PER_PMD > 1
24434-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24435-#else
24436-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24437-#endif
24438+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24439
24440 /*
24441 * Number of possible pages in the lowmem region.
24442@@ -86,6 +88,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24443 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24444
24445 /*
24446+ * Real beginning of normal "text" segment
24447+ */
24448+ENTRY(stext)
24449+ENTRY(_stext)
24450+
24451+/*
24452 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24453 * %esi points to the real-mode code as a 32-bit pointer.
24454 * CS and DS must be 4 GB flat segments, but we don't depend on
24455@@ -93,6 +101,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24456 * can.
24457 */
24458 __HEAD
24459+
24460+#ifdef CONFIG_PAX_KERNEXEC
24461+ jmp startup_32
24462+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24463+.fill PAGE_SIZE-5,1,0xcc
24464+#endif
24465+
24466 ENTRY(startup_32)
24467 movl pa(stack_start),%ecx
24468
24469@@ -114,6 +129,59 @@ ENTRY(startup_32)
24470 2:
24471 leal -__PAGE_OFFSET(%ecx),%esp
24472
24473+#ifdef CONFIG_SMP
24474+ movl $pa(cpu_gdt_table),%edi
24475+ movl $__per_cpu_load,%eax
24476+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24477+ rorl $16,%eax
24478+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24479+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24480+ movl $__per_cpu_end - 1,%eax
24481+ subl $__per_cpu_start,%eax
24482+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24483+#endif
24484+
24485+#ifdef CONFIG_PAX_MEMORY_UDEREF
24486+ movl $NR_CPUS,%ecx
24487+ movl $pa(cpu_gdt_table),%edi
24488+1:
24489+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24490+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24491+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24492+ addl $PAGE_SIZE_asm,%edi
24493+ loop 1b
24494+#endif
24495+
24496+#ifdef CONFIG_PAX_KERNEXEC
24497+ movl $pa(boot_gdt),%edi
24498+ movl $__LOAD_PHYSICAL_ADDR,%eax
24499+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24500+ rorl $16,%eax
24501+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24502+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24503+ rorl $16,%eax
24504+
24505+ ljmp $(__BOOT_CS),$1f
24506+1:
24507+
24508+ movl $NR_CPUS,%ecx
24509+ movl $pa(cpu_gdt_table),%edi
24510+ addl $__PAGE_OFFSET,%eax
24511+1:
24512+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24513+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24514+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24515+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24516+ rorl $16,%eax
24517+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24518+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24519+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24520+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24521+ rorl $16,%eax
24522+ addl $PAGE_SIZE_asm,%edi
24523+ loop 1b
24524+#endif
24525+
24526 /*
24527 * Clear BSS first so that there are no surprises...
24528 */
24529@@ -209,8 +277,11 @@ ENTRY(startup_32)
24530 movl %eax, pa(max_pfn_mapped)
24531
24532 /* Do early initialization of the fixmap area */
24533- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24534- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24535+#ifdef CONFIG_COMPAT_VDSO
24536+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24537+#else
24538+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24539+#endif
24540 #else /* Not PAE */
24541
24542 page_pde_offset = (__PAGE_OFFSET >> 20);
24543@@ -240,8 +311,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24544 movl %eax, pa(max_pfn_mapped)
24545
24546 /* Do early initialization of the fixmap area */
24547- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24548- movl %eax,pa(initial_page_table+0xffc)
24549+#ifdef CONFIG_COMPAT_VDSO
24550+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24551+#else
24552+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24553+#endif
24554 #endif
24555
24556 #ifdef CONFIG_PARAVIRT
24557@@ -255,9 +329,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24558 cmpl $num_subarch_entries, %eax
24559 jae bad_subarch
24560
24561- movl pa(subarch_entries)(,%eax,4), %eax
24562- subl $__PAGE_OFFSET, %eax
24563- jmp *%eax
24564+ jmp *pa(subarch_entries)(,%eax,4)
24565
24566 bad_subarch:
24567 WEAK(lguest_entry)
24568@@ -269,10 +341,10 @@ WEAK(xen_entry)
24569 __INITDATA
24570
24571 subarch_entries:
24572- .long default_entry /* normal x86/PC */
24573- .long lguest_entry /* lguest hypervisor */
24574- .long xen_entry /* Xen hypervisor */
24575- .long default_entry /* Moorestown MID */
24576+ .long ta(default_entry) /* normal x86/PC */
24577+ .long ta(lguest_entry) /* lguest hypervisor */
24578+ .long ta(xen_entry) /* Xen hypervisor */
24579+ .long ta(default_entry) /* Moorestown MID */
24580 num_subarch_entries = (. - subarch_entries) / 4
24581 .previous
24582 #else
24583@@ -362,6 +434,7 @@ default_entry:
24584 movl pa(mmu_cr4_features),%eax
24585 movl %eax,%cr4
24586
24587+#ifdef CONFIG_X86_PAE
24588 testb $X86_CR4_PAE, %al # check if PAE is enabled
24589 jz enable_paging
24590
24591@@ -390,6 +463,9 @@ default_entry:
24592 /* Make changes effective */
24593 wrmsr
24594
24595+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24596+#endif
24597+
24598 enable_paging:
24599
24600 /*
24601@@ -457,14 +533,20 @@ is486:
24602 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24603 movl %eax,%ss # after changing gdt.
24604
24605- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24606+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24607 movl %eax,%ds
24608 movl %eax,%es
24609
24610 movl $(__KERNEL_PERCPU), %eax
24611 movl %eax,%fs # set this cpu's percpu
24612
24613+#ifdef CONFIG_CC_STACKPROTECTOR
24614 movl $(__KERNEL_STACK_CANARY),%eax
24615+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24616+ movl $(__USER_DS),%eax
24617+#else
24618+ xorl %eax,%eax
24619+#endif
24620 movl %eax,%gs
24621
24622 xorl %eax,%eax # Clear LDT
24623@@ -521,8 +603,11 @@ setup_once:
24624 * relocation. Manually set base address in stack canary
24625 * segment descriptor.
24626 */
24627- movl $gdt_page,%eax
24628+ movl $cpu_gdt_table,%eax
24629 movl $stack_canary,%ecx
24630+#ifdef CONFIG_SMP
24631+ addl $__per_cpu_load,%ecx
24632+#endif
24633 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24634 shrl $16, %ecx
24635 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24636@@ -559,7 +644,7 @@ early_idt_handler_common:
24637 cmpl $2,(%esp) # X86_TRAP_NMI
24638 je is_nmi # Ignore NMI
24639
24640- cmpl $2,%ss:early_recursion_flag
24641+ cmpl $1,%ss:early_recursion_flag
24642 je hlt_loop
24643 incl %ss:early_recursion_flag
24644
24645@@ -597,8 +682,8 @@ early_idt_handler_common:
24646 pushl (20+6*4)(%esp) /* trapno */
24647 pushl $fault_msg
24648 call printk
24649-#endif
24650 call dump_stack
24651+#endif
24652 hlt_loop:
24653 hlt
24654 jmp hlt_loop
24655@@ -618,8 +703,11 @@ ENDPROC(early_idt_handler_common)
24656 /* This is the default interrupt "handler" :-) */
24657 ALIGN
24658 ignore_int:
24659- cld
24660 #ifdef CONFIG_PRINTK
24661+ cmpl $2,%ss:early_recursion_flag
24662+ je hlt_loop
24663+ incl %ss:early_recursion_flag
24664+ cld
24665 pushl %eax
24666 pushl %ecx
24667 pushl %edx
24668@@ -628,9 +716,6 @@ ignore_int:
24669 movl $(__KERNEL_DS),%eax
24670 movl %eax,%ds
24671 movl %eax,%es
24672- cmpl $2,early_recursion_flag
24673- je hlt_loop
24674- incl early_recursion_flag
24675 pushl 16(%esp)
24676 pushl 24(%esp)
24677 pushl 32(%esp)
24678@@ -664,29 +749,34 @@ ENTRY(setup_once_ref)
24679 /*
24680 * BSS section
24681 */
24682-__PAGE_ALIGNED_BSS
24683- .align PAGE_SIZE
24684 #ifdef CONFIG_X86_PAE
24685+.section .initial_pg_pmd,"a",@progbits
24686 initial_pg_pmd:
24687 .fill 1024*KPMDS,4,0
24688 #else
24689+.section .initial_page_table,"a",@progbits
24690 ENTRY(initial_page_table)
24691 .fill 1024,4,0
24692 #endif
24693+.section .initial_pg_fixmap,"a",@progbits
24694 initial_pg_fixmap:
24695 .fill 1024,4,0
24696+.section .empty_zero_page,"a",@progbits
24697 ENTRY(empty_zero_page)
24698 .fill 4096,1,0
24699+.section .swapper_pg_dir,"a",@progbits
24700 ENTRY(swapper_pg_dir)
24701+#ifdef CONFIG_X86_PAE
24702+ .fill 4,8,0
24703+#else
24704 .fill 1024,4,0
24705+#endif
24706
24707 /*
24708 * This starts the data section.
24709 */
24710 #ifdef CONFIG_X86_PAE
24711-__PAGE_ALIGNED_DATA
24712- /* Page-aligned for the benefit of paravirt? */
24713- .align PAGE_SIZE
24714+.section .initial_page_table,"a",@progbits
24715 ENTRY(initial_page_table)
24716 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24717 # if KPMDS == 3
24718@@ -705,12 +795,20 @@ ENTRY(initial_page_table)
24719 # error "Kernel PMDs should be 1, 2 or 3"
24720 # endif
24721 .align PAGE_SIZE /* needs to be page-sized too */
24722+
24723+#ifdef CONFIG_PAX_PER_CPU_PGD
24724+ENTRY(cpu_pgd)
24725+ .rept 2*NR_CPUS
24726+ .fill 4,8,0
24727+ .endr
24728+#endif
24729+
24730 #endif
24731
24732 .data
24733 .balign 4
24734 ENTRY(stack_start)
24735- .long init_thread_union+THREAD_SIZE
24736+ .long init_thread_union+THREAD_SIZE-8
24737
24738 __INITRODATA
24739 int_msg:
24740@@ -738,7 +836,7 @@ fault_msg:
24741 * segment size, and 32-bit linear address value:
24742 */
24743
24744- .data
24745+.section .rodata,"a",@progbits
24746 .globl boot_gdt_descr
24747 .globl idt_descr
24748
24749@@ -747,7 +845,7 @@ fault_msg:
24750 .word 0 # 32 bit align gdt_desc.address
24751 boot_gdt_descr:
24752 .word __BOOT_DS+7
24753- .long boot_gdt - __PAGE_OFFSET
24754+ .long pa(boot_gdt)
24755
24756 .word 0 # 32-bit align idt_desc.address
24757 idt_descr:
24758@@ -758,7 +856,7 @@ idt_descr:
24759 .word 0 # 32 bit align gdt_desc.address
24760 ENTRY(early_gdt_descr)
24761 .word GDT_ENTRIES*8-1
24762- .long gdt_page /* Overwritten for secondary CPUs */
24763+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24764
24765 /*
24766 * The boot_gdt must mirror the equivalent in setup.S and is
24767@@ -767,5 +865,65 @@ ENTRY(early_gdt_descr)
24768 .align L1_CACHE_BYTES
24769 ENTRY(boot_gdt)
24770 .fill GDT_ENTRY_BOOT_CS,8,0
24771- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24772- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24773+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24774+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24775+
24776+ .align PAGE_SIZE_asm
24777+ENTRY(cpu_gdt_table)
24778+ .rept NR_CPUS
24779+ .quad 0x0000000000000000 /* NULL descriptor */
24780+ .quad 0x0000000000000000 /* 0x0b reserved */
24781+ .quad 0x0000000000000000 /* 0x13 reserved */
24782+ .quad 0x0000000000000000 /* 0x1b reserved */
24783+
24784+#ifdef CONFIG_PAX_KERNEXEC
24785+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24786+#else
24787+ .quad 0x0000000000000000 /* 0x20 unused */
24788+#endif
24789+
24790+ .quad 0x0000000000000000 /* 0x28 unused */
24791+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24792+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24793+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24794+ .quad 0x0000000000000000 /* 0x4b reserved */
24795+ .quad 0x0000000000000000 /* 0x53 reserved */
24796+ .quad 0x0000000000000000 /* 0x5b reserved */
24797+
24798+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24799+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24800+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24801+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24802+
24803+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24804+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24805+
24806+ /*
24807+ * Segments used for calling PnP BIOS have byte granularity.
24808+ * The code segments and data segments have fixed 64k limits,
24809+ * the transfer segment sizes are set at run time.
24810+ */
24811+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24812+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24813+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24814+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24815+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24816+
24817+ /*
24818+ * The APM segments have byte granularity and their bases
24819+ * are set at run time. All have 64k limits.
24820+ */
24821+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24822+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24823+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24824+
24825+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24826+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24827+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24828+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24829+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24830+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24831+
24832+ /* Be sure this is zeroed to avoid false validations in Xen */
24833+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24834+ .endr
24835diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24836index 7e5da2c..761adf1 100644
24837--- a/arch/x86/kernel/head_64.S
24838+++ b/arch/x86/kernel/head_64.S
24839@@ -20,6 +20,8 @@
24840 #include <asm/processor-flags.h>
24841 #include <asm/percpu.h>
24842 #include <asm/nops.h>
24843+#include <asm/cpufeature.h>
24844+#include <asm/alternative-asm.h>
24845
24846 #ifdef CONFIG_PARAVIRT
24847 #include <asm/asm-offsets.h>
24848@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24849 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24850 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24851 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24852+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24853+L3_VMALLOC_START = pud_index(VMALLOC_START)
24854+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24855+L3_VMALLOC_END = pud_index(VMALLOC_END)
24856+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24857+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24858
24859 .text
24860 __HEAD
24861@@ -89,11 +97,26 @@ startup_64:
24862 * Fixup the physical addresses in the page table
24863 */
24864 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24865+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24866+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24867+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24868+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24869+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24870
24871- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24872- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24873+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24874+#ifndef CONFIG_XEN
24875+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24876+#endif
24877
24878+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24879+
24880+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24881+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24882+
24883+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
24884+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
24885 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24886+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24887
24888 /*
24889 * Set up the identity mapping for the switchover. These
24890@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
24891 * after the boot processor executes this code.
24892 */
24893
24894+ orq $-1, %rbp
24895 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24896 1:
24897
24898- /* Enable PAE mode and PGE */
24899- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24900+ /* Enable PAE mode and PSE/PGE */
24901+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24902 movq %rcx, %cr4
24903
24904 /* Setup early boot stage 4 level pagetables. */
24905@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
24906 movl $MSR_EFER, %ecx
24907 rdmsr
24908 btsl $_EFER_SCE, %eax /* Enable System Call */
24909- btl $20,%edi /* No Execute supported? */
24910+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24911 jnc 1f
24912 btsl $_EFER_NX, %eax
24913+ cmpq $-1, %rbp
24914+ je 1f
24915 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24916+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24917+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24918+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24919+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24920+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
24921+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
24922+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24923+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24924+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24925 1: wrmsr /* Make changes effective */
24926
24927 /* Setup cr0 */
24928@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
24929 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24930 * address given in m16:64.
24931 */
24932+ pax_set_fptr_mask
24933 movq initial_code(%rip),%rax
24934 pushq $0 # fake return address to stop unwinder
24935 pushq $__KERNEL_CS # set correct cs
24936@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
24937 .quad INIT_PER_CPU_VAR(irq_stack_union)
24938
24939 GLOBAL(stack_start)
24940- .quad init_thread_union+THREAD_SIZE-8
24941+ .quad init_thread_union+THREAD_SIZE-16
24942 .word 0
24943 __FINITDATA
24944
24945@@ -393,7 +429,7 @@ early_idt_handler_common:
24946 call dump_stack
24947 #ifdef CONFIG_KALLSYMS
24948 leaq early_idt_ripmsg(%rip),%rdi
24949- movq 40(%rsp),%rsi # %rip again
24950+ movq 88(%rsp),%rsi # %rip again
24951 call __print_symbol
24952 #endif
24953 #endif /* EARLY_PRINTK */
24954@@ -422,6 +458,7 @@ ENDPROC(early_idt_handler_common)
24955 early_recursion_flag:
24956 .long 0
24957
24958+ .section .rodata,"a",@progbits
24959 #ifdef CONFIG_EARLY_PRINTK
24960 early_idt_msg:
24961 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24962@@ -449,29 +486,52 @@ NEXT_PAGE(early_level4_pgt)
24963 NEXT_PAGE(early_dynamic_pgts)
24964 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24965
24966- .data
24967+ .section .rodata,"a",@progbits
24968
24969-#ifndef CONFIG_XEN
24970 NEXT_PAGE(init_level4_pgt)
24971- .fill 512,8,0
24972-#else
24973-NEXT_PAGE(init_level4_pgt)
24974- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24975 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24976 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24977+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24978+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24979+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24980+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24981+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24982+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24983 .org init_level4_pgt + L4_START_KERNEL*8, 0
24984 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24985 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24986
24987+#ifdef CONFIG_PAX_PER_CPU_PGD
24988+NEXT_PAGE(cpu_pgd)
24989+ .rept 2*NR_CPUS
24990+ .fill 512,8,0
24991+ .endr
24992+#endif
24993+
24994 NEXT_PAGE(level3_ident_pgt)
24995 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24996+#ifdef CONFIG_XEN
24997 .fill 511, 8, 0
24998+#else
24999+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
25000+ .fill 510,8,0
25001+#endif
25002+
25003+NEXT_PAGE(level3_vmalloc_start_pgt)
25004+ .fill 512,8,0
25005+
25006+NEXT_PAGE(level3_vmalloc_end_pgt)
25007+ .fill 512,8,0
25008+
25009+NEXT_PAGE(level3_vmemmap_pgt)
25010+ .fill L3_VMEMMAP_START,8,0
25011+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25012+
25013 NEXT_PAGE(level2_ident_pgt)
25014- /* Since I easily can, map the first 1G.
25015+ /* Since I easily can, map the first 2G.
25016 * Don't set NX because code runs from these pages.
25017 */
25018- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
25019-#endif
25020+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
25021
25022 NEXT_PAGE(level3_kernel_pgt)
25023 .fill L3_START_KERNEL,8,0
25024@@ -479,6 +539,9 @@ NEXT_PAGE(level3_kernel_pgt)
25025 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
25026 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25027
25028+NEXT_PAGE(level2_vmemmap_pgt)
25029+ .fill 512,8,0
25030+
25031 NEXT_PAGE(level2_kernel_pgt)
25032 /*
25033 * 512 MB kernel mapping. We spend a full page on this pagetable
25034@@ -494,31 +557,69 @@ NEXT_PAGE(level2_kernel_pgt)
25035 KERNEL_IMAGE_SIZE/PMD_SIZE)
25036
25037 NEXT_PAGE(level2_fixmap_pgt)
25038- .fill 506,8,0
25039- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25040- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
25041- .fill 5,8,0
25042+ .fill 504,8,0
25043+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
25044+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
25045+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
25046+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
25047+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25048+ .fill 4,8,0
25049
25050 NEXT_PAGE(level1_fixmap_pgt)
25051+ .fill 3*512,8,0
25052+
25053+NEXT_PAGE(level1_vsyscall_pgt)
25054 .fill 512,8,0
25055
25056 #undef PMDS
25057
25058- .data
25059+ .align PAGE_SIZE
25060+ENTRY(cpu_gdt_table)
25061+ .rept NR_CPUS
25062+ .quad 0x0000000000000000 /* NULL descriptor */
25063+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25064+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25065+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25066+ .quad 0x00cffb000000ffff /* __USER32_CS */
25067+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25068+ .quad 0x00affb000000ffff /* __USER_CS */
25069+
25070+#ifdef CONFIG_PAX_KERNEXEC
25071+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25072+#else
25073+ .quad 0x0 /* unused */
25074+#endif
25075+
25076+ .quad 0,0 /* TSS */
25077+ .quad 0,0 /* LDT */
25078+ .quad 0,0,0 /* three TLS descriptors */
25079+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25080+ /* asm/segment.h:GDT_ENTRIES must match this */
25081+
25082+#ifdef CONFIG_PAX_MEMORY_UDEREF
25083+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25084+#else
25085+ .quad 0x0 /* unused */
25086+#endif
25087+
25088+ /* zero the remaining page */
25089+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25090+ .endr
25091+
25092 .align 16
25093 .globl early_gdt_descr
25094 early_gdt_descr:
25095 .word GDT_ENTRIES*8-1
25096 early_gdt_descr_base:
25097- .quad INIT_PER_CPU_VAR(gdt_page)
25098+ .quad cpu_gdt_table
25099
25100 ENTRY(phys_base)
25101 /* This must match the first entry in level2_kernel_pgt */
25102 .quad 0x0000000000000000
25103
25104 #include "../../x86/xen/xen-head.S"
25105-
25106- __PAGE_ALIGNED_BSS
25107+
25108+ .section .rodata,"a",@progbits
25109 NEXT_PAGE(empty_zero_page)
25110 .skip PAGE_SIZE
25111
25112diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25113index 05fd74f..c3548b1 100644
25114--- a/arch/x86/kernel/i386_ksyms_32.c
25115+++ b/arch/x86/kernel/i386_ksyms_32.c
25116@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25117 EXPORT_SYMBOL(cmpxchg8b_emu);
25118 #endif
25119
25120+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25121+
25122 /* Networking helper routines. */
25123 EXPORT_SYMBOL(csum_partial_copy_generic);
25124+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25125+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25126
25127 EXPORT_SYMBOL(__get_user_1);
25128 EXPORT_SYMBOL(__get_user_2);
25129@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25130 EXPORT_SYMBOL(___preempt_schedule_context);
25131 #endif
25132 #endif
25133+
25134+#ifdef CONFIG_PAX_KERNEXEC
25135+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25136+#endif
25137+
25138+#ifdef CONFIG_PAX_PER_CPU_PGD
25139+EXPORT_SYMBOL(cpu_pgd);
25140+#endif
25141diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25142index e7cc537..67d7372 100644
25143--- a/arch/x86/kernel/i8259.c
25144+++ b/arch/x86/kernel/i8259.c
25145@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25146 static void make_8259A_irq(unsigned int irq)
25147 {
25148 disable_irq_nosync(irq);
25149- io_apic_irqs &= ~(1<<irq);
25150+ io_apic_irqs &= ~(1UL<<irq);
25151 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25152 enable_irq(irq);
25153 }
25154@@ -208,7 +208,7 @@ spurious_8259A_irq:
25155 "spurious 8259A interrupt: IRQ%d.\n", irq);
25156 spurious_irq_mask |= irqmask;
25157 }
25158- atomic_inc(&irq_err_count);
25159+ atomic_inc_unchecked(&irq_err_count);
25160 /*
25161 * Theoretically we do not have to handle this IRQ,
25162 * but in Linux this does not cause problems and is
25163@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25164 /* (slave's support for AEOI in flat mode is to be investigated) */
25165 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25166
25167+ pax_open_kernel();
25168 if (auto_eoi)
25169 /*
25170 * In AEOI mode we just have to mask the interrupt
25171 * when acking.
25172 */
25173- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25174+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25175 else
25176- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25177+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25178+ pax_close_kernel();
25179
25180 udelay(100); /* wait for 8259A to initialize */
25181
25182diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25183index a979b5b..1d6db75 100644
25184--- a/arch/x86/kernel/io_delay.c
25185+++ b/arch/x86/kernel/io_delay.c
25186@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25187 * Quirk table for systems that misbehave (lock up, etc.) if port
25188 * 0x80 is used:
25189 */
25190-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25191+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25192 {
25193 .callback = dmi_io_delay_0xed_port,
25194 .ident = "Compaq Presario V6000",
25195diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25196index 37dae79..620dd84 100644
25197--- a/arch/x86/kernel/ioport.c
25198+++ b/arch/x86/kernel/ioport.c
25199@@ -6,6 +6,7 @@
25200 #include <linux/sched.h>
25201 #include <linux/kernel.h>
25202 #include <linux/capability.h>
25203+#include <linux/security.h>
25204 #include <linux/errno.h>
25205 #include <linux/types.h>
25206 #include <linux/ioport.h>
25207@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25208 return -EINVAL;
25209 if (turn_on && !capable(CAP_SYS_RAWIO))
25210 return -EPERM;
25211+#ifdef CONFIG_GRKERNSEC_IO
25212+ if (turn_on && grsec_disable_privio) {
25213+ gr_handle_ioperm();
25214+ return -ENODEV;
25215+ }
25216+#endif
25217
25218 /*
25219 * If it's the first ioperm() call in this thread's lifetime, set the
25220@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25221 * because the ->io_bitmap_max value must match the bitmap
25222 * contents:
25223 */
25224- tss = &per_cpu(cpu_tss, get_cpu());
25225+ tss = cpu_tss + get_cpu();
25226
25227 if (turn_on)
25228 bitmap_clear(t->io_bitmap_ptr, from, num);
25229@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25230 if (level > old) {
25231 if (!capable(CAP_SYS_RAWIO))
25232 return -EPERM;
25233+#ifdef CONFIG_GRKERNSEC_IO
25234+ if (grsec_disable_privio) {
25235+ gr_handle_iopl();
25236+ return -ENODEV;
25237+ }
25238+#endif
25239 }
25240 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25241 t->iopl = level << 12;
25242diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25243index e5952c2..11c3a54 100644
25244--- a/arch/x86/kernel/irq.c
25245+++ b/arch/x86/kernel/irq.c
25246@@ -22,7 +22,7 @@
25247 #define CREATE_TRACE_POINTS
25248 #include <asm/trace/irq_vectors.h>
25249
25250-atomic_t irq_err_count;
25251+atomic_unchecked_t irq_err_count;
25252
25253 /* Function pointer for generic interrupt vector handling */
25254 void (*x86_platform_ipi_callback)(void) = NULL;
25255@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25256 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25257 seq_puts(p, " Hypervisor callback interrupts\n");
25258 #endif
25259- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25260+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25261 #if defined(CONFIG_X86_IO_APIC)
25262- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25263+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25264 #endif
25265 return 0;
25266 }
25267@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25268
25269 u64 arch_irq_stat(void)
25270 {
25271- u64 sum = atomic_read(&irq_err_count);
25272+ u64 sum = atomic_read_unchecked(&irq_err_count);
25273 return sum;
25274 }
25275
25276diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25277index f9fd86a..e6cc9ae 100644
25278--- a/arch/x86/kernel/irq_32.c
25279+++ b/arch/x86/kernel/irq_32.c
25280@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25281
25282 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25283
25284+extern void gr_handle_kernel_exploit(void);
25285+
25286 int sysctl_panic_on_stackoverflow __read_mostly;
25287
25288 /* Debugging check for stack overflow: is there less than 1KB free? */
25289@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25290 __asm__ __volatile__("andl %%esp,%0" :
25291 "=r" (sp) : "0" (THREAD_SIZE - 1));
25292
25293- return sp < (sizeof(struct thread_info) + STACK_WARN);
25294+ return sp < STACK_WARN;
25295 }
25296
25297 static void print_stack_overflow(void)
25298 {
25299 printk(KERN_WARNING "low stack detected by irq handler\n");
25300 dump_stack();
25301+ gr_handle_kernel_exploit();
25302 if (sysctl_panic_on_stackoverflow)
25303 panic("low stack detected by irq handler - check messages\n");
25304 }
25305@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25306 static inline int
25307 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25308 {
25309- struct irq_stack *curstk, *irqstk;
25310+ struct irq_stack *irqstk;
25311 u32 *isp, *prev_esp, arg1, arg2;
25312
25313- curstk = (struct irq_stack *) current_stack();
25314 irqstk = __this_cpu_read(hardirq_stack);
25315
25316 /*
25317@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25318 * handler) we can't do that and just have to keep using the
25319 * current stack (which is the irq stack already after all)
25320 */
25321- if (unlikely(curstk == irqstk))
25322+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25323 return 0;
25324
25325- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25326+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25327
25328 /* Save the next esp at the bottom of the stack */
25329 prev_esp = (u32 *)irqstk;
25330 *prev_esp = current_stack_pointer();
25331
25332+#ifdef CONFIG_PAX_MEMORY_UDEREF
25333+ __set_fs(MAKE_MM_SEG(0));
25334+#endif
25335+
25336 if (unlikely(overflow))
25337 call_on_stack(print_stack_overflow, isp);
25338
25339@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25340 : "0" (irq), "1" (desc), "2" (isp),
25341 "D" (desc->handle_irq)
25342 : "memory", "cc", "ecx");
25343+
25344+#ifdef CONFIG_PAX_MEMORY_UDEREF
25345+ __set_fs(current_thread_info()->addr_limit);
25346+#endif
25347+
25348 return 1;
25349 }
25350
25351@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25352 */
25353 void irq_ctx_init(int cpu)
25354 {
25355- struct irq_stack *irqstk;
25356-
25357 if (per_cpu(hardirq_stack, cpu))
25358 return;
25359
25360- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25361- THREADINFO_GFP,
25362- THREAD_SIZE_ORDER));
25363- per_cpu(hardirq_stack, cpu) = irqstk;
25364-
25365- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25366- THREADINFO_GFP,
25367- THREAD_SIZE_ORDER));
25368- per_cpu(softirq_stack, cpu) = irqstk;
25369-
25370- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25371- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25372+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25373+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25374 }
25375
25376 void do_softirq_own_stack(void)
25377 {
25378- struct thread_info *curstk;
25379 struct irq_stack *irqstk;
25380 u32 *isp, *prev_esp;
25381
25382- curstk = current_stack();
25383 irqstk = __this_cpu_read(softirq_stack);
25384
25385 /* build the stack frame on the softirq stack */
25386@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25387 prev_esp = (u32 *)irqstk;
25388 *prev_esp = current_stack_pointer();
25389
25390+#ifdef CONFIG_PAX_MEMORY_UDEREF
25391+ __set_fs(MAKE_MM_SEG(0));
25392+#endif
25393+
25394 call_on_stack(__do_softirq, isp);
25395+
25396+#ifdef CONFIG_PAX_MEMORY_UDEREF
25397+ __set_fs(current_thread_info()->addr_limit);
25398+#endif
25399+
25400 }
25401
25402 bool handle_irq(unsigned irq, struct pt_regs *regs)
25403diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25404index 394e643..824fce8 100644
25405--- a/arch/x86/kernel/irq_64.c
25406+++ b/arch/x86/kernel/irq_64.c
25407@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25408 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25409 EXPORT_PER_CPU_SYMBOL(irq_regs);
25410
25411+extern void gr_handle_kernel_exploit(void);
25412+
25413 int sysctl_panic_on_stackoverflow;
25414
25415 /*
25416@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25417 irq_stack_top, irq_stack_bottom,
25418 estack_top, estack_bottom);
25419
25420+ gr_handle_kernel_exploit();
25421+
25422 if (sysctl_panic_on_stackoverflow)
25423 panic("low stack detected by irq handler - check messages\n");
25424 #endif
25425diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25426index 26d5a55..bf8b49b 100644
25427--- a/arch/x86/kernel/jump_label.c
25428+++ b/arch/x86/kernel/jump_label.c
25429@@ -31,6 +31,8 @@ static void bug_at(unsigned char *ip, int line)
25430 * Something went wrong. Crash the box, as something could be
25431 * corrupting the kernel.
25432 */
25433+ ip = ktla_ktva(ip);
25434+ pr_warning("Unexpected op at %pS [%p] %s:%d\n", ip, ip, __FILE__, line);
25435 pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",
25436 ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);
25437 BUG();
25438@@ -51,7 +53,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25439 * Jump label is enabled for the first time.
25440 * So we expect a default_nop...
25441 */
25442- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25443+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25444 != 0))
25445 bug_at((void *)entry->code, __LINE__);
25446 } else {
25447@@ -59,7 +61,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25448 * ...otherwise expect an ideal_nop. Otherwise
25449 * something went horribly wrong.
25450 */
25451- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25452+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25453 != 0))
25454 bug_at((void *)entry->code, __LINE__);
25455 }
25456@@ -75,13 +77,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25457 * are converting the default nop to the ideal nop.
25458 */
25459 if (init) {
25460- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25461+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25462 bug_at((void *)entry->code, __LINE__);
25463 } else {
25464 code.jump = 0xe9;
25465 code.offset = entry->target -
25466 (entry->code + JUMP_LABEL_NOP_SIZE);
25467- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25468+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25469 bug_at((void *)entry->code, __LINE__);
25470 }
25471 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25472diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25473index d6178d9..e12482f 100644
25474--- a/arch/x86/kernel/kgdb.c
25475+++ b/arch/x86/kernel/kgdb.c
25476@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25477 bp->attr.bp_addr = breakinfo[breakno].addr;
25478 bp->attr.bp_len = breakinfo[breakno].len;
25479 bp->attr.bp_type = breakinfo[breakno].type;
25480- info->address = breakinfo[breakno].addr;
25481+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25482+ info->address = ktla_ktva(breakinfo[breakno].addr);
25483+ else
25484+ info->address = breakinfo[breakno].addr;
25485 info->len = breakinfo[breakno].len;
25486 info->type = breakinfo[breakno].type;
25487 val = arch_install_hw_breakpoint(bp);
25488@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25489 case 'k':
25490 /* clear the trace bit */
25491 linux_regs->flags &= ~X86_EFLAGS_TF;
25492- atomic_set(&kgdb_cpu_doing_single_step, -1);
25493+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25494
25495 /* set the trace bit if we're stepping */
25496 if (remcomInBuffer[0] == 's') {
25497 linux_regs->flags |= X86_EFLAGS_TF;
25498- atomic_set(&kgdb_cpu_doing_single_step,
25499+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25500 raw_smp_processor_id());
25501 }
25502
25503@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25504
25505 switch (cmd) {
25506 case DIE_DEBUG:
25507- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25508+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25509 if (user_mode(regs))
25510 return single_step_cont(regs, args);
25511 break;
25512@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25513 #endif /* CONFIG_DEBUG_RODATA */
25514
25515 bpt->type = BP_BREAKPOINT;
25516- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25517+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25518 BREAK_INSTR_SIZE);
25519 if (err)
25520 return err;
25521- err = probe_kernel_write((char *)bpt->bpt_addr,
25522+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25523 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25524 #ifdef CONFIG_DEBUG_RODATA
25525 if (!err)
25526@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25527 return -EBUSY;
25528 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25529 BREAK_INSTR_SIZE);
25530- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25531+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25532 if (err)
25533 return err;
25534 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25535@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25536 if (mutex_is_locked(&text_mutex))
25537 goto knl_write;
25538 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25539- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25540+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25541 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25542 goto knl_write;
25543 return err;
25544 knl_write:
25545 #endif /* CONFIG_DEBUG_RODATA */
25546- return probe_kernel_write((char *)bpt->bpt_addr,
25547+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25548 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25549 }
25550
25551diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25552index 1deffe6..4705700 100644
25553--- a/arch/x86/kernel/kprobes/core.c
25554+++ b/arch/x86/kernel/kprobes/core.c
25555@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25556 s32 raddr;
25557 } __packed *insn;
25558
25559- insn = (struct __arch_relative_insn *)from;
25560+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25561+
25562+ pax_open_kernel();
25563 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25564 insn->op = op;
25565+ pax_close_kernel();
25566 }
25567
25568 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25569@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25570 kprobe_opcode_t opcode;
25571 kprobe_opcode_t *orig_opcodes = opcodes;
25572
25573- if (search_exception_tables((unsigned long)opcodes))
25574+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25575 return 0; /* Page fault may occur on this address. */
25576
25577 retry:
25578@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25579 * Fortunately, we know that the original code is the ideal 5-byte
25580 * long NOP.
25581 */
25582- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25583+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25584 if (faddr)
25585 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25586 else
25587 buf[0] = kp->opcode;
25588- return (unsigned long)buf;
25589+ return ktva_ktla((unsigned long)buf);
25590 }
25591
25592 /*
25593@@ -367,7 +370,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25594 /* Another subsystem puts a breakpoint, failed to recover */
25595 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25596 return 0;
25597+ pax_open_kernel();
25598 memcpy(dest, insn.kaddr, length);
25599+ pax_close_kernel();
25600
25601 #ifdef CONFIG_X86_64
25602 if (insn_rip_relative(&insn)) {
25603@@ -394,7 +399,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25604 return 0;
25605 }
25606 disp = (u8 *) dest + insn_offset_displacement(&insn);
25607+ pax_open_kernel();
25608 *(s32 *) disp = (s32) newdisp;
25609+ pax_close_kernel();
25610 }
25611 #endif
25612 return length;
25613@@ -536,7 +543,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25614 * nor set current_kprobe, because it doesn't use single
25615 * stepping.
25616 */
25617- regs->ip = (unsigned long)p->ainsn.insn;
25618+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25619 preempt_enable_no_resched();
25620 return;
25621 }
25622@@ -553,9 +560,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25623 regs->flags &= ~X86_EFLAGS_IF;
25624 /* single step inline if the instruction is an int3 */
25625 if (p->opcode == BREAKPOINT_INSTRUCTION)
25626- regs->ip = (unsigned long)p->addr;
25627+ regs->ip = ktla_ktva((unsigned long)p->addr);
25628 else
25629- regs->ip = (unsigned long)p->ainsn.insn;
25630+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25631 }
25632 NOKPROBE_SYMBOL(setup_singlestep);
25633
25634@@ -640,7 +647,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25635 setup_singlestep(p, regs, kcb, 0);
25636 return 1;
25637 }
25638- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25639+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25640 /*
25641 * The breakpoint instruction was removed right
25642 * after we hit it. Another cpu has removed
25643@@ -687,6 +694,9 @@ static void __used kretprobe_trampoline_holder(void)
25644 " movq %rax, 152(%rsp)\n"
25645 RESTORE_REGS_STRING
25646 " popfq\n"
25647+#ifdef KERNEXEC_PLUGIN
25648+ " btsq $63,(%rsp)\n"
25649+#endif
25650 #else
25651 " pushf\n"
25652 SAVE_REGS_STRING
25653@@ -827,7 +837,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25654 struct kprobe_ctlblk *kcb)
25655 {
25656 unsigned long *tos = stack_addr(regs);
25657- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25658+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25659 unsigned long orig_ip = (unsigned long)p->addr;
25660 kprobe_opcode_t *insn = p->ainsn.insn;
25661
25662diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25663index 7b3b9d1..e2478b91 100644
25664--- a/arch/x86/kernel/kprobes/opt.c
25665+++ b/arch/x86/kernel/kprobes/opt.c
25666@@ -79,6 +79,7 @@ found:
25667 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25668 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25669 {
25670+ pax_open_kernel();
25671 #ifdef CONFIG_X86_64
25672 *addr++ = 0x48;
25673 *addr++ = 0xbf;
25674@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25675 *addr++ = 0xb8;
25676 #endif
25677 *(unsigned long *)addr = val;
25678+ pax_close_kernel();
25679 }
25680
25681 asm (
25682@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25683 * Verify if the address gap is in 2GB range, because this uses
25684 * a relative jump.
25685 */
25686- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25687+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25688 if (abs(rel) > 0x7fffffff) {
25689 __arch_remove_optimized_kprobe(op, 0);
25690 return -ERANGE;
25691@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25692 op->optinsn.size = ret;
25693
25694 /* Copy arch-dep-instance from template */
25695- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25696+ pax_open_kernel();
25697+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25698+ pax_close_kernel();
25699
25700 /* Set probe information */
25701 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25702
25703 /* Set probe function call */
25704- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25705+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25706
25707 /* Set returning jmp instruction at the tail of out-of-line buffer */
25708- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25709+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25710 (u8 *)op->kp.addr + op->optinsn.size);
25711
25712 flush_icache_range((unsigned long) buf,
25713@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25714 WARN_ON(kprobe_disabled(&op->kp));
25715
25716 /* Backup instructions which will be replaced by jump address */
25717- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25718+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25719 RELATIVE_ADDR_SIZE);
25720
25721 insn_buf[0] = RELATIVEJUMP_OPCODE;
25722@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25723 /* This kprobe is really able to run optimized path. */
25724 op = container_of(p, struct optimized_kprobe, kp);
25725 /* Detour through copied instructions */
25726- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25727+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25728 if (!reenter)
25729 reset_current_kprobe();
25730 preempt_enable_no_resched();
25731diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25732index c2bedae..25e7ab60 100644
25733--- a/arch/x86/kernel/ksysfs.c
25734+++ b/arch/x86/kernel/ksysfs.c
25735@@ -184,7 +184,7 @@ out:
25736
25737 static struct kobj_attribute type_attr = __ATTR_RO(type);
25738
25739-static struct bin_attribute data_attr = {
25740+static bin_attribute_no_const data_attr __read_only = {
25741 .attr = {
25742 .name = "data",
25743 .mode = S_IRUGO,
25744diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25745index c37886d..f43b63d 100644
25746--- a/arch/x86/kernel/ldt.c
25747+++ b/arch/x86/kernel/ldt.c
25748@@ -11,6 +11,7 @@
25749 #include <linux/sched.h>
25750 #include <linux/string.h>
25751 #include <linux/mm.h>
25752+#include <linux/ratelimit.h>
25753 #include <linux/smp.h>
25754 #include <linux/vmalloc.h>
25755 #include <linux/uaccess.h>
25756@@ -20,6 +21,14 @@
25757 #include <asm/mmu_context.h>
25758 #include <asm/syscalls.h>
25759
25760+#ifdef CONFIG_GRKERNSEC
25761+int sysctl_modify_ldt __read_only = 0;
25762+#elif defined(CONFIG_DEFAULT_MODIFY_LDT_SYSCALL)
25763+int sysctl_modify_ldt __read_only = 1;
25764+#else
25765+int sysctl_modify_ldt __read_only = 0;
25766+#endif
25767+
25768 #ifdef CONFIG_SMP
25769 static void flush_ldt(void *current_mm)
25770 {
25771@@ -66,13 +75,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25772 if (reload) {
25773 #ifdef CONFIG_SMP
25774 preempt_disable();
25775- load_LDT(pc);
25776+ load_LDT_nolock(pc);
25777 if (!cpumask_equal(mm_cpumask(current->mm),
25778 cpumask_of(smp_processor_id())))
25779 smp_call_function(flush_ldt, current->mm, 1);
25780 preempt_enable();
25781 #else
25782- load_LDT(pc);
25783+ load_LDT_nolock(pc);
25784 #endif
25785 }
25786 if (oldsize) {
25787@@ -94,7 +103,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25788 return err;
25789
25790 for (i = 0; i < old->size; i++)
25791- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25792+ write_ldt_entry(new->ldt, i, old->ldt + i);
25793 return 0;
25794 }
25795
25796@@ -115,6 +124,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25797 retval = copy_ldt(&mm->context, &old_mm->context);
25798 mutex_unlock(&old_mm->context.lock);
25799 }
25800+
25801+ if (tsk == current) {
25802+ mm->context.vdso = 0;
25803+
25804+#ifdef CONFIG_X86_32
25805+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25806+ mm->context.user_cs_base = 0UL;
25807+ mm->context.user_cs_limit = ~0UL;
25808+
25809+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25810+ cpumask_clear(&mm->context.cpu_user_cs_mask);
25811+#endif
25812+
25813+#endif
25814+#endif
25815+
25816+ }
25817+
25818 return retval;
25819 }
25820
25821@@ -229,6 +256,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25822 }
25823 }
25824
25825+#ifdef CONFIG_PAX_SEGMEXEC
25826+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25827+ error = -EINVAL;
25828+ goto out_unlock;
25829+ }
25830+#endif
25831+
25832 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25833 error = -EINVAL;
25834 goto out_unlock;
25835@@ -254,6 +288,15 @@ asmlinkage int sys_modify_ldt(int func, void __user *ptr,
25836 {
25837 int ret = -ENOSYS;
25838
25839+ if (!sysctl_modify_ldt) {
25840+ printk_ratelimited(KERN_INFO
25841+ "Denied a call to modify_ldt() from %s[%d] (uid: %d)."
25842+ " Adjust sysctl if this was not an exploit attempt.\n",
25843+ current->comm, task_pid_nr(current),
25844+ from_kuid_munged(current_user_ns(), current_uid()));
25845+ return ret;
25846+ }
25847+
25848 switch (func) {
25849 case 0:
25850 ret = read_ldt(ptr, bytecount);
25851diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
25852index ff3c3101d..d7c0cd8 100644
25853--- a/arch/x86/kernel/livepatch.c
25854+++ b/arch/x86/kernel/livepatch.c
25855@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25856 int ret, numpages, size = 4;
25857 bool readonly;
25858 unsigned long val;
25859- unsigned long core = (unsigned long)mod->module_core;
25860- unsigned long core_ro_size = mod->core_ro_size;
25861- unsigned long core_size = mod->core_size;
25862+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
25863+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
25864+ unsigned long core_size_rx = mod->core_size_rx;
25865+ unsigned long core_size_rw = mod->core_size_rw;
25866
25867 switch (type) {
25868 case R_X86_64_NONE:
25869@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25870 return -EINVAL;
25871 }
25872
25873- if (loc < core || loc >= core + core_size)
25874+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
25875+ (loc < core_rw || loc >= core_rw + core_size_rw))
25876 /* loc does not point to any symbol inside the module */
25877 return -EINVAL;
25878
25879- if (loc < core + core_ro_size)
25880+ if (loc < core_rx + core_size_rx)
25881 readonly = true;
25882 else
25883 readonly = false;
25884diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25885index 469b23d..5449cfe 100644
25886--- a/arch/x86/kernel/machine_kexec_32.c
25887+++ b/arch/x86/kernel/machine_kexec_32.c
25888@@ -26,7 +26,7 @@
25889 #include <asm/cacheflush.h>
25890 #include <asm/debugreg.h>
25891
25892-static void set_idt(void *newidt, __u16 limit)
25893+static void set_idt(struct desc_struct *newidt, __u16 limit)
25894 {
25895 struct desc_ptr curidt;
25896
25897@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25898 }
25899
25900
25901-static void set_gdt(void *newgdt, __u16 limit)
25902+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25903 {
25904 struct desc_ptr curgdt;
25905
25906@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25907 }
25908
25909 control_page = page_address(image->control_code_page);
25910- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25911+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25912
25913 relocate_kernel_ptr = control_page;
25914 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25915diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25916index 94ea120..4154cea 100644
25917--- a/arch/x86/kernel/mcount_64.S
25918+++ b/arch/x86/kernel/mcount_64.S
25919@@ -7,7 +7,7 @@
25920 #include <linux/linkage.h>
25921 #include <asm/ptrace.h>
25922 #include <asm/ftrace.h>
25923-
25924+#include <asm/alternative-asm.h>
25925
25926 .code64
25927 .section .entry.text, "ax"
25928@@ -148,8 +148,9 @@
25929 #ifdef CONFIG_DYNAMIC_FTRACE
25930
25931 ENTRY(function_hook)
25932+ pax_force_retaddr
25933 retq
25934-END(function_hook)
25935+ENDPROC(function_hook)
25936
25937 ENTRY(ftrace_caller)
25938 /* save_mcount_regs fills in first two parameters */
25939@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
25940 #endif
25941
25942 GLOBAL(ftrace_stub)
25943+ pax_force_retaddr
25944 retq
25945-END(ftrace_caller)
25946+ENDPROC(ftrace_caller)
25947
25948 ENTRY(ftrace_regs_caller)
25949 /* Save the current flags before any operations that can change them */
25950@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
25951
25952 jmp ftrace_return
25953
25954-END(ftrace_regs_caller)
25955+ENDPROC(ftrace_regs_caller)
25956
25957
25958 #else /* ! CONFIG_DYNAMIC_FTRACE */
25959@@ -272,18 +274,20 @@ fgraph_trace:
25960 #endif
25961
25962 GLOBAL(ftrace_stub)
25963+ pax_force_retaddr
25964 retq
25965
25966 trace:
25967 /* save_mcount_regs fills in first two parameters */
25968 save_mcount_regs
25969
25970+ pax_force_fptr ftrace_trace_function
25971 call *ftrace_trace_function
25972
25973 restore_mcount_regs
25974
25975 jmp fgraph_trace
25976-END(function_hook)
25977+ENDPROC(function_hook)
25978 #endif /* CONFIG_DYNAMIC_FTRACE */
25979 #endif /* CONFIG_FUNCTION_TRACER */
25980
25981@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
25982
25983 restore_mcount_regs
25984
25985+ pax_force_retaddr
25986 retq
25987-END(ftrace_graph_caller)
25988+ENDPROC(ftrace_graph_caller)
25989
25990 GLOBAL(return_to_handler)
25991 subq $24, %rsp
25992@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
25993 movq 8(%rsp), %rdx
25994 movq (%rsp), %rax
25995 addq $24, %rsp
25996+ pax_force_fptr %rdi
25997 jmp *%rdi
25998+ENDPROC(return_to_handler)
25999 #endif
26000diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
26001index 005c03e..2f440cd 100644
26002--- a/arch/x86/kernel/module.c
26003+++ b/arch/x86/kernel/module.c
26004@@ -75,17 +75,17 @@ static unsigned long int get_module_load_offset(void)
26005 }
26006 #endif
26007
26008-void *module_alloc(unsigned long size)
26009+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
26010 {
26011 void *p;
26012
26013- if (PAGE_ALIGN(size) > MODULES_LEN)
26014+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
26015 return NULL;
26016
26017 p = __vmalloc_node_range(size, MODULE_ALIGN,
26018 MODULES_VADDR + get_module_load_offset(),
26019- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
26020- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
26021+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
26022+ prot, 0, NUMA_NO_NODE,
26023 __builtin_return_address(0));
26024 if (p && (kasan_module_alloc(p, size) < 0)) {
26025 vfree(p);
26026@@ -95,6 +95,51 @@ void *module_alloc(unsigned long size)
26027 return p;
26028 }
26029
26030+void *module_alloc(unsigned long size)
26031+{
26032+
26033+#ifdef CONFIG_PAX_KERNEXEC
26034+ return __module_alloc(size, PAGE_KERNEL);
26035+#else
26036+ return __module_alloc(size, PAGE_KERNEL_EXEC);
26037+#endif
26038+
26039+}
26040+
26041+#ifdef CONFIG_PAX_KERNEXEC
26042+#ifdef CONFIG_X86_32
26043+void *module_alloc_exec(unsigned long size)
26044+{
26045+ struct vm_struct *area;
26046+
26047+ if (size == 0)
26048+ return NULL;
26049+
26050+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26051+return area ? area->addr : NULL;
26052+}
26053+EXPORT_SYMBOL(module_alloc_exec);
26054+
26055+void module_memfree_exec(void *module_region)
26056+{
26057+ vunmap(module_region);
26058+}
26059+EXPORT_SYMBOL(module_memfree_exec);
26060+#else
26061+void module_memfree_exec(void *module_region)
26062+{
26063+ module_memfree(module_region);
26064+}
26065+EXPORT_SYMBOL(module_memfree_exec);
26066+
26067+void *module_alloc_exec(unsigned long size)
26068+{
26069+ return __module_alloc(size, PAGE_KERNEL_RX);
26070+}
26071+EXPORT_SYMBOL(module_alloc_exec);
26072+#endif
26073+#endif
26074+
26075 #ifdef CONFIG_X86_32
26076 int apply_relocate(Elf32_Shdr *sechdrs,
26077 const char *strtab,
26078@@ -105,14 +150,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26079 unsigned int i;
26080 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26081 Elf32_Sym *sym;
26082- uint32_t *location;
26083+ uint32_t *plocation, location;
26084
26085 DEBUGP("Applying relocate section %u to %u\n",
26086 relsec, sechdrs[relsec].sh_info);
26087 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26088 /* This is where to make the change */
26089- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26090- + rel[i].r_offset;
26091+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26092+ location = (uint32_t)plocation;
26093+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26094+ plocation = ktla_ktva((void *)plocation);
26095 /* This is the symbol it is referring to. Note that all
26096 undefined symbols have been resolved. */
26097 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26098@@ -121,11 +168,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26099 switch (ELF32_R_TYPE(rel[i].r_info)) {
26100 case R_386_32:
26101 /* We add the value into the location given */
26102- *location += sym->st_value;
26103+ pax_open_kernel();
26104+ *plocation += sym->st_value;
26105+ pax_close_kernel();
26106 break;
26107 case R_386_PC32:
26108 /* Add the value, subtract its position */
26109- *location += sym->st_value - (uint32_t)location;
26110+ pax_open_kernel();
26111+ *plocation += sym->st_value - location;
26112+ pax_close_kernel();
26113 break;
26114 default:
26115 pr_err("%s: Unknown relocation: %u\n",
26116@@ -170,21 +221,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26117 case R_X86_64_NONE:
26118 break;
26119 case R_X86_64_64:
26120+ pax_open_kernel();
26121 *(u64 *)loc = val;
26122+ pax_close_kernel();
26123 break;
26124 case R_X86_64_32:
26125+ pax_open_kernel();
26126 *(u32 *)loc = val;
26127+ pax_close_kernel();
26128 if (val != *(u32 *)loc)
26129 goto overflow;
26130 break;
26131 case R_X86_64_32S:
26132+ pax_open_kernel();
26133 *(s32 *)loc = val;
26134+ pax_close_kernel();
26135 if ((s64)val != *(s32 *)loc)
26136 goto overflow;
26137 break;
26138 case R_X86_64_PC32:
26139 val -= (u64)loc;
26140+ pax_open_kernel();
26141 *(u32 *)loc = val;
26142+ pax_close_kernel();
26143+
26144 #if 0
26145 if ((s64)val != *(s32 *)loc)
26146 goto overflow;
26147diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26148index 113e707..0a690e1 100644
26149--- a/arch/x86/kernel/msr.c
26150+++ b/arch/x86/kernel/msr.c
26151@@ -39,6 +39,7 @@
26152 #include <linux/notifier.h>
26153 #include <linux/uaccess.h>
26154 #include <linux/gfp.h>
26155+#include <linux/grsecurity.h>
26156
26157 #include <asm/processor.h>
26158 #include <asm/msr.h>
26159@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26160 int err = 0;
26161 ssize_t bytes = 0;
26162
26163+#ifdef CONFIG_GRKERNSEC_KMEM
26164+ gr_handle_msr_write();
26165+ return -EPERM;
26166+#endif
26167+
26168 if (count % 8)
26169 return -EINVAL; /* Invalid chunk size */
26170
26171@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26172 err = -EBADF;
26173 break;
26174 }
26175+#ifdef CONFIG_GRKERNSEC_KMEM
26176+ gr_handle_msr_write();
26177+ return -EPERM;
26178+#endif
26179 if (copy_from_user(&regs, uregs, sizeof regs)) {
26180 err = -EFAULT;
26181 break;
26182@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26183 return notifier_from_errno(err);
26184 }
26185
26186-static struct notifier_block __refdata msr_class_cpu_notifier = {
26187+static struct notifier_block msr_class_cpu_notifier = {
26188 .notifier_call = msr_class_cpu_callback,
26189 };
26190
26191diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26192index d05bd2e..f690edd 100644
26193--- a/arch/x86/kernel/nmi.c
26194+++ b/arch/x86/kernel/nmi.c
26195@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26196
26197 static void nmi_max_handler(struct irq_work *w)
26198 {
26199- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26200+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26201 int remainder_ns, decimal_msecs;
26202- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26203+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26204
26205 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26206 decimal_msecs = remainder_ns / 1000;
26207
26208 printk_ratelimited(KERN_INFO
26209 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26210- a->handler, whole_msecs, decimal_msecs);
26211+ n->action->handler, whole_msecs, decimal_msecs);
26212 }
26213
26214 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26215@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26216 delta = sched_clock() - delta;
26217 trace_nmi_handler(a->handler, (int)delta, thishandled);
26218
26219- if (delta < nmi_longest_ns || delta < a->max_duration)
26220+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26221 continue;
26222
26223- a->max_duration = delta;
26224- irq_work_queue(&a->irq_work);
26225+ a->work->max_duration = delta;
26226+ irq_work_queue(&a->work->irq_work);
26227 }
26228
26229 rcu_read_unlock();
26230@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26231 }
26232 NOKPROBE_SYMBOL(nmi_handle);
26233
26234-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26235+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26236 {
26237 struct nmi_desc *desc = nmi_to_desc(type);
26238 unsigned long flags;
26239@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26240 if (!action->handler)
26241 return -EINVAL;
26242
26243- init_irq_work(&action->irq_work, nmi_max_handler);
26244+ action->work->action = action;
26245+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26246
26247 spin_lock_irqsave(&desc->lock, flags);
26248
26249@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26250 * event confuses some handlers (kdump uses this flag)
26251 */
26252 if (action->flags & NMI_FLAG_FIRST)
26253- list_add_rcu(&action->list, &desc->head);
26254+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26255 else
26256- list_add_tail_rcu(&action->list, &desc->head);
26257+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26258
26259 spin_unlock_irqrestore(&desc->lock, flags);
26260 return 0;
26261@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26262 if (!strcmp(n->name, name)) {
26263 WARN(in_nmi(),
26264 "Trying to free NMI (%s) from NMI context!\n", n->name);
26265- list_del_rcu(&n->list);
26266+ pax_list_del_rcu((struct list_head *)&n->list);
26267 break;
26268 }
26269 }
26270@@ -481,6 +482,17 @@ static DEFINE_PER_CPU(int, update_debug_stack);
26271 dotraplinkage notrace void
26272 do_nmi(struct pt_regs *regs, long error_code)
26273 {
26274+
26275+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26276+ if (!user_mode(regs)) {
26277+ unsigned long cs = regs->cs & 0xFFFF;
26278+ unsigned long ip = ktva_ktla(regs->ip);
26279+
26280+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26281+ regs->ip = ip;
26282+ }
26283+#endif
26284+
26285 if (this_cpu_read(nmi_state) != NMI_NOT_RUNNING) {
26286 this_cpu_write(nmi_state, NMI_LATCHED);
26287 return;
26288diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26289index 6d9582e..f746287 100644
26290--- a/arch/x86/kernel/nmi_selftest.c
26291+++ b/arch/x86/kernel/nmi_selftest.c
26292@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26293 {
26294 /* trap all the unknown NMIs we may generate */
26295 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26296- __initdata);
26297+ __initconst);
26298 }
26299
26300 static void __init cleanup_nmi_testsuite(void)
26301@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26302 unsigned long timeout;
26303
26304 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26305- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26306+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26307 nmi_fail = FAILURE;
26308 return;
26309 }
26310diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26311index bbb6c73..24a58ef 100644
26312--- a/arch/x86/kernel/paravirt-spinlocks.c
26313+++ b/arch/x86/kernel/paravirt-spinlocks.c
26314@@ -8,7 +8,7 @@
26315
26316 #include <asm/paravirt.h>
26317
26318-struct pv_lock_ops pv_lock_ops = {
26319+struct pv_lock_ops pv_lock_ops __read_only = {
26320 #ifdef CONFIG_SMP
26321 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26322 .unlock_kick = paravirt_nop,
26323diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26324index c614dd4..9ad659e 100644
26325--- a/arch/x86/kernel/paravirt.c
26326+++ b/arch/x86/kernel/paravirt.c
26327@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26328 {
26329 return x;
26330 }
26331+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26332+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26333+#endif
26334
26335 void __init default_banner(void)
26336 {
26337@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26338
26339 if (opfunc == NULL)
26340 /* If there's no function, patch it with a ud2a (BUG) */
26341- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26342- else if (opfunc == _paravirt_nop)
26343+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26344+ else if (opfunc == (void *)_paravirt_nop)
26345 /* If the operation is a nop, then nop the callsite */
26346 ret = paravirt_patch_nop();
26347
26348 /* identity functions just return their single argument */
26349- else if (opfunc == _paravirt_ident_32)
26350+ else if (opfunc == (void *)_paravirt_ident_32)
26351 ret = paravirt_patch_ident_32(insnbuf, len);
26352- else if (opfunc == _paravirt_ident_64)
26353+ else if (opfunc == (void *)_paravirt_ident_64)
26354 ret = paravirt_patch_ident_64(insnbuf, len);
26355+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26356+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26357+ ret = paravirt_patch_ident_64(insnbuf, len);
26358+#endif
26359
26360 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26361 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26362@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26363 if (insn_len > len || start == NULL)
26364 insn_len = len;
26365 else
26366- memcpy(insnbuf, start, insn_len);
26367+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26368
26369 return insn_len;
26370 }
26371@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26372 return this_cpu_read(paravirt_lazy_mode);
26373 }
26374
26375-struct pv_info pv_info = {
26376+struct pv_info pv_info __read_only = {
26377 .name = "bare hardware",
26378 .paravirt_enabled = 0,
26379 .kernel_rpl = 0,
26380@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26381 #endif
26382 };
26383
26384-struct pv_init_ops pv_init_ops = {
26385+struct pv_init_ops pv_init_ops __read_only = {
26386 .patch = native_patch,
26387 };
26388
26389-struct pv_time_ops pv_time_ops = {
26390+struct pv_time_ops pv_time_ops __read_only = {
26391 .sched_clock = native_sched_clock,
26392 .steal_clock = native_steal_clock,
26393 };
26394
26395-__visible struct pv_irq_ops pv_irq_ops = {
26396+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26397 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26398 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26399 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26400@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26401 #endif
26402 };
26403
26404-__visible struct pv_cpu_ops pv_cpu_ops = {
26405+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26406 .cpuid = native_cpuid,
26407 .get_debugreg = native_get_debugreg,
26408 .set_debugreg = native_set_debugreg,
26409@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26410 NOKPROBE_SYMBOL(native_set_debugreg);
26411 NOKPROBE_SYMBOL(native_load_idt);
26412
26413-struct pv_apic_ops pv_apic_ops = {
26414+struct pv_apic_ops pv_apic_ops __read_only= {
26415 #ifdef CONFIG_X86_LOCAL_APIC
26416 .startup_ipi_hook = paravirt_nop,
26417 #endif
26418 };
26419
26420-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26421+#ifdef CONFIG_X86_32
26422+#ifdef CONFIG_X86_PAE
26423+/* 64-bit pagetable entries */
26424+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26425+#else
26426 /* 32-bit pagetable entries */
26427 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26428+#endif
26429 #else
26430 /* 64-bit pagetable entries */
26431 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26432 #endif
26433
26434-struct pv_mmu_ops pv_mmu_ops = {
26435+struct pv_mmu_ops pv_mmu_ops __read_only = {
26436
26437 .read_cr2 = native_read_cr2,
26438 .write_cr2 = native_write_cr2,
26439@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26440 .make_pud = PTE_IDENT,
26441
26442 .set_pgd = native_set_pgd,
26443+ .set_pgd_batched = native_set_pgd_batched,
26444 #endif
26445 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
26446
26447@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26448 },
26449
26450 .set_fixmap = native_set_fixmap,
26451+
26452+#ifdef CONFIG_PAX_KERNEXEC
26453+ .pax_open_kernel = native_pax_open_kernel,
26454+ .pax_close_kernel = native_pax_close_kernel,
26455+#endif
26456+
26457 };
26458
26459 EXPORT_SYMBOL_GPL(pv_time_ops);
26460diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26461index a1da673..b6f5831 100644
26462--- a/arch/x86/kernel/paravirt_patch_64.c
26463+++ b/arch/x86/kernel/paravirt_patch_64.c
26464@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26465 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26466 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26467 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26468+
26469+#ifndef CONFIG_PAX_MEMORY_UDEREF
26470 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26471+#endif
26472+
26473 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26474 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26475
26476@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26477 PATCH_SITE(pv_mmu_ops, read_cr3);
26478 PATCH_SITE(pv_mmu_ops, write_cr3);
26479 PATCH_SITE(pv_cpu_ops, clts);
26480+
26481+#ifndef CONFIG_PAX_MEMORY_UDEREF
26482 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26483+#endif
26484+
26485 PATCH_SITE(pv_cpu_ops, wbinvd);
26486
26487 patch_site:
26488diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26489index 0497f71..7186c0d 100644
26490--- a/arch/x86/kernel/pci-calgary_64.c
26491+++ b/arch/x86/kernel/pci-calgary_64.c
26492@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26493 tce_space = be64_to_cpu(readq(target));
26494 tce_space = tce_space & TAR_SW_BITS;
26495
26496- tce_space = tce_space & (~specified_table_size);
26497+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26498 info->tce_space = (u64 *)__va(tce_space);
26499 }
26500 }
26501diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26502index 35ccf75..7a15747 100644
26503--- a/arch/x86/kernel/pci-iommu_table.c
26504+++ b/arch/x86/kernel/pci-iommu_table.c
26505@@ -2,7 +2,7 @@
26506 #include <asm/iommu_table.h>
26507 #include <linux/string.h>
26508 #include <linux/kallsyms.h>
26509-
26510+#include <linux/sched.h>
26511
26512 #define DEBUG 1
26513
26514diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26515index 77dd0ad..9ec4723 100644
26516--- a/arch/x86/kernel/pci-swiotlb.c
26517+++ b/arch/x86/kernel/pci-swiotlb.c
26518@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26519 struct dma_attrs *attrs)
26520 {
26521 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26522- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26523+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26524 else
26525 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26526 }
26527diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26528index 6e338e3..82f946e 100644
26529--- a/arch/x86/kernel/process.c
26530+++ b/arch/x86/kernel/process.c
26531@@ -38,7 +38,8 @@
26532 * section. Since TSS's are completely CPU-local, we want them
26533 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26534 */
26535-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26536+struct tss_struct cpu_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = {
26537+ [0 ... NR_CPUS-1] = {
26538 .x86_tss = {
26539 .sp0 = TOP_OF_INIT_STACK,
26540 #ifdef CONFIG_X86_32
26541@@ -56,6 +57,7 @@ __visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26542 */
26543 .io_bitmap = { [0 ... IO_BITMAP_LONGS] = ~0 },
26544 #endif
26545+}
26546 };
26547 EXPORT_PER_CPU_SYMBOL(cpu_tss);
26548
26549@@ -115,7 +117,7 @@ void arch_task_cache_init(void)
26550 task_xstate_cachep =
26551 kmem_cache_create("task_xstate", xstate_size,
26552 __alignof__(union thread_xstate),
26553- SLAB_PANIC | SLAB_NOTRACK, NULL);
26554+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26555 setup_xstate_comp();
26556 }
26557
26558@@ -129,7 +131,7 @@ void exit_thread(void)
26559 unsigned long *bp = t->io_bitmap_ptr;
26560
26561 if (bp) {
26562- struct tss_struct *tss = &per_cpu(cpu_tss, get_cpu());
26563+ struct tss_struct *tss = cpu_tss + get_cpu();
26564
26565 t->io_bitmap_ptr = NULL;
26566 clear_thread_flag(TIF_IO_BITMAP);
26567@@ -149,6 +151,9 @@ void flush_thread(void)
26568 {
26569 struct task_struct *tsk = current;
26570
26571+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26572+ loadsegment(gs, 0);
26573+#endif
26574 flush_ptrace_hw_breakpoint(tsk);
26575 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26576
26577@@ -302,7 +307,7 @@ static void __exit_idle(void)
26578 void exit_idle(void)
26579 {
26580 /* idle loop has pid 0 */
26581- if (current->pid)
26582+ if (task_pid_nr(current))
26583 return;
26584 __exit_idle();
26585 }
26586@@ -355,7 +360,7 @@ bool xen_set_default_idle(void)
26587 return ret;
26588 }
26589 #endif
26590-void stop_this_cpu(void *dummy)
26591+__noreturn void stop_this_cpu(void *dummy)
26592 {
26593 local_irq_disable();
26594 /*
26595@@ -531,16 +536,43 @@ static int __init idle_setup(char *str)
26596 }
26597 early_param("idle", idle_setup);
26598
26599-unsigned long arch_align_stack(unsigned long sp)
26600-{
26601- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26602- sp -= get_random_int() % 8192;
26603- return sp & ~0xf;
26604-}
26605-
26606 unsigned long arch_randomize_brk(struct mm_struct *mm)
26607 {
26608 unsigned long range_end = mm->brk + 0x02000000;
26609 return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26610 }
26611
26612+#ifdef CONFIG_PAX_RANDKSTACK
26613+void pax_randomize_kstack(struct pt_regs *regs)
26614+{
26615+ struct thread_struct *thread = &current->thread;
26616+ unsigned long time;
26617+
26618+ if (!randomize_va_space)
26619+ return;
26620+
26621+ if (v8086_mode(regs))
26622+ return;
26623+
26624+ rdtscl(time);
26625+
26626+ /* P4 seems to return a 0 LSB, ignore it */
26627+#ifdef CONFIG_MPENTIUM4
26628+ time &= 0x3EUL;
26629+ time <<= 2;
26630+#elif defined(CONFIG_X86_64)
26631+ time &= 0xFUL;
26632+ time <<= 4;
26633+#else
26634+ time &= 0x1FUL;
26635+ time <<= 3;
26636+#endif
26637+
26638+ thread->sp0 ^= time;
26639+ load_sp0(cpu_tss + smp_processor_id(), thread);
26640+
26641+#ifdef CONFIG_X86_64
26642+ this_cpu_write(kernel_stack, thread->sp0);
26643+#endif
26644+}
26645+#endif
26646diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26647index 8ed2106..1345704 100644
26648--- a/arch/x86/kernel/process_32.c
26649+++ b/arch/x86/kernel/process_32.c
26650@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26651 unsigned long thread_saved_pc(struct task_struct *tsk)
26652 {
26653 return ((unsigned long *)tsk->thread.sp)[3];
26654+//XXX return tsk->thread.eip;
26655 }
26656
26657 void __show_regs(struct pt_regs *regs, int all)
26658@@ -76,16 +77,15 @@ void __show_regs(struct pt_regs *regs, int all)
26659 if (user_mode(regs)) {
26660 sp = regs->sp;
26661 ss = regs->ss & 0xffff;
26662- gs = get_user_gs(regs);
26663 } else {
26664 sp = kernel_stack_pointer(regs);
26665 savesegment(ss, ss);
26666- savesegment(gs, gs);
26667 }
26668+ gs = get_user_gs(regs);
26669
26670 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26671 (u16)regs->cs, regs->ip, regs->flags,
26672- smp_processor_id());
26673+ raw_smp_processor_id());
26674 print_symbol("EIP is at %s\n", regs->ip);
26675
26676 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26677@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26678 int copy_thread(unsigned long clone_flags, unsigned long sp,
26679 unsigned long arg, struct task_struct *p)
26680 {
26681- struct pt_regs *childregs = task_pt_regs(p);
26682+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26683 struct task_struct *tsk;
26684 int err;
26685
26686 p->thread.sp = (unsigned long) childregs;
26687 p->thread.sp0 = (unsigned long) (childregs+1);
26688+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26689 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26690
26691 if (unlikely(p->flags & PF_KTHREAD)) {
26692 /* kernel thread */
26693 memset(childregs, 0, sizeof(struct pt_regs));
26694 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26695- task_user_gs(p) = __KERNEL_STACK_CANARY;
26696- childregs->ds = __USER_DS;
26697- childregs->es = __USER_DS;
26698+ savesegment(gs, childregs->gs);
26699+ childregs->ds = __KERNEL_DS;
26700+ childregs->es = __KERNEL_DS;
26701 childregs->fs = __KERNEL_PERCPU;
26702 childregs->bx = sp; /* function */
26703 childregs->bp = arg;
26704@@ -244,7 +245,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26705 struct thread_struct *prev = &prev_p->thread,
26706 *next = &next_p->thread;
26707 int cpu = smp_processor_id();
26708- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
26709+ struct tss_struct *tss = cpu_tss + cpu;
26710 fpu_switch_t fpu;
26711
26712 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26713@@ -263,6 +264,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26714 */
26715 lazy_save_gs(prev->gs);
26716
26717+#ifdef CONFIG_PAX_MEMORY_UDEREF
26718+ __set_fs(task_thread_info(next_p)->addr_limit);
26719+#endif
26720+
26721 /*
26722 * Load the per-thread Thread-Local Storage descriptor.
26723 */
26724@@ -306,12 +311,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26725 * current_thread_info().
26726 */
26727 load_sp0(tss, next);
26728- this_cpu_write(kernel_stack,
26729- (unsigned long)task_stack_page(next_p) +
26730- THREAD_SIZE);
26731- this_cpu_write(cpu_current_top_of_stack,
26732- (unsigned long)task_stack_page(next_p) +
26733- THREAD_SIZE);
26734+ this_cpu_write(current_task, next_p);
26735+ this_cpu_write(current_tinfo, &next_p->tinfo);
26736+ this_cpu_write(kernel_stack, next->sp0);
26737+ this_cpu_write(cpu_current_top_of_stack, next->sp0);
26738
26739 /*
26740 * Restore %gs if needed (which is common)
26741@@ -321,8 +324,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26742
26743 switch_fpu_finish(next_p, fpu);
26744
26745- this_cpu_write(current_task, next_p);
26746-
26747 return prev_p;
26748 }
26749
26750@@ -352,4 +353,3 @@ unsigned long get_wchan(struct task_struct *p)
26751 } while (count++ < 16);
26752 return 0;
26753 }
26754-
26755diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26756index ddfdbf7..625417c 100644
26757--- a/arch/x86/kernel/process_64.c
26758+++ b/arch/x86/kernel/process_64.c
26759@@ -158,9 +158,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26760 struct pt_regs *childregs;
26761 struct task_struct *me = current;
26762
26763- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26764+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26765 childregs = task_pt_regs(p);
26766 p->thread.sp = (unsigned long) childregs;
26767+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26768 set_tsk_thread_flag(p, TIF_FORK);
26769 p->thread.io_bitmap_ptr = NULL;
26770
26771@@ -170,6 +171,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26772 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26773 savesegment(es, p->thread.es);
26774 savesegment(ds, p->thread.ds);
26775+ savesegment(ss, p->thread.ss);
26776+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26777 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26778
26779 if (unlikely(p->flags & PF_KTHREAD)) {
26780@@ -275,7 +278,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26781 struct thread_struct *prev = &prev_p->thread;
26782 struct thread_struct *next = &next_p->thread;
26783 int cpu = smp_processor_id();
26784- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
26785+ struct tss_struct *tss = cpu_tss + cpu;
26786 unsigned fsindex, gsindex;
26787 fpu_switch_t fpu;
26788
26789@@ -326,6 +329,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26790 if (unlikely(next->ds | prev->ds))
26791 loadsegment(ds, next->ds);
26792
26793+ savesegment(ss, prev->ss);
26794+ if (unlikely(next->ss != prev->ss))
26795+ loadsegment(ss, next->ss);
26796+
26797 /*
26798 * Switch FS and GS.
26799 *
26800@@ -397,6 +404,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26801 * Switch the PDA and FPU contexts.
26802 */
26803 this_cpu_write(current_task, next_p);
26804+ this_cpu_write(current_tinfo, &next_p->tinfo);
26805
26806 /*
26807 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26808@@ -409,8 +417,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26809 /* Reload esp0 and ss1. This changes current_thread_info(). */
26810 load_sp0(tss, next);
26811
26812- this_cpu_write(kernel_stack,
26813- (unsigned long)task_stack_page(next_p) + THREAD_SIZE);
26814+ this_cpu_write(kernel_stack, next->sp0);
26815
26816 /*
26817 * Now maybe reload the debug registers and handle I/O bitmaps
26818@@ -508,12 +515,11 @@ unsigned long get_wchan(struct task_struct *p)
26819 if (!p || p == current || p->state == TASK_RUNNING)
26820 return 0;
26821 stack = (unsigned long)task_stack_page(p);
26822- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26823+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26824 return 0;
26825 fp = *(u64 *)(p->thread.sp);
26826 do {
26827- if (fp < (unsigned long)stack ||
26828- fp >= (unsigned long)stack+THREAD_SIZE)
26829+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26830 return 0;
26831 ip = *(u64 *)(fp+8);
26832 if (!in_sched_functions(ip))
26833diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26834index a7bc794..094ee8e 100644
26835--- a/arch/x86/kernel/ptrace.c
26836+++ b/arch/x86/kernel/ptrace.c
26837@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26838 unsigned long sp = (unsigned long)&regs->sp;
26839 u32 *prev_esp;
26840
26841- if (context == (sp & ~(THREAD_SIZE - 1)))
26842+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26843 return sp;
26844
26845- prev_esp = (u32 *)(context);
26846+ prev_esp = *(u32 **)(context);
26847 if (prev_esp)
26848 return (unsigned long)prev_esp;
26849
26850@@ -446,6 +446,20 @@ static int putreg(struct task_struct *child,
26851 if (child->thread.gs != value)
26852 return do_arch_prctl(child, ARCH_SET_GS, value);
26853 return 0;
26854+
26855+ case offsetof(struct user_regs_struct,ip):
26856+ /*
26857+ * Protect against any attempt to set ip to an
26858+ * impossible address. There are dragons lurking if the
26859+ * address is noncanonical. (This explicitly allows
26860+ * setting ip to TASK_SIZE_MAX, because user code can do
26861+ * that all by itself by running off the end of its
26862+ * address space.
26863+ */
26864+ if (value > TASK_SIZE_MAX)
26865+ return -EIO;
26866+ break;
26867+
26868 #endif
26869 }
26870
26871@@ -582,7 +596,7 @@ static void ptrace_triggered(struct perf_event *bp,
26872 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26873 {
26874 int i;
26875- int dr7 = 0;
26876+ unsigned long dr7 = 0;
26877 struct arch_hw_breakpoint *info;
26878
26879 for (i = 0; i < HBP_NUM; i++) {
26880@@ -816,7 +830,7 @@ long arch_ptrace(struct task_struct *child, long request,
26881 unsigned long addr, unsigned long data)
26882 {
26883 int ret;
26884- unsigned long __user *datap = (unsigned long __user *)data;
26885+ unsigned long __user *datap = (__force unsigned long __user *)data;
26886
26887 switch (request) {
26888 /* read the word at location addr in the USER area. */
26889@@ -901,14 +915,14 @@ long arch_ptrace(struct task_struct *child, long request,
26890 if ((int) addr < 0)
26891 return -EIO;
26892 ret = do_get_thread_area(child, addr,
26893- (struct user_desc __user *)data);
26894+ (__force struct user_desc __user *) data);
26895 break;
26896
26897 case PTRACE_SET_THREAD_AREA:
26898 if ((int) addr < 0)
26899 return -EIO;
26900 ret = do_set_thread_area(child, addr,
26901- (struct user_desc __user *)data, 0);
26902+ (__force struct user_desc __user *) data, 0);
26903 break;
26904 #endif
26905
26906@@ -1286,7 +1300,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26907
26908 #ifdef CONFIG_X86_64
26909
26910-static struct user_regset x86_64_regsets[] __read_mostly = {
26911+static user_regset_no_const x86_64_regsets[] __read_only = {
26912 [REGSET_GENERAL] = {
26913 .core_note_type = NT_PRSTATUS,
26914 .n = sizeof(struct user_regs_struct) / sizeof(long),
26915@@ -1327,7 +1341,7 @@ static const struct user_regset_view user_x86_64_view = {
26916 #endif /* CONFIG_X86_64 */
26917
26918 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26919-static struct user_regset x86_32_regsets[] __read_mostly = {
26920+static user_regset_no_const x86_32_regsets[] __read_only = {
26921 [REGSET_GENERAL] = {
26922 .core_note_type = NT_PRSTATUS,
26923 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26924@@ -1380,7 +1394,7 @@ static const struct user_regset_view user_x86_32_view = {
26925 */
26926 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26927
26928-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26929+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26930 {
26931 #ifdef CONFIG_X86_64
26932 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26933@@ -1415,7 +1429,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26934 memset(info, 0, sizeof(*info));
26935 info->si_signo = SIGTRAP;
26936 info->si_code = si_code;
26937- info->si_addr = user_mode(regs) ? (void __user *)regs->ip : NULL;
26938+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26939 }
26940
26941 void user_single_step_siginfo(struct task_struct *tsk,
26942@@ -1449,6 +1463,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26943 }
26944 }
26945
26946+#ifdef CONFIG_GRKERNSEC_SETXID
26947+extern void gr_delayed_cred_worker(void);
26948+#endif
26949+
26950 /*
26951 * We can return 0 to resume the syscall or anything else to go to phase
26952 * 2. If we resume the syscall, we need to put something appropriate in
26953@@ -1556,6 +1574,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26954
26955 BUG_ON(regs != task_pt_regs(current));
26956
26957+#ifdef CONFIG_GRKERNSEC_SETXID
26958+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26959+ gr_delayed_cred_worker();
26960+#endif
26961+
26962 /*
26963 * If we stepped into a sysenter/syscall insn, it trapped in
26964 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26965@@ -1614,6 +1637,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26966 */
26967 user_exit();
26968
26969+#ifdef CONFIG_GRKERNSEC_SETXID
26970+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26971+ gr_delayed_cred_worker();
26972+#endif
26973+
26974 audit_syscall_exit(regs);
26975
26976 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26977diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26978index 2f355d2..e75ed0a 100644
26979--- a/arch/x86/kernel/pvclock.c
26980+++ b/arch/x86/kernel/pvclock.c
26981@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26982 reset_hung_task_detector();
26983 }
26984
26985-static atomic64_t last_value = ATOMIC64_INIT(0);
26986+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26987
26988 void pvclock_resume(void)
26989 {
26990- atomic64_set(&last_value, 0);
26991+ atomic64_set_unchecked(&last_value, 0);
26992 }
26993
26994 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26995@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26996 * updating at the same time, and one of them could be slightly behind,
26997 * making the assumption that last_value always go forward fail to hold.
26998 */
26999- last = atomic64_read(&last_value);
27000+ last = atomic64_read_unchecked(&last_value);
27001 do {
27002 if (ret < last)
27003 return last;
27004- last = atomic64_cmpxchg(&last_value, last, ret);
27005+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
27006 } while (unlikely(last != ret));
27007
27008 return ret;
27009diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
27010index 86db4bc..a50a54a 100644
27011--- a/arch/x86/kernel/reboot.c
27012+++ b/arch/x86/kernel/reboot.c
27013@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
27014
27015 void __noreturn machine_real_restart(unsigned int type)
27016 {
27017+
27018+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
27019+ struct desc_struct *gdt;
27020+#endif
27021+
27022 local_irq_disable();
27023
27024 /*
27025@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
27026
27027 /* Jump to the identity-mapped low memory code */
27028 #ifdef CONFIG_X86_32
27029- asm volatile("jmpl *%0" : :
27030+
27031+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
27032+ gdt = get_cpu_gdt_table(smp_processor_id());
27033+ pax_open_kernel();
27034+#ifdef CONFIG_PAX_MEMORY_UDEREF
27035+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
27036+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
27037+ loadsegment(ds, __KERNEL_DS);
27038+ loadsegment(es, __KERNEL_DS);
27039+ loadsegment(ss, __KERNEL_DS);
27040+#endif
27041+#ifdef CONFIG_PAX_KERNEXEC
27042+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
27043+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
27044+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
27045+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
27046+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
27047+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
27048+#endif
27049+ pax_close_kernel();
27050+#endif
27051+
27052+ asm volatile("ljmpl *%0" : :
27053 "rm" (real_mode_header->machine_real_restart_asm),
27054 "a" (type));
27055 #else
27056@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27057 /*
27058 * This is a single dmi_table handling all reboot quirks.
27059 */
27060-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27061+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27062
27063 /* Acer */
27064 { /* Handle reboot issue on Acer Aspire one */
27065@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27066 * This means that this function can never return, it can misbehave
27067 * by not rebooting properly and hanging.
27068 */
27069-static void native_machine_emergency_restart(void)
27070+static void __noreturn native_machine_emergency_restart(void)
27071 {
27072 int i;
27073 int attempt = 0;
27074@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27075 #endif
27076 }
27077
27078-static void __machine_emergency_restart(int emergency)
27079+static void __noreturn __machine_emergency_restart(int emergency)
27080 {
27081 reboot_emergency = emergency;
27082 machine_ops.emergency_restart();
27083 }
27084
27085-static void native_machine_restart(char *__unused)
27086+static void __noreturn native_machine_restart(char *__unused)
27087 {
27088 pr_notice("machine restart\n");
27089
27090@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27091 __machine_emergency_restart(0);
27092 }
27093
27094-static void native_machine_halt(void)
27095+static void __noreturn native_machine_halt(void)
27096 {
27097 /* Stop other cpus and apics */
27098 machine_shutdown();
27099@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27100 stop_this_cpu(NULL);
27101 }
27102
27103-static void native_machine_power_off(void)
27104+static void __noreturn native_machine_power_off(void)
27105 {
27106 if (pm_power_off) {
27107 if (!reboot_force)
27108@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27109 }
27110 /* A fallback in case there is no PM info available */
27111 tboot_shutdown(TB_SHUTDOWN_HALT);
27112+ unreachable();
27113 }
27114
27115-struct machine_ops machine_ops = {
27116+struct machine_ops machine_ops __read_only = {
27117 .power_off = native_machine_power_off,
27118 .shutdown = native_machine_shutdown,
27119 .emergency_restart = native_machine_emergency_restart,
27120diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27121index c8e41e9..64049ef 100644
27122--- a/arch/x86/kernel/reboot_fixups_32.c
27123+++ b/arch/x86/kernel/reboot_fixups_32.c
27124@@ -57,7 +57,7 @@ struct device_fixup {
27125 unsigned int vendor;
27126 unsigned int device;
27127 void (*reboot_fixup)(struct pci_dev *);
27128-};
27129+} __do_const;
27130
27131 /*
27132 * PCI ids solely used for fixups_table go here
27133diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27134index 98111b3..73ca125 100644
27135--- a/arch/x86/kernel/relocate_kernel_64.S
27136+++ b/arch/x86/kernel/relocate_kernel_64.S
27137@@ -96,8 +96,7 @@ relocate_kernel:
27138
27139 /* jump to identity mapped page */
27140 addq $(identity_mapped - relocate_kernel), %r8
27141- pushq %r8
27142- ret
27143+ jmp *%r8
27144
27145 identity_mapped:
27146 /* set return address to 0 if not preserving context */
27147diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27148index d74ac33..6d14941 100644
27149--- a/arch/x86/kernel/setup.c
27150+++ b/arch/x86/kernel/setup.c
27151@@ -111,6 +111,7 @@
27152 #include <asm/mce.h>
27153 #include <asm/alternative.h>
27154 #include <asm/prom.h>
27155+#include <asm/boot.h>
27156
27157 /*
27158 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27159@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27160 #endif
27161
27162
27163-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27164-__visible unsigned long mmu_cr4_features;
27165+#ifdef CONFIG_X86_64
27166+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27167+#elif defined(CONFIG_X86_PAE)
27168+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27169 #else
27170-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27171+__visible unsigned long mmu_cr4_features __read_only;
27172 #endif
27173
27174 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27175@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27176 * area (640->1Mb) as ram even though it is not.
27177 * take them out.
27178 */
27179- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27180+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27181
27182 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27183 }
27184@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27185 /* called before trim_bios_range() to spare extra sanitize */
27186 static void __init e820_add_kernel_range(void)
27187 {
27188- u64 start = __pa_symbol(_text);
27189+ u64 start = __pa_symbol(ktla_ktva(_text));
27190 u64 size = __pa_symbol(_end) - start;
27191
27192 /*
27193@@ -860,8 +863,8 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27194
27195 void __init setup_arch(char **cmdline_p)
27196 {
27197- memblock_reserve(__pa_symbol(_text),
27198- (unsigned long)__bss_stop - (unsigned long)_text);
27199+ memblock_reserve(__pa_symbol(ktla_ktva((unsigned long)_text)),
27200+ (unsigned long)__bss_stop - ktla_ktva((unsigned long)_text));
27201
27202 early_reserve_initrd();
27203
27204@@ -959,16 +962,16 @@ void __init setup_arch(char **cmdline_p)
27205
27206 if (!boot_params.hdr.root_flags)
27207 root_mountflags &= ~MS_RDONLY;
27208- init_mm.start_code = (unsigned long) _text;
27209- init_mm.end_code = (unsigned long) _etext;
27210+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27211+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27212 init_mm.end_data = (unsigned long) _edata;
27213 init_mm.brk = _brk_end;
27214
27215 mpx_mm_init(&init_mm);
27216
27217- code_resource.start = __pa_symbol(_text);
27218- code_resource.end = __pa_symbol(_etext)-1;
27219- data_resource.start = __pa_symbol(_etext);
27220+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27221+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27222+ data_resource.start = __pa_symbol(_sdata);
27223 data_resource.end = __pa_symbol(_edata)-1;
27224 bss_resource.start = __pa_symbol(__bss_start);
27225 bss_resource.end = __pa_symbol(__bss_stop)-1;
27226diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27227index e4fcb87..9c06c55 100644
27228--- a/arch/x86/kernel/setup_percpu.c
27229+++ b/arch/x86/kernel/setup_percpu.c
27230@@ -21,19 +21,17 @@
27231 #include <asm/cpu.h>
27232 #include <asm/stackprotector.h>
27233
27234-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27235+#ifdef CONFIG_SMP
27236+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27237 EXPORT_PER_CPU_SYMBOL(cpu_number);
27238+#endif
27239
27240-#ifdef CONFIG_X86_64
27241 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27242-#else
27243-#define BOOT_PERCPU_OFFSET 0
27244-#endif
27245
27246 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27247 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27248
27249-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27250+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27251 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27252 };
27253 EXPORT_SYMBOL(__per_cpu_offset);
27254@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27255 {
27256 #ifdef CONFIG_NEED_MULTIPLE_NODES
27257 pg_data_t *last = NULL;
27258- unsigned int cpu;
27259+ int cpu;
27260
27261 for_each_possible_cpu(cpu) {
27262 int node = early_cpu_to_node(cpu);
27263@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27264 {
27265 #ifdef CONFIG_X86_32
27266 struct desc_struct gdt;
27267+ unsigned long base = per_cpu_offset(cpu);
27268
27269- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27270- 0x2 | DESCTYPE_S, 0x8);
27271- gdt.s = 1;
27272+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27273+ 0x83 | DESCTYPE_S, 0xC);
27274 write_gdt_entry(get_cpu_gdt_table(cpu),
27275 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27276 #endif
27277@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27278 /* alrighty, percpu areas up and running */
27279 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27280 for_each_possible_cpu(cpu) {
27281+#ifdef CONFIG_CC_STACKPROTECTOR
27282+#ifdef CONFIG_X86_32
27283+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27284+#endif
27285+#endif
27286 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27287 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27288 per_cpu(cpu_number, cpu) = cpu;
27289@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27290 */
27291 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27292 #endif
27293+#ifdef CONFIG_CC_STACKPROTECTOR
27294+#ifdef CONFIG_X86_32
27295+ if (!cpu)
27296+ per_cpu(stack_canary.canary, cpu) = canary;
27297+#endif
27298+#endif
27299 /*
27300 * Up to this point, the boot CPU has been using .init.data
27301 * area. Reload any changed state for the boot CPU.
27302diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27303index 1ea14fd..b551e66 100644
27304--- a/arch/x86/kernel/signal.c
27305+++ b/arch/x86/kernel/signal.c
27306@@ -93,8 +93,15 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
27307 COPY(r15);
27308 #endif /* CONFIG_X86_64 */
27309
27310+#ifdef CONFIG_X86_32
27311 COPY_SEG_CPL3(cs);
27312 COPY_SEG_CPL3(ss);
27313+#else /* !CONFIG_X86_32 */
27314+ /* Kernel saves and restores only the CS segment register on signals,
27315+ * which is the bare minimum needed to allow mixed 32/64-bit code.
27316+ * App's signal handler can save/restore other segments if needed. */
27317+ COPY_SEG_CPL3(cs);
27318+#endif /* CONFIG_X86_32 */
27319
27320 get_user_ex(tmpflags, &sc->flags);
27321 regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
27322@@ -154,9 +161,8 @@ int setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
27323 #else /* !CONFIG_X86_32 */
27324 put_user_ex(regs->flags, &sc->flags);
27325 put_user_ex(regs->cs, &sc->cs);
27326- put_user_ex(0, &sc->__pad2);
27327- put_user_ex(0, &sc->__pad1);
27328- put_user_ex(regs->ss, &sc->ss);
27329+ put_user_ex(0, &sc->gs);
27330+ put_user_ex(0, &sc->fs);
27331 #endif /* CONFIG_X86_32 */
27332
27333 put_user_ex(fpstate, &sc->fpstate);
27334@@ -183,7 +189,7 @@ static unsigned long align_sigframe(unsigned long sp)
27335 * Align the stack pointer according to the i386 ABI,
27336 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27337 */
27338- sp = ((sp + 4) & -16ul) - 4;
27339+ sp = ((sp - 12) & -16ul) - 4;
27340 #else /* !CONFIG_X86_32 */
27341 sp = round_down(sp, 16) - 8;
27342 #endif
27343@@ -291,10 +297,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27344 }
27345
27346 if (current->mm->context.vdso)
27347- restorer = current->mm->context.vdso +
27348- selected_vdso32->sym___kernel_sigreturn;
27349+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27350 else
27351- restorer = &frame->retcode;
27352+ restorer = (void __user *)&frame->retcode;
27353 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27354 restorer = ksig->ka.sa.sa_restorer;
27355
27356@@ -308,7 +313,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27357 * reasons and because gdb uses it as a signature to notice
27358 * signal handler stack frames.
27359 */
27360- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27361+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27362
27363 if (err)
27364 return -EFAULT;
27365@@ -355,8 +360,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27366 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27367
27368 /* Set up to return from userspace. */
27369- restorer = current->mm->context.vdso +
27370- selected_vdso32->sym___kernel_rt_sigreturn;
27371+ if (current->mm->context.vdso)
27372+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27373+ else
27374+ restorer = (void __user *)&frame->retcode;
27375 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27376 restorer = ksig->ka.sa.sa_restorer;
27377 put_user_ex(restorer, &frame->pretcode);
27378@@ -368,7 +375,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27379 * reasons and because gdb uses it as a signature to notice
27380 * signal handler stack frames.
27381 */
27382- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27383+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27384 } put_user_catch(err);
27385
27386 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27387@@ -450,19 +457,9 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27388
27389 regs->sp = (unsigned long)frame;
27390
27391- /*
27392- * Set up the CS and SS registers to run signal handlers in
27393- * 64-bit mode, even if the handler happens to be interrupting
27394- * 32-bit or 16-bit code.
27395- *
27396- * SS is subtle. In 64-bit mode, we don't need any particular
27397- * SS descriptor, but we do need SS to be valid. It's possible
27398- * that the old SS is entirely bogus -- this can happen if the
27399- * signal we're trying to deliver is #GP or #SS caused by a bad
27400- * SS value.
27401- */
27402+ /* Set up the CS register to run signal handlers in 64-bit mode,
27403+ even if the handler happens to be interrupting 32-bit code. */
27404 regs->cs = __USER_CS;
27405- regs->ss = __USER_DS;
27406
27407 return 0;
27408 }
27409@@ -598,7 +595,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27410 {
27411 int usig = ksig->sig;
27412 sigset_t *set = sigmask_to_save();
27413- compat_sigset_t *cset = (compat_sigset_t *) set;
27414+ sigset_t sigcopy;
27415+ compat_sigset_t *cset;
27416+
27417+ sigcopy = *set;
27418+
27419+ cset = (compat_sigset_t *) &sigcopy;
27420
27421 /* Set up the stack frame */
27422 if (is_ia32_frame()) {
27423@@ -609,7 +611,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27424 } else if (is_x32_frame()) {
27425 return x32_setup_rt_frame(ksig, cset, regs);
27426 } else {
27427- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27428+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27429 }
27430 }
27431
27432diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27433index be8e1bd..a3d93fa 100644
27434--- a/arch/x86/kernel/smp.c
27435+++ b/arch/x86/kernel/smp.c
27436@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27437
27438 __setup("nonmi_ipi", nonmi_ipi_setup);
27439
27440-struct smp_ops smp_ops = {
27441+struct smp_ops smp_ops __read_only = {
27442 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27443 .smp_prepare_cpus = native_smp_prepare_cpus,
27444 .smp_cpus_done = native_smp_cpus_done,
27445diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27446index 50e547e..d59d06a 100644
27447--- a/arch/x86/kernel/smpboot.c
27448+++ b/arch/x86/kernel/smpboot.c
27449@@ -226,14 +226,17 @@ static void notrace start_secondary(void *unused)
27450
27451 enable_start_cpu0 = 0;
27452
27453-#ifdef CONFIG_X86_32
27454+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27455+ barrier();
27456+
27457 /* switch away from the initial page table */
27458+#ifdef CONFIG_PAX_PER_CPU_PGD
27459+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27460+#else
27461 load_cr3(swapper_pg_dir);
27462+#endif
27463 __flush_tlb_all();
27464-#endif
27465
27466- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27467- barrier();
27468 /*
27469 * Check TSC synchronization with the BP:
27470 */
27471@@ -782,18 +785,17 @@ void common_cpu_up(unsigned int cpu, struct task_struct *idle)
27472 alternatives_enable_smp();
27473
27474 per_cpu(current_task, cpu) = idle;
27475+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27476
27477 #ifdef CONFIG_X86_32
27478 /* Stack for startup_32 can be just as for start_secondary onwards */
27479 irq_ctx_init(cpu);
27480- per_cpu(cpu_current_top_of_stack, cpu) =
27481- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27482+ per_cpu(cpu_current_top_of_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27483 #else
27484 clear_tsk_thread_flag(idle, TIF_FORK);
27485 initial_gs = per_cpu_offset(cpu);
27486 #endif
27487- per_cpu(kernel_stack, cpu) =
27488- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27489+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27490 }
27491
27492 /*
27493@@ -814,9 +816,11 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27494 unsigned long timeout;
27495
27496 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27497- (THREAD_SIZE + task_stack_page(idle))) - 1);
27498+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27499
27500+ pax_open_kernel();
27501 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27502+ pax_close_kernel();
27503 initial_code = (unsigned long)start_secondary;
27504 stack_start = idle->thread.sp;
27505
27506@@ -961,6 +965,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27507
27508 common_cpu_up(cpu, tidle);
27509
27510+#ifdef CONFIG_PAX_PER_CPU_PGD
27511+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27512+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27513+ KERNEL_PGD_PTRS);
27514+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27515+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27516+ KERNEL_PGD_PTRS);
27517+#endif
27518+
27519 err = do_boot_cpu(apicid, cpu, tidle);
27520 if (err) {
27521 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27522diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27523index 9b4d51d..5d28b58 100644
27524--- a/arch/x86/kernel/step.c
27525+++ b/arch/x86/kernel/step.c
27526@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27527 struct desc_struct *desc;
27528 unsigned long base;
27529
27530- seg &= ~7UL;
27531+ seg >>= 3;
27532
27533 mutex_lock(&child->mm->context.lock);
27534- if (unlikely((seg >> 3) >= child->mm->context.size))
27535+ if (unlikely(seg >= child->mm->context.size))
27536 addr = -1L; /* bogus selector, access would fault */
27537 else {
27538 desc = child->mm->context.ldt + seg;
27539@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27540 addr += base;
27541 }
27542 mutex_unlock(&child->mm->context.lock);
27543- }
27544+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27545+ addr = ktla_ktva(addr);
27546
27547 return addr;
27548 }
27549@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27550 unsigned char opcode[15];
27551 unsigned long addr = convert_ip_to_linear(child, regs);
27552
27553+ if (addr == -EINVAL)
27554+ return 0;
27555+
27556 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27557 for (i = 0; i < copied; i++) {
27558 switch (opcode[i]) {
27559diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27560new file mode 100644
27561index 0000000..5877189
27562--- /dev/null
27563+++ b/arch/x86/kernel/sys_i386_32.c
27564@@ -0,0 +1,189 @@
27565+/*
27566+ * This file contains various random system calls that
27567+ * have a non-standard calling sequence on the Linux/i386
27568+ * platform.
27569+ */
27570+
27571+#include <linux/errno.h>
27572+#include <linux/sched.h>
27573+#include <linux/mm.h>
27574+#include <linux/fs.h>
27575+#include <linux/smp.h>
27576+#include <linux/sem.h>
27577+#include <linux/msg.h>
27578+#include <linux/shm.h>
27579+#include <linux/stat.h>
27580+#include <linux/syscalls.h>
27581+#include <linux/mman.h>
27582+#include <linux/file.h>
27583+#include <linux/utsname.h>
27584+#include <linux/ipc.h>
27585+#include <linux/elf.h>
27586+
27587+#include <linux/uaccess.h>
27588+#include <linux/unistd.h>
27589+
27590+#include <asm/syscalls.h>
27591+
27592+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27593+{
27594+ unsigned long pax_task_size = TASK_SIZE;
27595+
27596+#ifdef CONFIG_PAX_SEGMEXEC
27597+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27598+ pax_task_size = SEGMEXEC_TASK_SIZE;
27599+#endif
27600+
27601+ if (flags & MAP_FIXED)
27602+ if (len > pax_task_size || addr > pax_task_size - len)
27603+ return -EINVAL;
27604+
27605+ return 0;
27606+}
27607+
27608+/*
27609+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27610+ */
27611+static unsigned long get_align_mask(void)
27612+{
27613+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27614+ return 0;
27615+
27616+ if (!(current->flags & PF_RANDOMIZE))
27617+ return 0;
27618+
27619+ return va_align.mask;
27620+}
27621+
27622+unsigned long
27623+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27624+ unsigned long len, unsigned long pgoff, unsigned long flags)
27625+{
27626+ struct mm_struct *mm = current->mm;
27627+ struct vm_area_struct *vma;
27628+ unsigned long pax_task_size = TASK_SIZE;
27629+ struct vm_unmapped_area_info info;
27630+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27631+
27632+#ifdef CONFIG_PAX_SEGMEXEC
27633+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27634+ pax_task_size = SEGMEXEC_TASK_SIZE;
27635+#endif
27636+
27637+ pax_task_size -= PAGE_SIZE;
27638+
27639+ if (len > pax_task_size)
27640+ return -ENOMEM;
27641+
27642+ if (flags & MAP_FIXED)
27643+ return addr;
27644+
27645+#ifdef CONFIG_PAX_RANDMMAP
27646+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27647+#endif
27648+
27649+ if (addr) {
27650+ addr = PAGE_ALIGN(addr);
27651+ if (pax_task_size - len >= addr) {
27652+ vma = find_vma(mm, addr);
27653+ if (check_heap_stack_gap(vma, addr, len, offset))
27654+ return addr;
27655+ }
27656+ }
27657+
27658+ info.flags = 0;
27659+ info.length = len;
27660+ info.align_mask = filp ? get_align_mask() : 0;
27661+ info.align_offset = pgoff << PAGE_SHIFT;
27662+ info.threadstack_offset = offset;
27663+
27664+#ifdef CONFIG_PAX_PAGEEXEC
27665+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27666+ info.low_limit = 0x00110000UL;
27667+ info.high_limit = mm->start_code;
27668+
27669+#ifdef CONFIG_PAX_RANDMMAP
27670+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27671+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27672+#endif
27673+
27674+ if (info.low_limit < info.high_limit) {
27675+ addr = vm_unmapped_area(&info);
27676+ if (!IS_ERR_VALUE(addr))
27677+ return addr;
27678+ }
27679+ } else
27680+#endif
27681+
27682+ info.low_limit = mm->mmap_base;
27683+ info.high_limit = pax_task_size;
27684+
27685+ return vm_unmapped_area(&info);
27686+}
27687+
27688+unsigned long
27689+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27690+ const unsigned long len, const unsigned long pgoff,
27691+ const unsigned long flags)
27692+{
27693+ struct vm_area_struct *vma;
27694+ struct mm_struct *mm = current->mm;
27695+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27696+ struct vm_unmapped_area_info info;
27697+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27698+
27699+#ifdef CONFIG_PAX_SEGMEXEC
27700+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27701+ pax_task_size = SEGMEXEC_TASK_SIZE;
27702+#endif
27703+
27704+ pax_task_size -= PAGE_SIZE;
27705+
27706+ /* requested length too big for entire address space */
27707+ if (len > pax_task_size)
27708+ return -ENOMEM;
27709+
27710+ if (flags & MAP_FIXED)
27711+ return addr;
27712+
27713+#ifdef CONFIG_PAX_PAGEEXEC
27714+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27715+ goto bottomup;
27716+#endif
27717+
27718+#ifdef CONFIG_PAX_RANDMMAP
27719+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27720+#endif
27721+
27722+ /* requesting a specific address */
27723+ if (addr) {
27724+ addr = PAGE_ALIGN(addr);
27725+ if (pax_task_size - len >= addr) {
27726+ vma = find_vma(mm, addr);
27727+ if (check_heap_stack_gap(vma, addr, len, offset))
27728+ return addr;
27729+ }
27730+ }
27731+
27732+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27733+ info.length = len;
27734+ info.low_limit = PAGE_SIZE;
27735+ info.high_limit = mm->mmap_base;
27736+ info.align_mask = filp ? get_align_mask() : 0;
27737+ info.align_offset = pgoff << PAGE_SHIFT;
27738+ info.threadstack_offset = offset;
27739+
27740+ addr = vm_unmapped_area(&info);
27741+ if (!(addr & ~PAGE_MASK))
27742+ return addr;
27743+ VM_BUG_ON(addr != -ENOMEM);
27744+
27745+bottomup:
27746+ /*
27747+ * A failed mmap() very likely causes application failure,
27748+ * so fall back to the bottom-up function here. This scenario
27749+ * can happen with large stack limits and large mmap()
27750+ * allocations.
27751+ */
27752+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27753+}
27754diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27755index 10e0272..b4bb9a7 100644
27756--- a/arch/x86/kernel/sys_x86_64.c
27757+++ b/arch/x86/kernel/sys_x86_64.c
27758@@ -97,8 +97,8 @@ out:
27759 return error;
27760 }
27761
27762-static void find_start_end(unsigned long flags, unsigned long *begin,
27763- unsigned long *end)
27764+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27765+ unsigned long *begin, unsigned long *end)
27766 {
27767 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27768 unsigned long new_begin;
27769@@ -117,7 +117,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27770 *begin = new_begin;
27771 }
27772 } else {
27773- *begin = current->mm->mmap_legacy_base;
27774+ *begin = mm->mmap_legacy_base;
27775 *end = TASK_SIZE;
27776 }
27777 }
27778@@ -130,20 +130,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27779 struct vm_area_struct *vma;
27780 struct vm_unmapped_area_info info;
27781 unsigned long begin, end;
27782+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27783
27784 if (flags & MAP_FIXED)
27785 return addr;
27786
27787- find_start_end(flags, &begin, &end);
27788+ find_start_end(mm, flags, &begin, &end);
27789
27790 if (len > end)
27791 return -ENOMEM;
27792
27793+#ifdef CONFIG_PAX_RANDMMAP
27794+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27795+#endif
27796+
27797 if (addr) {
27798 addr = PAGE_ALIGN(addr);
27799 vma = find_vma(mm, addr);
27800- if (end - len >= addr &&
27801- (!vma || addr + len <= vma->vm_start))
27802+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27803 return addr;
27804 }
27805
27806@@ -157,6 +161,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27807 info.align_mask = get_align_mask();
27808 info.align_offset += get_align_bits();
27809 }
27810+ info.threadstack_offset = offset;
27811 return vm_unmapped_area(&info);
27812 }
27813
27814@@ -169,6 +174,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27815 struct mm_struct *mm = current->mm;
27816 unsigned long addr = addr0;
27817 struct vm_unmapped_area_info info;
27818+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27819
27820 /* requested length too big for entire address space */
27821 if (len > TASK_SIZE)
27822@@ -181,12 +187,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27823 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27824 goto bottomup;
27825
27826+#ifdef CONFIG_PAX_RANDMMAP
27827+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27828+#endif
27829+
27830 /* requesting a specific address */
27831 if (addr) {
27832 addr = PAGE_ALIGN(addr);
27833 vma = find_vma(mm, addr);
27834- if (TASK_SIZE - len >= addr &&
27835- (!vma || addr + len <= vma->vm_start))
27836+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27837 return addr;
27838 }
27839
27840@@ -200,6 +209,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27841 info.align_mask = get_align_mask();
27842 info.align_offset += get_align_bits();
27843 }
27844+ info.threadstack_offset = offset;
27845 addr = vm_unmapped_area(&info);
27846 if (!(addr & ~PAGE_MASK))
27847 return addr;
27848diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27849index 91a4496..42fc304 100644
27850--- a/arch/x86/kernel/tboot.c
27851+++ b/arch/x86/kernel/tboot.c
27852@@ -44,6 +44,7 @@
27853 #include <asm/setup.h>
27854 #include <asm/e820.h>
27855 #include <asm/io.h>
27856+#include <asm/tlbflush.h>
27857
27858 #include "../realmode/rm/wakeup.h"
27859
27860@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
27861
27862 void tboot_shutdown(u32 shutdown_type)
27863 {
27864- void (*shutdown)(void);
27865+ void (* __noreturn shutdown)(void);
27866
27867 if (!tboot_enabled())
27868 return;
27869@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
27870 tboot->shutdown_type = shutdown_type;
27871
27872 switch_to_tboot_pt();
27873+ cr4_clear_bits(X86_CR4_PCIDE);
27874
27875- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27876+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27877 shutdown();
27878
27879 /* should not reach here */
27880@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27881 return -ENODEV;
27882 }
27883
27884-static atomic_t ap_wfs_count;
27885+static atomic_unchecked_t ap_wfs_count;
27886
27887 static int tboot_wait_for_aps(int num_aps)
27888 {
27889@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27890 {
27891 switch (action) {
27892 case CPU_DYING:
27893- atomic_inc(&ap_wfs_count);
27894+ atomic_inc_unchecked(&ap_wfs_count);
27895 if (num_online_cpus() == 1)
27896- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27897+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27898 return NOTIFY_BAD;
27899 break;
27900 }
27901@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
27902
27903 tboot_create_trampoline();
27904
27905- atomic_set(&ap_wfs_count, 0);
27906+ atomic_set_unchecked(&ap_wfs_count, 0);
27907 register_hotcpu_notifier(&tboot_cpu_notifier);
27908
27909 #ifdef CONFIG_DEBUG_FS
27910diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27911index d39c091..1df4349 100644
27912--- a/arch/x86/kernel/time.c
27913+++ b/arch/x86/kernel/time.c
27914@@ -32,7 +32,7 @@ unsigned long profile_pc(struct pt_regs *regs)
27915
27916 if (!user_mode(regs) && in_lock_functions(pc)) {
27917 #ifdef CONFIG_FRAME_POINTER
27918- return *(unsigned long *)(regs->bp + sizeof(long));
27919+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27920 #else
27921 unsigned long *sp =
27922 (unsigned long *)kernel_stack_pointer(regs);
27923@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27924 * or above a saved flags. Eflags has bits 22-31 zero,
27925 * kernel addresses don't.
27926 */
27927+
27928+#ifdef CONFIG_PAX_KERNEXEC
27929+ return ktla_ktva(sp[0]);
27930+#else
27931 if (sp[0] >> 22)
27932 return sp[0];
27933 if (sp[1] >> 22)
27934 return sp[1];
27935 #endif
27936+
27937+#endif
27938 }
27939 return pc;
27940 }
27941diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27942index 7fc5e84..c6e445a 100644
27943--- a/arch/x86/kernel/tls.c
27944+++ b/arch/x86/kernel/tls.c
27945@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27946 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27947 return -EINVAL;
27948
27949+#ifdef CONFIG_PAX_SEGMEXEC
27950+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27951+ return -EINVAL;
27952+#endif
27953+
27954 set_tls_desc(p, idx, &info, 1);
27955
27956 return 0;
27957@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27958
27959 if (kbuf)
27960 info = kbuf;
27961- else if (__copy_from_user(infobuf, ubuf, count))
27962+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27963 return -EFAULT;
27964 else
27965 info = infobuf;
27966diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27967index 1c113db..287b42e 100644
27968--- a/arch/x86/kernel/tracepoint.c
27969+++ b/arch/x86/kernel/tracepoint.c
27970@@ -9,11 +9,11 @@
27971 #include <linux/atomic.h>
27972
27973 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27974-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27975+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27976 (unsigned long) trace_idt_table };
27977
27978 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27979-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27980+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27981
27982 static int trace_irq_vector_refcount;
27983 static DEFINE_MUTEX(irq_vector_mutex);
27984diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27985index 324ab52..0cfd2d05 100644
27986--- a/arch/x86/kernel/traps.c
27987+++ b/arch/x86/kernel/traps.c
27988@@ -68,7 +68,7 @@
27989 #include <asm/proto.h>
27990
27991 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27992-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27993+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27994 #else
27995 #include <asm/processor-flags.h>
27996 #include <asm/setup.h>
27997@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
27998 #endif
27999
28000 /* Must be page-aligned because the real IDT is used in a fixmap. */
28001-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
28002+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
28003
28004 DECLARE_BITMAP(used_vectors, NR_VECTORS);
28005 EXPORT_SYMBOL_GPL(used_vectors);
28006@@ -174,7 +174,7 @@ void ist_begin_non_atomic(struct pt_regs *regs)
28007 * will catch asm bugs and any attempt to use ist_preempt_enable
28008 * from double_fault.
28009 */
28010- BUG_ON((unsigned long)(current_top_of_stack() -
28011+ BUG_ON((unsigned long)(current_top_of_stack(smp_processor_id()) -
28012 current_stack_pointer()) >= THREAD_SIZE);
28013
28014 preempt_count_sub(HARDIRQ_OFFSET);
28015@@ -191,7 +191,7 @@ void ist_end_non_atomic(void)
28016 }
28017
28018 static nokprobe_inline int
28019-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28020+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
28021 struct pt_regs *regs, long error_code)
28022 {
28023 if (v8086_mode(regs)) {
28024@@ -211,8 +211,20 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28025 if (!fixup_exception(regs)) {
28026 tsk->thread.error_code = error_code;
28027 tsk->thread.trap_nr = trapnr;
28028+
28029+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28030+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
28031+ str = "PAX: suspicious stack segment fault";
28032+#endif
28033+
28034 die(str, regs, error_code);
28035 }
28036+
28037+#ifdef CONFIG_PAX_REFCOUNT
28038+ if (trapnr == X86_TRAP_OF)
28039+ pax_report_refcount_overflow(regs);
28040+#endif
28041+
28042 return 0;
28043 }
28044
28045@@ -251,7 +263,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
28046 }
28047
28048 static void
28049-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28050+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
28051 long error_code, siginfo_t *info)
28052 {
28053 struct task_struct *tsk = current;
28054@@ -275,7 +287,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28055 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
28056 printk_ratelimit()) {
28057 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
28058- tsk->comm, tsk->pid, str,
28059+ tsk->comm, task_pid_nr(tsk), str,
28060 regs->ip, regs->sp, error_code);
28061 print_vma_addr(" in ", regs->ip);
28062 pr_cont("\n");
28063@@ -357,6 +369,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
28064 tsk->thread.error_code = error_code;
28065 tsk->thread.trap_nr = X86_TRAP_DF;
28066
28067+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28068+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28069+ die("grsec: kernel stack overflow detected", regs, error_code);
28070+#endif
28071+
28072 #ifdef CONFIG_DOUBLEFAULT
28073 df_debug(regs, error_code);
28074 #endif
28075@@ -475,11 +492,35 @@ do_general_protection(struct pt_regs *regs, long error_code)
28076 tsk->thread.error_code = error_code;
28077 tsk->thread.trap_nr = X86_TRAP_GP;
28078 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28079- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28080+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28081+
28082+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28083+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28084+ die("PAX: suspicious general protection fault", regs, error_code);
28085+ else
28086+#endif
28087+
28088 die("general protection fault", regs, error_code);
28089+ }
28090 goto exit;
28091 }
28092
28093+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28094+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28095+ struct mm_struct *mm = tsk->mm;
28096+ unsigned long limit;
28097+
28098+ down_write(&mm->mmap_sem);
28099+ limit = mm->context.user_cs_limit;
28100+ if (limit < TASK_SIZE) {
28101+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28102+ up_write(&mm->mmap_sem);
28103+ return;
28104+ }
28105+ up_write(&mm->mmap_sem);
28106+ }
28107+#endif
28108+
28109 tsk->thread.error_code = error_code;
28110 tsk->thread.trap_nr = X86_TRAP_GP;
28111
28112@@ -578,6 +619,9 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28113 container_of(task_pt_regs(current),
28114 struct bad_iret_stack, regs);
28115
28116+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28117+ new_stack = s;
28118+
28119 /* Copy the IRET target to the new stack. */
28120 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28121
28122diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28123index 5054497..139f8f8 100644
28124--- a/arch/x86/kernel/tsc.c
28125+++ b/arch/x86/kernel/tsc.c
28126@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28127 */
28128 smp_wmb();
28129
28130- ACCESS_ONCE(c2n->head) = data;
28131+ ACCESS_ONCE_RW(c2n->head) = data;
28132 }
28133
28134 /*
28135diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28136index 0b81ad6..fff670e 100644
28137--- a/arch/x86/kernel/uprobes.c
28138+++ b/arch/x86/kernel/uprobes.c
28139@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28140
28141 if (nleft != rasize) {
28142 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28143- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28144+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28145
28146 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28147 }
28148diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28149index b9242ba..50c5edd 100644
28150--- a/arch/x86/kernel/verify_cpu.S
28151+++ b/arch/x86/kernel/verify_cpu.S
28152@@ -20,6 +20,7 @@
28153 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28154 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28155 * arch/x86/kernel/head_32.S: processor startup
28156+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28157 *
28158 * verify_cpu, returns the status of longmode and SSE in register %eax.
28159 * 0: Success 1: Failure
28160diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28161index fc9db6e..2c5865d 100644
28162--- a/arch/x86/kernel/vm86_32.c
28163+++ b/arch/x86/kernel/vm86_32.c
28164@@ -44,6 +44,7 @@
28165 #include <linux/ptrace.h>
28166 #include <linux/audit.h>
28167 #include <linux/stddef.h>
28168+#include <linux/grsecurity.h>
28169
28170 #include <asm/uaccess.h>
28171 #include <asm/io.h>
28172@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28173 do_exit(SIGSEGV);
28174 }
28175
28176- tss = &per_cpu(cpu_tss, get_cpu());
28177+ tss = cpu_tss + get_cpu();
28178 current->thread.sp0 = current->thread.saved_sp0;
28179 current->thread.sysenter_cs = __KERNEL_CS;
28180 load_sp0(tss, &current->thread);
28181@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28182
28183 if (tsk->thread.saved_sp0)
28184 return -EPERM;
28185+
28186+#ifdef CONFIG_GRKERNSEC_VM86
28187+ if (!capable(CAP_SYS_RAWIO)) {
28188+ gr_handle_vm86();
28189+ return -EPERM;
28190+ }
28191+#endif
28192+
28193 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28194 offsetof(struct kernel_vm86_struct, vm86plus) -
28195 sizeof(info.regs));
28196@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28197 int tmp;
28198 struct vm86plus_struct __user *v86;
28199
28200+#ifdef CONFIG_GRKERNSEC_VM86
28201+ if (!capable(CAP_SYS_RAWIO)) {
28202+ gr_handle_vm86();
28203+ return -EPERM;
28204+ }
28205+#endif
28206+
28207 tsk = current;
28208 switch (cmd) {
28209 case VM86_REQUEST_IRQ:
28210@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28211 tsk->thread.saved_fs = info->regs32->fs;
28212 tsk->thread.saved_gs = get_user_gs(info->regs32);
28213
28214- tss = &per_cpu(cpu_tss, get_cpu());
28215+ tss = cpu_tss + get_cpu();
28216 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28217 if (cpu_has_sep)
28218 tsk->thread.sysenter_cs = 0;
28219@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28220 goto cannot_handle;
28221 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28222 goto cannot_handle;
28223- intr_ptr = (unsigned long __user *) (i << 2);
28224+ intr_ptr = (__force unsigned long __user *) (i << 2);
28225 if (get_user(segoffs, intr_ptr))
28226 goto cannot_handle;
28227 if ((segoffs >> 16) == BIOSSEG)
28228diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28229index 00bf300..129df8e 100644
28230--- a/arch/x86/kernel/vmlinux.lds.S
28231+++ b/arch/x86/kernel/vmlinux.lds.S
28232@@ -26,6 +26,13 @@
28233 #include <asm/page_types.h>
28234 #include <asm/cache.h>
28235 #include <asm/boot.h>
28236+#include <asm/segment.h>
28237+
28238+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28239+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28240+#else
28241+#define __KERNEL_TEXT_OFFSET 0
28242+#endif
28243
28244 #undef i386 /* in case the preprocessor is a 32bit one */
28245
28246@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28247
28248 PHDRS {
28249 text PT_LOAD FLAGS(5); /* R_E */
28250+#ifdef CONFIG_X86_32
28251+ module PT_LOAD FLAGS(5); /* R_E */
28252+#endif
28253+#ifdef CONFIG_XEN
28254+ rodata PT_LOAD FLAGS(5); /* R_E */
28255+#else
28256+ rodata PT_LOAD FLAGS(4); /* R__ */
28257+#endif
28258 data PT_LOAD FLAGS(6); /* RW_ */
28259-#ifdef CONFIG_X86_64
28260+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28261 #ifdef CONFIG_SMP
28262 percpu PT_LOAD FLAGS(6); /* RW_ */
28263 #endif
28264+ text.init PT_LOAD FLAGS(5); /* R_E */
28265+ text.exit PT_LOAD FLAGS(5); /* R_E */
28266 init PT_LOAD FLAGS(7); /* RWE */
28267-#endif
28268 note PT_NOTE FLAGS(0); /* ___ */
28269 }
28270
28271 SECTIONS
28272 {
28273 #ifdef CONFIG_X86_32
28274- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28275- phys_startup_32 = startup_32 - LOAD_OFFSET;
28276+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28277 #else
28278- . = __START_KERNEL;
28279- phys_startup_64 = startup_64 - LOAD_OFFSET;
28280+ . = __START_KERNEL;
28281 #endif
28282
28283 /* Text and read-only data */
28284- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28285- _text = .;
28286+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28287 /* bootstrapping code */
28288+#ifdef CONFIG_X86_32
28289+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28290+#else
28291+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28292+#endif
28293+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28294+ _text = .;
28295 HEAD_TEXT
28296 . = ALIGN(8);
28297 _stext = .;
28298@@ -104,13 +124,47 @@ SECTIONS
28299 IRQENTRY_TEXT
28300 *(.fixup)
28301 *(.gnu.warning)
28302- /* End of text section */
28303- _etext = .;
28304 } :text = 0x9090
28305
28306- NOTES :text :note
28307+ . += __KERNEL_TEXT_OFFSET;
28308
28309- EXCEPTION_TABLE(16) :text = 0x9090
28310+#ifdef CONFIG_X86_32
28311+ . = ALIGN(PAGE_SIZE);
28312+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28313+
28314+#ifdef CONFIG_PAX_KERNEXEC
28315+ MODULES_EXEC_VADDR = .;
28316+ BYTE(0)
28317+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28318+ . = ALIGN(HPAGE_SIZE) - 1;
28319+ MODULES_EXEC_END = .;
28320+#endif
28321+
28322+ } :module
28323+#endif
28324+
28325+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28326+ /* End of text section */
28327+ BYTE(0)
28328+ _etext = . - __KERNEL_TEXT_OFFSET;
28329+ }
28330+
28331+#ifdef CONFIG_X86_32
28332+ . = ALIGN(PAGE_SIZE);
28333+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28334+ . = ALIGN(PAGE_SIZE);
28335+ *(.empty_zero_page)
28336+ *(.initial_pg_fixmap)
28337+ *(.initial_pg_pmd)
28338+ *(.initial_page_table)
28339+ *(.swapper_pg_dir)
28340+ } :rodata
28341+#endif
28342+
28343+ . = ALIGN(PAGE_SIZE);
28344+ NOTES :rodata :note
28345+
28346+ EXCEPTION_TABLE(16) :rodata
28347
28348 #if defined(CONFIG_DEBUG_RODATA)
28349 /* .text should occupy whole number of pages */
28350@@ -122,16 +176,20 @@ SECTIONS
28351
28352 /* Data */
28353 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28354+
28355+#ifdef CONFIG_PAX_KERNEXEC
28356+ . = ALIGN(HPAGE_SIZE);
28357+#else
28358+ . = ALIGN(PAGE_SIZE);
28359+#endif
28360+
28361 /* Start of data section */
28362 _sdata = .;
28363
28364 /* init_task */
28365 INIT_TASK_DATA(THREAD_SIZE)
28366
28367-#ifdef CONFIG_X86_32
28368- /* 32 bit has nosave before _edata */
28369 NOSAVE_DATA
28370-#endif
28371
28372 PAGE_ALIGNED_DATA(PAGE_SIZE)
28373
28374@@ -174,12 +232,19 @@ SECTIONS
28375 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28376
28377 /* Init code and data - will be freed after init */
28378- . = ALIGN(PAGE_SIZE);
28379 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28380+ BYTE(0)
28381+
28382+#ifdef CONFIG_PAX_KERNEXEC
28383+ . = ALIGN(HPAGE_SIZE);
28384+#else
28385+ . = ALIGN(PAGE_SIZE);
28386+#endif
28387+
28388 __init_begin = .; /* paired with __init_end */
28389- }
28390+ } :init.begin
28391
28392-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28393+#ifdef CONFIG_SMP
28394 /*
28395 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28396 * output PHDR, so the next output section - .init.text - should
28397@@ -190,12 +255,27 @@ SECTIONS
28398 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28399 #endif
28400
28401- INIT_TEXT_SECTION(PAGE_SIZE)
28402-#ifdef CONFIG_X86_64
28403- :init
28404-#endif
28405+ . = ALIGN(PAGE_SIZE);
28406+ init_begin = .;
28407+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28408+ VMLINUX_SYMBOL(_sinittext) = .;
28409+ INIT_TEXT
28410+ . = ALIGN(PAGE_SIZE);
28411+ } :text.init
28412
28413- INIT_DATA_SECTION(16)
28414+ /*
28415+ * .exit.text is discard at runtime, not link time, to deal with
28416+ * references from .altinstructions and .eh_frame
28417+ */
28418+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28419+ EXIT_TEXT
28420+ VMLINUX_SYMBOL(_einittext) = .;
28421+ . = ALIGN(16);
28422+ } :text.exit
28423+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28424+
28425+ . = ALIGN(PAGE_SIZE);
28426+ INIT_DATA_SECTION(16) :init
28427
28428 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28429 __x86_cpu_dev_start = .;
28430@@ -266,19 +346,12 @@ SECTIONS
28431 }
28432
28433 . = ALIGN(8);
28434- /*
28435- * .exit.text is discard at runtime, not link time, to deal with
28436- * references from .altinstructions and .eh_frame
28437- */
28438- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28439- EXIT_TEXT
28440- }
28441
28442 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28443 EXIT_DATA
28444 }
28445
28446-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28447+#ifndef CONFIG_SMP
28448 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28449 #endif
28450
28451@@ -297,16 +370,10 @@ SECTIONS
28452 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28453 __smp_locks = .;
28454 *(.smp_locks)
28455- . = ALIGN(PAGE_SIZE);
28456 __smp_locks_end = .;
28457+ . = ALIGN(PAGE_SIZE);
28458 }
28459
28460-#ifdef CONFIG_X86_64
28461- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28462- NOSAVE_DATA
28463- }
28464-#endif
28465-
28466 /* BSS */
28467 . = ALIGN(PAGE_SIZE);
28468 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28469@@ -322,6 +389,7 @@ SECTIONS
28470 __brk_base = .;
28471 . += 64 * 1024; /* 64k alignment slop space */
28472 *(.brk_reservation) /* areas brk users have reserved */
28473+ . = ALIGN(HPAGE_SIZE);
28474 __brk_limit = .;
28475 }
28476
28477@@ -348,13 +416,12 @@ SECTIONS
28478 * for the boot processor.
28479 */
28480 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28481-INIT_PER_CPU(gdt_page);
28482 INIT_PER_CPU(irq_stack_union);
28483
28484 /*
28485 * Build-time check on the image size:
28486 */
28487-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28488+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28489 "kernel image bigger than KERNEL_IMAGE_SIZE");
28490
28491 #ifdef CONFIG_SMP
28492diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28493index 2dcc6ff..082dc7a 100644
28494--- a/arch/x86/kernel/vsyscall_64.c
28495+++ b/arch/x86/kernel/vsyscall_64.c
28496@@ -38,15 +38,13 @@
28497 #define CREATE_TRACE_POINTS
28498 #include "vsyscall_trace.h"
28499
28500-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28501+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28502
28503 static int __init vsyscall_setup(char *str)
28504 {
28505 if (str) {
28506 if (!strcmp("emulate", str))
28507 vsyscall_mode = EMULATE;
28508- else if (!strcmp("native", str))
28509- vsyscall_mode = NATIVE;
28510 else if (!strcmp("none", str))
28511 vsyscall_mode = NONE;
28512 else
28513@@ -264,8 +262,7 @@ do_ret:
28514 return true;
28515
28516 sigsegv:
28517- force_sig(SIGSEGV, current);
28518- return true;
28519+ do_group_exit(SIGKILL);
28520 }
28521
28522 /*
28523@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28524 static struct vm_area_struct gate_vma = {
28525 .vm_start = VSYSCALL_ADDR,
28526 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28527- .vm_page_prot = PAGE_READONLY_EXEC,
28528- .vm_flags = VM_READ | VM_EXEC,
28529+ .vm_page_prot = PAGE_READONLY,
28530+ .vm_flags = VM_READ,
28531 .vm_ops = &gate_vma_ops,
28532 };
28533
28534@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28535 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28536
28537 if (vsyscall_mode != NONE)
28538- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28539- vsyscall_mode == NATIVE
28540- ? PAGE_KERNEL_VSYSCALL
28541- : PAGE_KERNEL_VVAR);
28542+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28543
28544 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28545 (unsigned long)VSYSCALL_ADDR);
28546diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28547index 37d8fa4..66e319a 100644
28548--- a/arch/x86/kernel/x8664_ksyms_64.c
28549+++ b/arch/x86/kernel/x8664_ksyms_64.c
28550@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28551 EXPORT_SYMBOL(copy_user_generic_unrolled);
28552 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28553 EXPORT_SYMBOL(__copy_user_nocache);
28554-EXPORT_SYMBOL(_copy_from_user);
28555-EXPORT_SYMBOL(_copy_to_user);
28556
28557 EXPORT_SYMBOL(copy_page);
28558 EXPORT_SYMBOL(clear_page);
28559@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28560 EXPORT_SYMBOL(___preempt_schedule_context);
28561 #endif
28562 #endif
28563+
28564+#ifdef CONFIG_PAX_PER_CPU_PGD
28565+EXPORT_SYMBOL(cpu_pgd);
28566+#endif
28567diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28568index 234b072..b7ab191 100644
28569--- a/arch/x86/kernel/x86_init.c
28570+++ b/arch/x86/kernel/x86_init.c
28571@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28572 static void default_nmi_init(void) { };
28573 static int default_i8042_detect(void) { return 1; };
28574
28575-struct x86_platform_ops x86_platform = {
28576+struct x86_platform_ops x86_platform __read_only = {
28577 .calibrate_tsc = native_calibrate_tsc,
28578 .get_wallclock = mach_get_cmos_time,
28579 .set_wallclock = mach_set_rtc_mmss,
28580@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28581 EXPORT_SYMBOL_GPL(x86_platform);
28582
28583 #if defined(CONFIG_PCI_MSI)
28584-struct x86_msi_ops x86_msi = {
28585+struct x86_msi_ops x86_msi __read_only = {
28586 .setup_msi_irqs = native_setup_msi_irqs,
28587 .compose_msi_msg = native_compose_msi_msg,
28588 .teardown_msi_irq = native_teardown_msi_irq,
28589@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28590 }
28591 #endif
28592
28593-struct x86_io_apic_ops x86_io_apic_ops = {
28594+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28595 .init = native_io_apic_init_mappings,
28596 .read = native_io_apic_read,
28597 .write = native_io_apic_write,
28598diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28599index 87a815b..727dbe6 100644
28600--- a/arch/x86/kernel/xsave.c
28601+++ b/arch/x86/kernel/xsave.c
28602@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28603
28604 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28605 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28606- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28607+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28608
28609 if (!use_xsave())
28610 return err;
28611
28612- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28613+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28614
28615 /*
28616 * Read the xstate_bv which we copied (directly from the cpu or
28617 * from the state in task struct) to the user buffers.
28618 */
28619- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28620+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28621
28622 /*
28623 * For legacy compatible, we always set FP/SSE bits in the bit
28624@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28625 */
28626 xstate_bv |= XSTATE_FPSSE;
28627
28628- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28629+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28630
28631 return err;
28632 }
28633@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28634 {
28635 int err;
28636
28637+ buf = (struct xsave_struct __user *)____m(buf);
28638 if (use_xsave())
28639 err = xsave_user(buf);
28640 else if (use_fxsr())
28641@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28642 */
28643 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28644 {
28645+ buf = (void __user *)____m(buf);
28646 if (use_xsave()) {
28647 if ((unsigned long)buf % 64 || fx_only) {
28648 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28649diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28650index 1d08ad3..c6a4faf 100644
28651--- a/arch/x86/kvm/cpuid.c
28652+++ b/arch/x86/kvm/cpuid.c
28653@@ -204,15 +204,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28654 struct kvm_cpuid2 *cpuid,
28655 struct kvm_cpuid_entry2 __user *entries)
28656 {
28657- int r;
28658+ int r, i;
28659
28660 r = -E2BIG;
28661 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28662 goto out;
28663 r = -EFAULT;
28664- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28665- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28666+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28667 goto out;
28668+ for (i = 0; i < cpuid->nent; ++i) {
28669+ struct kvm_cpuid_entry2 cpuid_entry;
28670+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28671+ goto out;
28672+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28673+ }
28674 vcpu->arch.cpuid_nent = cpuid->nent;
28675 kvm_apic_set_version(vcpu);
28676 kvm_x86_ops->cpuid_update(vcpu);
28677@@ -225,15 +230,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28678 struct kvm_cpuid2 *cpuid,
28679 struct kvm_cpuid_entry2 __user *entries)
28680 {
28681- int r;
28682+ int r, i;
28683
28684 r = -E2BIG;
28685 if (cpuid->nent < vcpu->arch.cpuid_nent)
28686 goto out;
28687 r = -EFAULT;
28688- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28689- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28690+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28691 goto out;
28692+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28693+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28694+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28695+ goto out;
28696+ }
28697 return 0;
28698
28699 out:
28700diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28701index 630bcb0..a7f6d9e 100644
28702--- a/arch/x86/kvm/emulate.c
28703+++ b/arch/x86/kvm/emulate.c
28704@@ -3569,7 +3569,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28705 int cr = ctxt->modrm_reg;
28706 u64 efer = 0;
28707
28708- static u64 cr_reserved_bits[] = {
28709+ static const u64 cr_reserved_bits[] = {
28710 0xffffffff00000000ULL,
28711 0, 0, 0, /* CR3 checked later */
28712 CR4_RESERVED_BITS,
28713diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28714index 67d07e0..10769d5 100644
28715--- a/arch/x86/kvm/lapic.c
28716+++ b/arch/x86/kvm/lapic.c
28717@@ -56,7 +56,7 @@
28718 #define APIC_BUS_CYCLE_NS 1
28719
28720 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28721-#define apic_debug(fmt, arg...)
28722+#define apic_debug(fmt, arg...) do {} while (0)
28723
28724 #define APIC_LVT_NUM 6
28725 /* 14 is the version for Xeon and Pentium 8.4.8*/
28726diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28727index 6e6d115..43fecbf 100644
28728--- a/arch/x86/kvm/paging_tmpl.h
28729+++ b/arch/x86/kvm/paging_tmpl.h
28730@@ -343,7 +343,7 @@ retry_walk:
28731 if (unlikely(kvm_is_error_hva(host_addr)))
28732 goto error;
28733
28734- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28735+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28736 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28737 goto error;
28738 walker->ptep_user[walker->level - 1] = ptep_user;
28739diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28740index 4911bf1..e7d3ed2 100644
28741--- a/arch/x86/kvm/svm.c
28742+++ b/arch/x86/kvm/svm.c
28743@@ -3577,7 +3577,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28744 int cpu = raw_smp_processor_id();
28745
28746 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28747+
28748+ pax_open_kernel();
28749 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28750+ pax_close_kernel();
28751+
28752 load_TR_desc();
28753 }
28754
28755@@ -3973,6 +3977,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28756 #endif
28757 #endif
28758
28759+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28760+ __set_fs(current_thread_info()->addr_limit);
28761+#endif
28762+
28763 reload_tss(vcpu);
28764
28765 local_irq_disable();
28766diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28767index 2d73807..84a0e59 100644
28768--- a/arch/x86/kvm/vmx.c
28769+++ b/arch/x86/kvm/vmx.c
28770@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28771 #endif
28772 }
28773
28774-static void vmcs_clear_bits(unsigned long field, u32 mask)
28775+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28776 {
28777 vmcs_writel(field, vmcs_readl(field) & ~mask);
28778 }
28779
28780-static void vmcs_set_bits(unsigned long field, u32 mask)
28781+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28782 {
28783 vmcs_writel(field, vmcs_readl(field) | mask);
28784 }
28785@@ -1705,7 +1705,11 @@ static void reload_tss(void)
28786 struct desc_struct *descs;
28787
28788 descs = (void *)gdt->address;
28789+
28790+ pax_open_kernel();
28791 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28792+ pax_close_kernel();
28793+
28794 load_TR_desc();
28795 }
28796
28797@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28798 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28799 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28800
28801+#ifdef CONFIG_PAX_PER_CPU_PGD
28802+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28803+#endif
28804+
28805 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28806 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28807 vmx->loaded_vmcs->cpu = cpu;
28808@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28809 * reads and returns guest's timestamp counter "register"
28810 * guest_tsc = host_tsc + tsc_offset -- 21.3
28811 */
28812-static u64 guest_read_tsc(void)
28813+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28814 {
28815 u64 host_tsc, tsc_offset;
28816
28817@@ -4467,7 +4475,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28818 unsigned long cr4;
28819
28820 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28821+
28822+#ifndef CONFIG_PAX_PER_CPU_PGD
28823 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28824+#endif
28825
28826 /* Save the most likely value for this task's CR4 in the VMCS. */
28827 cr4 = cr4_read_shadow();
28828@@ -4494,7 +4505,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28829 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28830 vmx->host_idt_base = dt.address;
28831
28832- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28833+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28834
28835 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28836 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28837@@ -6107,11 +6118,17 @@ static __init int hardware_setup(void)
28838 * page upon invalidation. No need to do anything if not
28839 * using the APIC_ACCESS_ADDR VMCS field.
28840 */
28841- if (!flexpriority_enabled)
28842- kvm_x86_ops->set_apic_access_page_addr = NULL;
28843+ if (!flexpriority_enabled) {
28844+ pax_open_kernel();
28845+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28846+ pax_close_kernel();
28847+ }
28848
28849- if (!cpu_has_vmx_tpr_shadow())
28850- kvm_x86_ops->update_cr8_intercept = NULL;
28851+ if (!cpu_has_vmx_tpr_shadow()) {
28852+ pax_open_kernel();
28853+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28854+ pax_close_kernel();
28855+ }
28856
28857 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28858 kvm_disable_largepages();
28859@@ -6122,14 +6139,16 @@ static __init int hardware_setup(void)
28860 if (!cpu_has_vmx_apicv())
28861 enable_apicv = 0;
28862
28863+ pax_open_kernel();
28864 if (enable_apicv)
28865- kvm_x86_ops->update_cr8_intercept = NULL;
28866+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28867 else {
28868- kvm_x86_ops->hwapic_irr_update = NULL;
28869- kvm_x86_ops->hwapic_isr_update = NULL;
28870- kvm_x86_ops->deliver_posted_interrupt = NULL;
28871- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28872+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28873+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
28874+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28875+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28876 }
28877+ pax_close_kernel();
28878
28879 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
28880 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
28881@@ -6182,10 +6201,12 @@ static __init int hardware_setup(void)
28882 enable_pml = 0;
28883
28884 if (!enable_pml) {
28885- kvm_x86_ops->slot_enable_log_dirty = NULL;
28886- kvm_x86_ops->slot_disable_log_dirty = NULL;
28887- kvm_x86_ops->flush_log_dirty = NULL;
28888- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28889+ pax_open_kernel();
28890+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
28891+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
28892+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
28893+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28894+ pax_close_kernel();
28895 }
28896
28897 return alloc_kvm_area();
28898@@ -8230,6 +8251,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28899 "jmp 2f \n\t"
28900 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28901 "2: "
28902+
28903+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28904+ "ljmp %[cs],$3f\n\t"
28905+ "3: "
28906+#endif
28907+
28908 /* Save guest registers, load host registers, keep flags */
28909 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28910 "pop %0 \n\t"
28911@@ -8282,6 +8309,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28912 #endif
28913 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28914 [wordsize]"i"(sizeof(ulong))
28915+
28916+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28917+ ,[cs]"i"(__KERNEL_CS)
28918+#endif
28919+
28920 : "cc", "memory"
28921 #ifdef CONFIG_X86_64
28922 , "rax", "rbx", "rdi", "rsi"
28923@@ -8295,7 +8327,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28924 if (debugctlmsr)
28925 update_debugctlmsr(debugctlmsr);
28926
28927-#ifndef CONFIG_X86_64
28928+#ifdef CONFIG_X86_32
28929 /*
28930 * The sysexit path does not restore ds/es, so we must set them to
28931 * a reasonable value ourselves.
28932@@ -8304,8 +8336,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28933 * may be executed in interrupt context, which saves and restore segments
28934 * around it, nullifying its effect.
28935 */
28936- loadsegment(ds, __USER_DS);
28937- loadsegment(es, __USER_DS);
28938+ loadsegment(ds, __KERNEL_DS);
28939+ loadsegment(es, __KERNEL_DS);
28940+ loadsegment(ss, __KERNEL_DS);
28941+
28942+#ifdef CONFIG_PAX_KERNEXEC
28943+ loadsegment(fs, __KERNEL_PERCPU);
28944+#endif
28945+
28946+#ifdef CONFIG_PAX_MEMORY_UDEREF
28947+ __set_fs(current_thread_info()->addr_limit);
28948+#endif
28949+
28950 #endif
28951
28952 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28953diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28954index ea306ad..669f42d 100644
28955--- a/arch/x86/kvm/x86.c
28956+++ b/arch/x86/kvm/x86.c
28957@@ -1929,8 +1929,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28958 {
28959 struct kvm *kvm = vcpu->kvm;
28960 int lm = is_long_mode(vcpu);
28961- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28962- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28963+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28964+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28965 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28966 : kvm->arch.xen_hvm_config.blob_size_32;
28967 u32 page_num = data & ~PAGE_MASK;
28968@@ -2867,6 +2867,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28969 if (n < msr_list.nmsrs)
28970 goto out;
28971 r = -EFAULT;
28972+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28973+ goto out;
28974 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28975 num_msrs_to_save * sizeof(u32)))
28976 goto out;
28977@@ -5784,7 +5786,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28978 };
28979 #endif
28980
28981-int kvm_arch_init(void *opaque)
28982+int kvm_arch_init(const void *opaque)
28983 {
28984 int r;
28985 struct kvm_x86_ops *ops = opaque;
28986diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28987index 8f9a133..3c7694b 100644
28988--- a/arch/x86/lguest/boot.c
28989+++ b/arch/x86/lguest/boot.c
28990@@ -1341,9 +1341,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28991 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28992 * Launcher to reboot us.
28993 */
28994-static void lguest_restart(char *reason)
28995+static __noreturn void lguest_restart(char *reason)
28996 {
28997 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28998+ BUG();
28999 }
29000
29001 /*G:050
29002diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29003index 00933d5..3a64af9 100644
29004--- a/arch/x86/lib/atomic64_386_32.S
29005+++ b/arch/x86/lib/atomic64_386_32.S
29006@@ -48,6 +48,10 @@ BEGIN(read)
29007 movl (v), %eax
29008 movl 4(v), %edx
29009 RET_ENDP
29010+BEGIN(read_unchecked)
29011+ movl (v), %eax
29012+ movl 4(v), %edx
29013+RET_ENDP
29014 #undef v
29015
29016 #define v %esi
29017@@ -55,6 +59,10 @@ BEGIN(set)
29018 movl %ebx, (v)
29019 movl %ecx, 4(v)
29020 RET_ENDP
29021+BEGIN(set_unchecked)
29022+ movl %ebx, (v)
29023+ movl %ecx, 4(v)
29024+RET_ENDP
29025 #undef v
29026
29027 #define v %esi
29028@@ -70,6 +78,20 @@ RET_ENDP
29029 BEGIN(add)
29030 addl %eax, (v)
29031 adcl %edx, 4(v)
29032+
29033+#ifdef CONFIG_PAX_REFCOUNT
29034+ jno 0f
29035+ subl %eax, (v)
29036+ sbbl %edx, 4(v)
29037+ int $4
29038+0:
29039+ _ASM_EXTABLE(0b, 0b)
29040+#endif
29041+
29042+RET_ENDP
29043+BEGIN(add_unchecked)
29044+ addl %eax, (v)
29045+ adcl %edx, 4(v)
29046 RET_ENDP
29047 #undef v
29048
29049@@ -77,6 +99,24 @@ RET_ENDP
29050 BEGIN(add_return)
29051 addl (v), %eax
29052 adcl 4(v), %edx
29053+
29054+#ifdef CONFIG_PAX_REFCOUNT
29055+ into
29056+1234:
29057+ _ASM_EXTABLE(1234b, 2f)
29058+#endif
29059+
29060+ movl %eax, (v)
29061+ movl %edx, 4(v)
29062+
29063+#ifdef CONFIG_PAX_REFCOUNT
29064+2:
29065+#endif
29066+
29067+RET_ENDP
29068+BEGIN(add_return_unchecked)
29069+ addl (v), %eax
29070+ adcl 4(v), %edx
29071 movl %eax, (v)
29072 movl %edx, 4(v)
29073 RET_ENDP
29074@@ -86,6 +126,20 @@ RET_ENDP
29075 BEGIN(sub)
29076 subl %eax, (v)
29077 sbbl %edx, 4(v)
29078+
29079+#ifdef CONFIG_PAX_REFCOUNT
29080+ jno 0f
29081+ addl %eax, (v)
29082+ adcl %edx, 4(v)
29083+ int $4
29084+0:
29085+ _ASM_EXTABLE(0b, 0b)
29086+#endif
29087+
29088+RET_ENDP
29089+BEGIN(sub_unchecked)
29090+ subl %eax, (v)
29091+ sbbl %edx, 4(v)
29092 RET_ENDP
29093 #undef v
29094
29095@@ -96,6 +150,27 @@ BEGIN(sub_return)
29096 sbbl $0, %edx
29097 addl (v), %eax
29098 adcl 4(v), %edx
29099+
29100+#ifdef CONFIG_PAX_REFCOUNT
29101+ into
29102+1234:
29103+ _ASM_EXTABLE(1234b, 2f)
29104+#endif
29105+
29106+ movl %eax, (v)
29107+ movl %edx, 4(v)
29108+
29109+#ifdef CONFIG_PAX_REFCOUNT
29110+2:
29111+#endif
29112+
29113+RET_ENDP
29114+BEGIN(sub_return_unchecked)
29115+ negl %edx
29116+ negl %eax
29117+ sbbl $0, %edx
29118+ addl (v), %eax
29119+ adcl 4(v), %edx
29120 movl %eax, (v)
29121 movl %edx, 4(v)
29122 RET_ENDP
29123@@ -105,6 +180,20 @@ RET_ENDP
29124 BEGIN(inc)
29125 addl $1, (v)
29126 adcl $0, 4(v)
29127+
29128+#ifdef CONFIG_PAX_REFCOUNT
29129+ jno 0f
29130+ subl $1, (v)
29131+ sbbl $0, 4(v)
29132+ int $4
29133+0:
29134+ _ASM_EXTABLE(0b, 0b)
29135+#endif
29136+
29137+RET_ENDP
29138+BEGIN(inc_unchecked)
29139+ addl $1, (v)
29140+ adcl $0, 4(v)
29141 RET_ENDP
29142 #undef v
29143
29144@@ -114,6 +203,26 @@ BEGIN(inc_return)
29145 movl 4(v), %edx
29146 addl $1, %eax
29147 adcl $0, %edx
29148+
29149+#ifdef CONFIG_PAX_REFCOUNT
29150+ into
29151+1234:
29152+ _ASM_EXTABLE(1234b, 2f)
29153+#endif
29154+
29155+ movl %eax, (v)
29156+ movl %edx, 4(v)
29157+
29158+#ifdef CONFIG_PAX_REFCOUNT
29159+2:
29160+#endif
29161+
29162+RET_ENDP
29163+BEGIN(inc_return_unchecked)
29164+ movl (v), %eax
29165+ movl 4(v), %edx
29166+ addl $1, %eax
29167+ adcl $0, %edx
29168 movl %eax, (v)
29169 movl %edx, 4(v)
29170 RET_ENDP
29171@@ -123,6 +232,20 @@ RET_ENDP
29172 BEGIN(dec)
29173 subl $1, (v)
29174 sbbl $0, 4(v)
29175+
29176+#ifdef CONFIG_PAX_REFCOUNT
29177+ jno 0f
29178+ addl $1, (v)
29179+ adcl $0, 4(v)
29180+ int $4
29181+0:
29182+ _ASM_EXTABLE(0b, 0b)
29183+#endif
29184+
29185+RET_ENDP
29186+BEGIN(dec_unchecked)
29187+ subl $1, (v)
29188+ sbbl $0, 4(v)
29189 RET_ENDP
29190 #undef v
29191
29192@@ -132,6 +255,26 @@ BEGIN(dec_return)
29193 movl 4(v), %edx
29194 subl $1, %eax
29195 sbbl $0, %edx
29196+
29197+#ifdef CONFIG_PAX_REFCOUNT
29198+ into
29199+1234:
29200+ _ASM_EXTABLE(1234b, 2f)
29201+#endif
29202+
29203+ movl %eax, (v)
29204+ movl %edx, 4(v)
29205+
29206+#ifdef CONFIG_PAX_REFCOUNT
29207+2:
29208+#endif
29209+
29210+RET_ENDP
29211+BEGIN(dec_return_unchecked)
29212+ movl (v), %eax
29213+ movl 4(v), %edx
29214+ subl $1, %eax
29215+ sbbl $0, %edx
29216 movl %eax, (v)
29217 movl %edx, 4(v)
29218 RET_ENDP
29219@@ -143,6 +286,13 @@ BEGIN(add_unless)
29220 adcl %edx, %edi
29221 addl (v), %eax
29222 adcl 4(v), %edx
29223+
29224+#ifdef CONFIG_PAX_REFCOUNT
29225+ into
29226+1234:
29227+ _ASM_EXTABLE(1234b, 2f)
29228+#endif
29229+
29230 cmpl %eax, %ecx
29231 je 3f
29232 1:
29233@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29234 1:
29235 addl $1, %eax
29236 adcl $0, %edx
29237+
29238+#ifdef CONFIG_PAX_REFCOUNT
29239+ into
29240+1234:
29241+ _ASM_EXTABLE(1234b, 2f)
29242+#endif
29243+
29244 movl %eax, (v)
29245 movl %edx, 4(v)
29246 movl $1, %eax
29247@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29248 movl 4(v), %edx
29249 subl $1, %eax
29250 sbbl $0, %edx
29251+
29252+#ifdef CONFIG_PAX_REFCOUNT
29253+ into
29254+1234:
29255+ _ASM_EXTABLE(1234b, 1f)
29256+#endif
29257+
29258 js 1f
29259 movl %eax, (v)
29260 movl %edx, 4(v)
29261diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29262index 082a851..6a963bc 100644
29263--- a/arch/x86/lib/atomic64_cx8_32.S
29264+++ b/arch/x86/lib/atomic64_cx8_32.S
29265@@ -25,10 +25,20 @@ ENTRY(atomic64_read_cx8)
29266 CFI_STARTPROC
29267
29268 read64 %ecx
29269+ pax_force_retaddr
29270 ret
29271 CFI_ENDPROC
29272 ENDPROC(atomic64_read_cx8)
29273
29274+ENTRY(atomic64_read_unchecked_cx8)
29275+ CFI_STARTPROC
29276+
29277+ read64 %ecx
29278+ pax_force_retaddr
29279+ ret
29280+ CFI_ENDPROC
29281+ENDPROC(atomic64_read_unchecked_cx8)
29282+
29283 ENTRY(atomic64_set_cx8)
29284 CFI_STARTPROC
29285
29286@@ -38,10 +48,25 @@ ENTRY(atomic64_set_cx8)
29287 cmpxchg8b (%esi)
29288 jne 1b
29289
29290+ pax_force_retaddr
29291 ret
29292 CFI_ENDPROC
29293 ENDPROC(atomic64_set_cx8)
29294
29295+ENTRY(atomic64_set_unchecked_cx8)
29296+ CFI_STARTPROC
29297+
29298+1:
29299+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29300+ * are atomic on 586 and newer */
29301+ cmpxchg8b (%esi)
29302+ jne 1b
29303+
29304+ pax_force_retaddr
29305+ ret
29306+ CFI_ENDPROC
29307+ENDPROC(atomic64_set_unchecked_cx8)
29308+
29309 ENTRY(atomic64_xchg_cx8)
29310 CFI_STARTPROC
29311
29312@@ -50,12 +75,13 @@ ENTRY(atomic64_xchg_cx8)
29313 cmpxchg8b (%esi)
29314 jne 1b
29315
29316+ pax_force_retaddr
29317 ret
29318 CFI_ENDPROC
29319 ENDPROC(atomic64_xchg_cx8)
29320
29321-.macro addsub_return func ins insc
29322-ENTRY(atomic64_\func\()_return_cx8)
29323+.macro addsub_return func ins insc unchecked=""
29324+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29325 CFI_STARTPROC
29326 pushl_cfi_reg ebp
29327 pushl_cfi_reg ebx
29328@@ -72,27 +98,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29329 movl %edx, %ecx
29330 \ins\()l %esi, %ebx
29331 \insc\()l %edi, %ecx
29332+
29333+.ifb \unchecked
29334+#ifdef CONFIG_PAX_REFCOUNT
29335+ into
29336+2:
29337+ _ASM_EXTABLE(2b, 3f)
29338+#endif
29339+.endif
29340+
29341 LOCK_PREFIX
29342 cmpxchg8b (%ebp)
29343 jne 1b
29344-
29345-10:
29346 movl %ebx, %eax
29347 movl %ecx, %edx
29348+
29349+.ifb \unchecked
29350+#ifdef CONFIG_PAX_REFCOUNT
29351+3:
29352+#endif
29353+.endif
29354+
29355 popl_cfi_reg edi
29356 popl_cfi_reg esi
29357 popl_cfi_reg ebx
29358 popl_cfi_reg ebp
29359+ pax_force_retaddr
29360 ret
29361 CFI_ENDPROC
29362-ENDPROC(atomic64_\func\()_return_cx8)
29363+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29364 .endm
29365
29366 addsub_return add add adc
29367 addsub_return sub sub sbb
29368+addsub_return add add adc _unchecked
29369+addsub_return sub sub sbb _unchecked
29370
29371-.macro incdec_return func ins insc
29372-ENTRY(atomic64_\func\()_return_cx8)
29373+.macro incdec_return func ins insc unchecked=""
29374+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29375 CFI_STARTPROC
29376 pushl_cfi_reg ebx
29377
29378@@ -102,21 +145,38 @@ ENTRY(atomic64_\func\()_return_cx8)
29379 movl %edx, %ecx
29380 \ins\()l $1, %ebx
29381 \insc\()l $0, %ecx
29382+
29383+.ifb \unchecked
29384+#ifdef CONFIG_PAX_REFCOUNT
29385+ into
29386+2:
29387+ _ASM_EXTABLE(2b, 3f)
29388+#endif
29389+.endif
29390+
29391 LOCK_PREFIX
29392 cmpxchg8b (%esi)
29393 jne 1b
29394-
29395-10:
29396 movl %ebx, %eax
29397 movl %ecx, %edx
29398+
29399+.ifb \unchecked
29400+#ifdef CONFIG_PAX_REFCOUNT
29401+3:
29402+#endif
29403+.endif
29404+
29405 popl_cfi_reg ebx
29406+ pax_force_retaddr
29407 ret
29408 CFI_ENDPROC
29409-ENDPROC(atomic64_\func\()_return_cx8)
29410+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29411 .endm
29412
29413 incdec_return inc add adc
29414 incdec_return dec sub sbb
29415+incdec_return inc add adc _unchecked
29416+incdec_return dec sub sbb _unchecked
29417
29418 ENTRY(atomic64_dec_if_positive_cx8)
29419 CFI_STARTPROC
29420@@ -128,6 +188,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29421 movl %edx, %ecx
29422 subl $1, %ebx
29423 sbb $0, %ecx
29424+
29425+#ifdef CONFIG_PAX_REFCOUNT
29426+ into
29427+1234:
29428+ _ASM_EXTABLE(1234b, 2f)
29429+#endif
29430+
29431 js 2f
29432 LOCK_PREFIX
29433 cmpxchg8b (%esi)
29434@@ -137,6 +204,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29435 movl %ebx, %eax
29436 movl %ecx, %edx
29437 popl_cfi_reg ebx
29438+ pax_force_retaddr
29439 ret
29440 CFI_ENDPROC
29441 ENDPROC(atomic64_dec_if_positive_cx8)
29442@@ -161,6 +229,13 @@ ENTRY(atomic64_add_unless_cx8)
29443 movl %edx, %ecx
29444 addl %ebp, %ebx
29445 adcl %edi, %ecx
29446+
29447+#ifdef CONFIG_PAX_REFCOUNT
29448+ into
29449+1234:
29450+ _ASM_EXTABLE(1234b, 3f)
29451+#endif
29452+
29453 LOCK_PREFIX
29454 cmpxchg8b (%esi)
29455 jne 1b
29456@@ -171,6 +246,7 @@ ENTRY(atomic64_add_unless_cx8)
29457 CFI_ADJUST_CFA_OFFSET -8
29458 popl_cfi_reg ebx
29459 popl_cfi_reg ebp
29460+ pax_force_retaddr
29461 ret
29462 4:
29463 cmpl %edx, 4(%esp)
29464@@ -193,6 +269,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29465 xorl %ecx, %ecx
29466 addl $1, %ebx
29467 adcl %edx, %ecx
29468+
29469+#ifdef CONFIG_PAX_REFCOUNT
29470+ into
29471+1234:
29472+ _ASM_EXTABLE(1234b, 3f)
29473+#endif
29474+
29475 LOCK_PREFIX
29476 cmpxchg8b (%esi)
29477 jne 1b
29478@@ -200,6 +283,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29479 movl $1, %eax
29480 3:
29481 popl_cfi_reg ebx
29482+ pax_force_retaddr
29483 ret
29484 CFI_ENDPROC
29485 ENDPROC(atomic64_inc_not_zero_cx8)
29486diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29487index 9bc944a..e52be6c 100644
29488--- a/arch/x86/lib/checksum_32.S
29489+++ b/arch/x86/lib/checksum_32.S
29490@@ -29,7 +29,8 @@
29491 #include <asm/dwarf2.h>
29492 #include <asm/errno.h>
29493 #include <asm/asm.h>
29494-
29495+#include <asm/segment.h>
29496+
29497 /*
29498 * computes a partial checksum, e.g. for TCP/UDP fragments
29499 */
29500@@ -285,9 +286,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29501
29502 #define ARGBASE 16
29503 #define FP 12
29504-
29505-ENTRY(csum_partial_copy_generic)
29506+
29507+ENTRY(csum_partial_copy_generic_to_user)
29508 CFI_STARTPROC
29509+
29510+#ifdef CONFIG_PAX_MEMORY_UDEREF
29511+ pushl_cfi %gs
29512+ popl_cfi %es
29513+ jmp csum_partial_copy_generic
29514+#endif
29515+
29516+ENTRY(csum_partial_copy_generic_from_user)
29517+
29518+#ifdef CONFIG_PAX_MEMORY_UDEREF
29519+ pushl_cfi %gs
29520+ popl_cfi %ds
29521+#endif
29522+
29523+ENTRY(csum_partial_copy_generic)
29524 subl $4,%esp
29525 CFI_ADJUST_CFA_OFFSET 4
29526 pushl_cfi_reg edi
29527@@ -306,7 +322,7 @@ ENTRY(csum_partial_copy_generic)
29528 jmp 4f
29529 SRC(1: movw (%esi), %bx )
29530 addl $2, %esi
29531-DST( movw %bx, (%edi) )
29532+DST( movw %bx, %es:(%edi) )
29533 addl $2, %edi
29534 addw %bx, %ax
29535 adcl $0, %eax
29536@@ -318,30 +334,30 @@ DST( movw %bx, (%edi) )
29537 SRC(1: movl (%esi), %ebx )
29538 SRC( movl 4(%esi), %edx )
29539 adcl %ebx, %eax
29540-DST( movl %ebx, (%edi) )
29541+DST( movl %ebx, %es:(%edi) )
29542 adcl %edx, %eax
29543-DST( movl %edx, 4(%edi) )
29544+DST( movl %edx, %es:4(%edi) )
29545
29546 SRC( movl 8(%esi), %ebx )
29547 SRC( movl 12(%esi), %edx )
29548 adcl %ebx, %eax
29549-DST( movl %ebx, 8(%edi) )
29550+DST( movl %ebx, %es:8(%edi) )
29551 adcl %edx, %eax
29552-DST( movl %edx, 12(%edi) )
29553+DST( movl %edx, %es:12(%edi) )
29554
29555 SRC( movl 16(%esi), %ebx )
29556 SRC( movl 20(%esi), %edx )
29557 adcl %ebx, %eax
29558-DST( movl %ebx, 16(%edi) )
29559+DST( movl %ebx, %es:16(%edi) )
29560 adcl %edx, %eax
29561-DST( movl %edx, 20(%edi) )
29562+DST( movl %edx, %es:20(%edi) )
29563
29564 SRC( movl 24(%esi), %ebx )
29565 SRC( movl 28(%esi), %edx )
29566 adcl %ebx, %eax
29567-DST( movl %ebx, 24(%edi) )
29568+DST( movl %ebx, %es:24(%edi) )
29569 adcl %edx, %eax
29570-DST( movl %edx, 28(%edi) )
29571+DST( movl %edx, %es:28(%edi) )
29572
29573 lea 32(%esi), %esi
29574 lea 32(%edi), %edi
29575@@ -355,7 +371,7 @@ DST( movl %edx, 28(%edi) )
29576 shrl $2, %edx # This clears CF
29577 SRC(3: movl (%esi), %ebx )
29578 adcl %ebx, %eax
29579-DST( movl %ebx, (%edi) )
29580+DST( movl %ebx, %es:(%edi) )
29581 lea 4(%esi), %esi
29582 lea 4(%edi), %edi
29583 dec %edx
29584@@ -367,12 +383,12 @@ DST( movl %ebx, (%edi) )
29585 jb 5f
29586 SRC( movw (%esi), %cx )
29587 leal 2(%esi), %esi
29588-DST( movw %cx, (%edi) )
29589+DST( movw %cx, %es:(%edi) )
29590 leal 2(%edi), %edi
29591 je 6f
29592 shll $16,%ecx
29593 SRC(5: movb (%esi), %cl )
29594-DST( movb %cl, (%edi) )
29595+DST( movb %cl, %es:(%edi) )
29596 6: addl %ecx, %eax
29597 adcl $0, %eax
29598 7:
29599@@ -383,7 +399,7 @@ DST( movb %cl, (%edi) )
29600
29601 6001:
29602 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29603- movl $-EFAULT, (%ebx)
29604+ movl $-EFAULT, %ss:(%ebx)
29605
29606 # zero the complete destination - computing the rest
29607 # is too much work
29608@@ -396,37 +412,58 @@ DST( movb %cl, (%edi) )
29609
29610 6002:
29611 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29612- movl $-EFAULT,(%ebx)
29613+ movl $-EFAULT,%ss:(%ebx)
29614 jmp 5000b
29615
29616 .previous
29617
29618+ pushl_cfi %ss
29619+ popl_cfi %ds
29620+ pushl_cfi %ss
29621+ popl_cfi %es
29622 popl_cfi_reg ebx
29623 popl_cfi_reg esi
29624 popl_cfi_reg edi
29625 popl_cfi %ecx # equivalent to addl $4,%esp
29626 ret
29627 CFI_ENDPROC
29628-ENDPROC(csum_partial_copy_generic)
29629+ENDPROC(csum_partial_copy_generic_to_user)
29630
29631 #else
29632
29633 /* Version for PentiumII/PPro */
29634
29635 #define ROUND1(x) \
29636+ nop; nop; nop; \
29637 SRC(movl x(%esi), %ebx ) ; \
29638 addl %ebx, %eax ; \
29639- DST(movl %ebx, x(%edi) ) ;
29640+ DST(movl %ebx, %es:x(%edi)) ;
29641
29642 #define ROUND(x) \
29643+ nop; nop; nop; \
29644 SRC(movl x(%esi), %ebx ) ; \
29645 adcl %ebx, %eax ; \
29646- DST(movl %ebx, x(%edi) ) ;
29647+ DST(movl %ebx, %es:x(%edi)) ;
29648
29649 #define ARGBASE 12
29650-
29651-ENTRY(csum_partial_copy_generic)
29652+
29653+ENTRY(csum_partial_copy_generic_to_user)
29654 CFI_STARTPROC
29655+
29656+#ifdef CONFIG_PAX_MEMORY_UDEREF
29657+ pushl_cfi %gs
29658+ popl_cfi %es
29659+ jmp csum_partial_copy_generic
29660+#endif
29661+
29662+ENTRY(csum_partial_copy_generic_from_user)
29663+
29664+#ifdef CONFIG_PAX_MEMORY_UDEREF
29665+ pushl_cfi %gs
29666+ popl_cfi %ds
29667+#endif
29668+
29669+ENTRY(csum_partial_copy_generic)
29670 pushl_cfi_reg ebx
29671 pushl_cfi_reg edi
29672 pushl_cfi_reg esi
29673@@ -444,7 +481,7 @@ ENTRY(csum_partial_copy_generic)
29674 subl %ebx, %edi
29675 lea -1(%esi),%edx
29676 andl $-32,%edx
29677- lea 3f(%ebx,%ebx), %ebx
29678+ lea 3f(%ebx,%ebx,2), %ebx
29679 testl %esi, %esi
29680 jmp *%ebx
29681 1: addl $64,%esi
29682@@ -465,19 +502,19 @@ ENTRY(csum_partial_copy_generic)
29683 jb 5f
29684 SRC( movw (%esi), %dx )
29685 leal 2(%esi), %esi
29686-DST( movw %dx, (%edi) )
29687+DST( movw %dx, %es:(%edi) )
29688 leal 2(%edi), %edi
29689 je 6f
29690 shll $16,%edx
29691 5:
29692 SRC( movb (%esi), %dl )
29693-DST( movb %dl, (%edi) )
29694+DST( movb %dl, %es:(%edi) )
29695 6: addl %edx, %eax
29696 adcl $0, %eax
29697 7:
29698 .section .fixup, "ax"
29699 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29700- movl $-EFAULT, (%ebx)
29701+ movl $-EFAULT, %ss:(%ebx)
29702 # zero the complete destination (computing the rest is too much work)
29703 movl ARGBASE+8(%esp),%edi # dst
29704 movl ARGBASE+12(%esp),%ecx # len
29705@@ -485,16 +522,23 @@ DST( movb %dl, (%edi) )
29706 rep; stosb
29707 jmp 7b
29708 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29709- movl $-EFAULT, (%ebx)
29710+ movl $-EFAULT, %ss:(%ebx)
29711 jmp 7b
29712 .previous
29713
29714+#ifdef CONFIG_PAX_MEMORY_UDEREF
29715+ pushl_cfi %ss
29716+ popl_cfi %ds
29717+ pushl_cfi %ss
29718+ popl_cfi %es
29719+#endif
29720+
29721 popl_cfi_reg esi
29722 popl_cfi_reg edi
29723 popl_cfi_reg ebx
29724 ret
29725 CFI_ENDPROC
29726-ENDPROC(csum_partial_copy_generic)
29727+ENDPROC(csum_partial_copy_generic_to_user)
29728
29729 #undef ROUND
29730 #undef ROUND1
29731diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29732index e67e579..4782449 100644
29733--- a/arch/x86/lib/clear_page_64.S
29734+++ b/arch/x86/lib/clear_page_64.S
29735@@ -23,6 +23,7 @@ ENTRY(clear_page)
29736 movl $4096/8,%ecx
29737 xorl %eax,%eax
29738 rep stosq
29739+ pax_force_retaddr
29740 ret
29741 CFI_ENDPROC
29742 ENDPROC(clear_page)
29743@@ -47,6 +48,7 @@ ENTRY(clear_page_orig)
29744 leaq 64(%rdi),%rdi
29745 jnz .Lloop
29746 nop
29747+ pax_force_retaddr
29748 ret
29749 CFI_ENDPROC
29750 ENDPROC(clear_page_orig)
29751@@ -56,6 +58,7 @@ ENTRY(clear_page_c_e)
29752 movl $4096,%ecx
29753 xorl %eax,%eax
29754 rep stosb
29755+ pax_force_retaddr
29756 ret
29757 CFI_ENDPROC
29758 ENDPROC(clear_page_c_e)
29759diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29760index 40a1725..5d12ac4 100644
29761--- a/arch/x86/lib/cmpxchg16b_emu.S
29762+++ b/arch/x86/lib/cmpxchg16b_emu.S
29763@@ -8,6 +8,7 @@
29764 #include <linux/linkage.h>
29765 #include <asm/dwarf2.h>
29766 #include <asm/percpu.h>
29767+#include <asm/alternative-asm.h>
29768
29769 .text
29770
29771@@ -46,12 +47,14 @@ CFI_STARTPROC
29772 CFI_REMEMBER_STATE
29773 popfq_cfi
29774 mov $1, %al
29775+ pax_force_retaddr
29776 ret
29777
29778 CFI_RESTORE_STATE
29779 .Lnot_same:
29780 popfq_cfi
29781 xor %al,%al
29782+ pax_force_retaddr
29783 ret
29784
29785 CFI_ENDPROC
29786diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29787index 8239dbc..e714d2a 100644
29788--- a/arch/x86/lib/copy_page_64.S
29789+++ b/arch/x86/lib/copy_page_64.S
29790@@ -17,6 +17,7 @@ ENTRY(copy_page)
29791 ALTERNATIVE "jmp copy_page_regs", "", X86_FEATURE_REP_GOOD
29792 movl $4096/8, %ecx
29793 rep movsq
29794+ pax_force_retaddr
29795 ret
29796 CFI_ENDPROC
29797 ENDPROC(copy_page)
29798@@ -27,8 +28,8 @@ ENTRY(copy_page_regs)
29799 CFI_ADJUST_CFA_OFFSET 2*8
29800 movq %rbx, (%rsp)
29801 CFI_REL_OFFSET rbx, 0
29802- movq %r12, 1*8(%rsp)
29803- CFI_REL_OFFSET r12, 1*8
29804+ movq %r13, 1*8(%rsp)
29805+ CFI_REL_OFFSET r13, 1*8
29806
29807 movl $(4096/64)-5, %ecx
29808 .p2align 4
29809@@ -41,7 +42,7 @@ ENTRY(copy_page_regs)
29810 movq 0x8*4(%rsi), %r9
29811 movq 0x8*5(%rsi), %r10
29812 movq 0x8*6(%rsi), %r11
29813- movq 0x8*7(%rsi), %r12
29814+ movq 0x8*7(%rsi), %r13
29815
29816 prefetcht0 5*64(%rsi)
29817
29818@@ -52,7 +53,7 @@ ENTRY(copy_page_regs)
29819 movq %r9, 0x8*4(%rdi)
29820 movq %r10, 0x8*5(%rdi)
29821 movq %r11, 0x8*6(%rdi)
29822- movq %r12, 0x8*7(%rdi)
29823+ movq %r13, 0x8*7(%rdi)
29824
29825 leaq 64 (%rsi), %rsi
29826 leaq 64 (%rdi), %rdi
29827@@ -71,7 +72,7 @@ ENTRY(copy_page_regs)
29828 movq 0x8*4(%rsi), %r9
29829 movq 0x8*5(%rsi), %r10
29830 movq 0x8*6(%rsi), %r11
29831- movq 0x8*7(%rsi), %r12
29832+ movq 0x8*7(%rsi), %r13
29833
29834 movq %rax, 0x8*0(%rdi)
29835 movq %rbx, 0x8*1(%rdi)
29836@@ -80,7 +81,7 @@ ENTRY(copy_page_regs)
29837 movq %r9, 0x8*4(%rdi)
29838 movq %r10, 0x8*5(%rdi)
29839 movq %r11, 0x8*6(%rdi)
29840- movq %r12, 0x8*7(%rdi)
29841+ movq %r13, 0x8*7(%rdi)
29842
29843 leaq 64(%rdi), %rdi
29844 leaq 64(%rsi), %rsi
29845@@ -88,10 +89,11 @@ ENTRY(copy_page_regs)
29846
29847 movq (%rsp), %rbx
29848 CFI_RESTORE rbx
29849- movq 1*8(%rsp), %r12
29850- CFI_RESTORE r12
29851+ movq 1*8(%rsp), %r13
29852+ CFI_RESTORE r13
29853 addq $2*8, %rsp
29854 CFI_ADJUST_CFA_OFFSET -2*8
29855+ pax_force_retaddr
29856 ret
29857 CFI_ENDPROC
29858 ENDPROC(copy_page_regs)
29859diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29860index fa997df..060ab18 100644
29861--- a/arch/x86/lib/copy_user_64.S
29862+++ b/arch/x86/lib/copy_user_64.S
29863@@ -15,6 +15,7 @@
29864 #include <asm/alternative-asm.h>
29865 #include <asm/asm.h>
29866 #include <asm/smap.h>
29867+#include <asm/pgtable.h>
29868
29869 .macro ALIGN_DESTINATION
29870 /* check for bad alignment of destination */
29871@@ -40,56 +41,6 @@
29872 _ASM_EXTABLE(101b,103b)
29873 .endm
29874
29875-/* Standard copy_to_user with segment limit checking */
29876-ENTRY(_copy_to_user)
29877- CFI_STARTPROC
29878- GET_THREAD_INFO(%rax)
29879- movq %rdi,%rcx
29880- addq %rdx,%rcx
29881- jc bad_to_user
29882- cmpq TI_addr_limit(%rax),%rcx
29883- ja bad_to_user
29884- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
29885- "jmp copy_user_generic_string", \
29886- X86_FEATURE_REP_GOOD, \
29887- "jmp copy_user_enhanced_fast_string", \
29888- X86_FEATURE_ERMS
29889- CFI_ENDPROC
29890-ENDPROC(_copy_to_user)
29891-
29892-/* Standard copy_from_user with segment limit checking */
29893-ENTRY(_copy_from_user)
29894- CFI_STARTPROC
29895- GET_THREAD_INFO(%rax)
29896- movq %rsi,%rcx
29897- addq %rdx,%rcx
29898- jc bad_from_user
29899- cmpq TI_addr_limit(%rax),%rcx
29900- ja bad_from_user
29901- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
29902- "jmp copy_user_generic_string", \
29903- X86_FEATURE_REP_GOOD, \
29904- "jmp copy_user_enhanced_fast_string", \
29905- X86_FEATURE_ERMS
29906- CFI_ENDPROC
29907-ENDPROC(_copy_from_user)
29908-
29909- .section .fixup,"ax"
29910- /* must zero dest */
29911-ENTRY(bad_from_user)
29912-bad_from_user:
29913- CFI_STARTPROC
29914- movl %edx,%ecx
29915- xorl %eax,%eax
29916- rep
29917- stosb
29918-bad_to_user:
29919- movl %edx,%eax
29920- ret
29921- CFI_ENDPROC
29922-ENDPROC(bad_from_user)
29923- .previous
29924-
29925 /*
29926 * copy_user_generic_unrolled - memory copy with exception handling.
29927 * This version is for CPUs like P4 that don't have efficient micro
29928@@ -105,6 +56,7 @@ ENDPROC(bad_from_user)
29929 */
29930 ENTRY(copy_user_generic_unrolled)
29931 CFI_STARTPROC
29932+ ASM_PAX_OPEN_USERLAND
29933 ASM_STAC
29934 cmpl $8,%edx
29935 jb 20f /* less then 8 bytes, go to byte copy loop */
29936@@ -154,6 +106,8 @@ ENTRY(copy_user_generic_unrolled)
29937 jnz 21b
29938 23: xor %eax,%eax
29939 ASM_CLAC
29940+ ASM_PAX_CLOSE_USERLAND
29941+ pax_force_retaddr
29942 ret
29943
29944 .section .fixup,"ax"
29945@@ -209,6 +163,7 @@ ENDPROC(copy_user_generic_unrolled)
29946 */
29947 ENTRY(copy_user_generic_string)
29948 CFI_STARTPROC
29949+ ASM_PAX_OPEN_USERLAND
29950 ASM_STAC
29951 cmpl $8,%edx
29952 jb 2f /* less than 8 bytes, go to byte copy loop */
29953@@ -223,6 +178,8 @@ ENTRY(copy_user_generic_string)
29954 movsb
29955 xorl %eax,%eax
29956 ASM_CLAC
29957+ ASM_PAX_CLOSE_USERLAND
29958+ pax_force_retaddr
29959 ret
29960
29961 .section .fixup,"ax"
29962@@ -250,12 +207,15 @@ ENDPROC(copy_user_generic_string)
29963 */
29964 ENTRY(copy_user_enhanced_fast_string)
29965 CFI_STARTPROC
29966+ ASM_PAX_OPEN_USERLAND
29967 ASM_STAC
29968 movl %edx,%ecx
29969 1: rep
29970 movsb
29971 xorl %eax,%eax
29972 ASM_CLAC
29973+ ASM_PAX_CLOSE_USERLAND
29974+ pax_force_retaddr
29975 ret
29976
29977 .section .fixup,"ax"
29978diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29979index 6a4f43c..c70fb52 100644
29980--- a/arch/x86/lib/copy_user_nocache_64.S
29981+++ b/arch/x86/lib/copy_user_nocache_64.S
29982@@ -8,6 +8,7 @@
29983
29984 #include <linux/linkage.h>
29985 #include <asm/dwarf2.h>
29986+#include <asm/alternative-asm.h>
29987
29988 #define FIX_ALIGNMENT 1
29989
29990@@ -16,6 +17,7 @@
29991 #include <asm/thread_info.h>
29992 #include <asm/asm.h>
29993 #include <asm/smap.h>
29994+#include <asm/pgtable.h>
29995
29996 .macro ALIGN_DESTINATION
29997 #ifdef FIX_ALIGNMENT
29998@@ -49,6 +51,16 @@
29999 */
30000 ENTRY(__copy_user_nocache)
30001 CFI_STARTPROC
30002+
30003+#ifdef CONFIG_PAX_MEMORY_UDEREF
30004+ mov pax_user_shadow_base,%rcx
30005+ cmp %rcx,%rsi
30006+ jae 1f
30007+ add %rcx,%rsi
30008+1:
30009+#endif
30010+
30011+ ASM_PAX_OPEN_USERLAND
30012 ASM_STAC
30013 cmpl $8,%edx
30014 jb 20f /* less then 8 bytes, go to byte copy loop */
30015@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30016 jnz 21b
30017 23: xorl %eax,%eax
30018 ASM_CLAC
30019+ ASM_PAX_CLOSE_USERLAND
30020 sfence
30021+ pax_force_retaddr
30022 ret
30023
30024 .section .fixup,"ax"
30025diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30026index 9734182..dbee61c 100644
30027--- a/arch/x86/lib/csum-copy_64.S
30028+++ b/arch/x86/lib/csum-copy_64.S
30029@@ -9,6 +9,7 @@
30030 #include <asm/dwarf2.h>
30031 #include <asm/errno.h>
30032 #include <asm/asm.h>
30033+#include <asm/alternative-asm.h>
30034
30035 /*
30036 * Checksum copy with exception handling.
30037@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30038 CFI_ADJUST_CFA_OFFSET 7*8
30039 movq %rbx, 2*8(%rsp)
30040 CFI_REL_OFFSET rbx, 2*8
30041- movq %r12, 3*8(%rsp)
30042- CFI_REL_OFFSET r12, 3*8
30043+ movq %r15, 3*8(%rsp)
30044+ CFI_REL_OFFSET r15, 3*8
30045 movq %r14, 4*8(%rsp)
30046 CFI_REL_OFFSET r14, 4*8
30047 movq %r13, 5*8(%rsp)
30048@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30049 movl %edx, %ecx
30050
30051 xorl %r9d, %r9d
30052- movq %rcx, %r12
30053+ movq %rcx, %r15
30054
30055- shrq $6, %r12
30056+ shrq $6, %r15
30057 jz .Lhandle_tail /* < 64 */
30058
30059 clc
30060
30061 /* main loop. clear in 64 byte blocks */
30062 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30063- /* r11: temp3, rdx: temp4, r12 loopcnt */
30064+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30065 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30066 .p2align 4
30067 .Lloop:
30068@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30069 adcq %r14, %rax
30070 adcq %r13, %rax
30071
30072- decl %r12d
30073+ decl %r15d
30074
30075 dest
30076 movq %rbx, (%rsi)
30077@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30078 .Lende:
30079 movq 2*8(%rsp), %rbx
30080 CFI_RESTORE rbx
30081- movq 3*8(%rsp), %r12
30082- CFI_RESTORE r12
30083+ movq 3*8(%rsp), %r15
30084+ CFI_RESTORE r15
30085 movq 4*8(%rsp), %r14
30086 CFI_RESTORE r14
30087 movq 5*8(%rsp), %r13
30088@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30089 CFI_RESTORE rbp
30090 addq $7*8, %rsp
30091 CFI_ADJUST_CFA_OFFSET -7*8
30092+ pax_force_retaddr
30093 ret
30094 CFI_RESTORE_STATE
30095
30096diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30097index 1318f75..44c30fd 100644
30098--- a/arch/x86/lib/csum-wrappers_64.c
30099+++ b/arch/x86/lib/csum-wrappers_64.c
30100@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30101 len -= 2;
30102 }
30103 }
30104+ pax_open_userland();
30105 stac();
30106- isum = csum_partial_copy_generic((__force const void *)src,
30107+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30108 dst, len, isum, errp, NULL);
30109 clac();
30110+ pax_close_userland();
30111 if (unlikely(*errp))
30112 goto out_err;
30113
30114@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30115 }
30116
30117 *errp = 0;
30118+ pax_open_userland();
30119 stac();
30120- ret = csum_partial_copy_generic(src, (void __force *)dst,
30121+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30122 len, isum, NULL, errp);
30123 clac();
30124+ pax_close_userland();
30125 return ret;
30126 }
30127 EXPORT_SYMBOL(csum_partial_copy_to_user);
30128diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30129index a451235..a74bfa3 100644
30130--- a/arch/x86/lib/getuser.S
30131+++ b/arch/x86/lib/getuser.S
30132@@ -33,17 +33,40 @@
30133 #include <asm/thread_info.h>
30134 #include <asm/asm.h>
30135 #include <asm/smap.h>
30136+#include <asm/segment.h>
30137+#include <asm/pgtable.h>
30138+#include <asm/alternative-asm.h>
30139+
30140+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30141+#define __copyuser_seg gs;
30142+#else
30143+#define __copyuser_seg
30144+#endif
30145
30146 .text
30147 ENTRY(__get_user_1)
30148 CFI_STARTPROC
30149+
30150+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30151 GET_THREAD_INFO(%_ASM_DX)
30152 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30153 jae bad_get_user
30154+
30155+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30156+ mov pax_user_shadow_base,%_ASM_DX
30157+ cmp %_ASM_DX,%_ASM_AX
30158+ jae 1234f
30159+ add %_ASM_DX,%_ASM_AX
30160+1234:
30161+#endif
30162+
30163+#endif
30164+
30165 ASM_STAC
30166-1: movzbl (%_ASM_AX),%edx
30167+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30168 xor %eax,%eax
30169 ASM_CLAC
30170+ pax_force_retaddr
30171 ret
30172 CFI_ENDPROC
30173 ENDPROC(__get_user_1)
30174@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30175 ENTRY(__get_user_2)
30176 CFI_STARTPROC
30177 add $1,%_ASM_AX
30178+
30179+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30180 jc bad_get_user
30181 GET_THREAD_INFO(%_ASM_DX)
30182 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30183 jae bad_get_user
30184+
30185+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30186+ mov pax_user_shadow_base,%_ASM_DX
30187+ cmp %_ASM_DX,%_ASM_AX
30188+ jae 1234f
30189+ add %_ASM_DX,%_ASM_AX
30190+1234:
30191+#endif
30192+
30193+#endif
30194+
30195 ASM_STAC
30196-2: movzwl -1(%_ASM_AX),%edx
30197+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30198 xor %eax,%eax
30199 ASM_CLAC
30200+ pax_force_retaddr
30201 ret
30202 CFI_ENDPROC
30203 ENDPROC(__get_user_2)
30204@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30205 ENTRY(__get_user_4)
30206 CFI_STARTPROC
30207 add $3,%_ASM_AX
30208+
30209+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30210 jc bad_get_user
30211 GET_THREAD_INFO(%_ASM_DX)
30212 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30213 jae bad_get_user
30214+
30215+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30216+ mov pax_user_shadow_base,%_ASM_DX
30217+ cmp %_ASM_DX,%_ASM_AX
30218+ jae 1234f
30219+ add %_ASM_DX,%_ASM_AX
30220+1234:
30221+#endif
30222+
30223+#endif
30224+
30225 ASM_STAC
30226-3: movl -3(%_ASM_AX),%edx
30227+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30228 xor %eax,%eax
30229 ASM_CLAC
30230+ pax_force_retaddr
30231 ret
30232 CFI_ENDPROC
30233 ENDPROC(__get_user_4)
30234@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30235 GET_THREAD_INFO(%_ASM_DX)
30236 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30237 jae bad_get_user
30238+
30239+#ifdef CONFIG_PAX_MEMORY_UDEREF
30240+ mov pax_user_shadow_base,%_ASM_DX
30241+ cmp %_ASM_DX,%_ASM_AX
30242+ jae 1234f
30243+ add %_ASM_DX,%_ASM_AX
30244+1234:
30245+#endif
30246+
30247 ASM_STAC
30248 4: movq -7(%_ASM_AX),%rdx
30249 xor %eax,%eax
30250 ASM_CLAC
30251+ pax_force_retaddr
30252 ret
30253 #else
30254 add $7,%_ASM_AX
30255@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30256 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30257 jae bad_get_user_8
30258 ASM_STAC
30259-4: movl -7(%_ASM_AX),%edx
30260-5: movl -3(%_ASM_AX),%ecx
30261+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30262+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30263 xor %eax,%eax
30264 ASM_CLAC
30265+ pax_force_retaddr
30266 ret
30267 #endif
30268 CFI_ENDPROC
30269@@ -113,6 +175,7 @@ bad_get_user:
30270 xor %edx,%edx
30271 mov $(-EFAULT),%_ASM_AX
30272 ASM_CLAC
30273+ pax_force_retaddr
30274 ret
30275 CFI_ENDPROC
30276 END(bad_get_user)
30277@@ -124,6 +187,7 @@ bad_get_user_8:
30278 xor %ecx,%ecx
30279 mov $(-EFAULT),%_ASM_AX
30280 ASM_CLAC
30281+ pax_force_retaddr
30282 ret
30283 CFI_ENDPROC
30284 END(bad_get_user_8)
30285diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30286index 8f72b33..a43d9969 100644
30287--- a/arch/x86/lib/insn.c
30288+++ b/arch/x86/lib/insn.c
30289@@ -20,8 +20,10 @@
30290
30291 #ifdef __KERNEL__
30292 #include <linux/string.h>
30293+#include <asm/pgtable_types.h>
30294 #else
30295 #include <string.h>
30296+#define ktla_ktva(addr) addr
30297 #endif
30298 #include <asm/inat.h>
30299 #include <asm/insn.h>
30300@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30301 buf_len = MAX_INSN_SIZE;
30302
30303 memset(insn, 0, sizeof(*insn));
30304- insn->kaddr = kaddr;
30305- insn->end_kaddr = kaddr + buf_len;
30306- insn->next_byte = kaddr;
30307+ insn->kaddr = ktla_ktva(kaddr);
30308+ insn->end_kaddr = insn->kaddr + buf_len;
30309+ insn->next_byte = insn->kaddr;
30310 insn->x86_64 = x86_64 ? 1 : 0;
30311 insn->opnd_bytes = 4;
30312 if (x86_64)
30313diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30314index 05a95e7..326f2fa 100644
30315--- a/arch/x86/lib/iomap_copy_64.S
30316+++ b/arch/x86/lib/iomap_copy_64.S
30317@@ -17,6 +17,7 @@
30318
30319 #include <linux/linkage.h>
30320 #include <asm/dwarf2.h>
30321+#include <asm/alternative-asm.h>
30322
30323 /*
30324 * override generic version in lib/iomap_copy.c
30325@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30326 CFI_STARTPROC
30327 movl %edx,%ecx
30328 rep movsd
30329+ pax_force_retaddr
30330 ret
30331 CFI_ENDPROC
30332 ENDPROC(__iowrite32_copy)
30333diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30334index b046664..dec9465 100644
30335--- a/arch/x86/lib/memcpy_64.S
30336+++ b/arch/x86/lib/memcpy_64.S
30337@@ -37,6 +37,7 @@ ENTRY(memcpy)
30338 rep movsq
30339 movl %edx, %ecx
30340 rep movsb
30341+ pax_force_retaddr
30342 ret
30343 ENDPROC(memcpy)
30344 ENDPROC(__memcpy)
30345@@ -49,6 +50,7 @@ ENTRY(memcpy_erms)
30346 movq %rdi, %rax
30347 movq %rdx, %rcx
30348 rep movsb
30349+ pax_force_retaddr
30350 ret
30351 ENDPROC(memcpy_erms)
30352
30353@@ -134,6 +136,7 @@ ENTRY(memcpy_orig)
30354 movq %r9, 1*8(%rdi)
30355 movq %r10, -2*8(%rdi, %rdx)
30356 movq %r11, -1*8(%rdi, %rdx)
30357+ pax_force_retaddr
30358 retq
30359 .p2align 4
30360 .Lless_16bytes:
30361@@ -146,6 +149,7 @@ ENTRY(memcpy_orig)
30362 movq -1*8(%rsi, %rdx), %r9
30363 movq %r8, 0*8(%rdi)
30364 movq %r9, -1*8(%rdi, %rdx)
30365+ pax_force_retaddr
30366 retq
30367 .p2align 4
30368 .Lless_8bytes:
30369@@ -159,6 +163,7 @@ ENTRY(memcpy_orig)
30370 movl -4(%rsi, %rdx), %r8d
30371 movl %ecx, (%rdi)
30372 movl %r8d, -4(%rdi, %rdx)
30373+ pax_force_retaddr
30374 retq
30375 .p2align 4
30376 .Lless_3bytes:
30377@@ -177,6 +182,7 @@ ENTRY(memcpy_orig)
30378 movb %cl, (%rdi)
30379
30380 .Lend:
30381+ pax_force_retaddr
30382 retq
30383 CFI_ENDPROC
30384 ENDPROC(memcpy_orig)
30385diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30386index 0f8a0d0..f6e0ea4 100644
30387--- a/arch/x86/lib/memmove_64.S
30388+++ b/arch/x86/lib/memmove_64.S
30389@@ -43,7 +43,7 @@ ENTRY(__memmove)
30390 jg 2f
30391
30392 .Lmemmove_begin_forward:
30393- ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; retq", X86_FEATURE_ERMS
30394+ ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; pax_force_retaddr; retq", X86_FEATURE_ERMS
30395
30396 /*
30397 * movsq instruction have many startup latency
30398@@ -206,6 +206,7 @@ ENTRY(__memmove)
30399 movb (%rsi), %r11b
30400 movb %r11b, (%rdi)
30401 13:
30402+ pax_force_retaddr
30403 retq
30404 CFI_ENDPROC
30405 ENDPROC(__memmove)
30406diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30407index 93118fb..386ed2a 100644
30408--- a/arch/x86/lib/memset_64.S
30409+++ b/arch/x86/lib/memset_64.S
30410@@ -41,6 +41,7 @@ ENTRY(__memset)
30411 movl %edx,%ecx
30412 rep stosb
30413 movq %r9,%rax
30414+ pax_force_retaddr
30415 ret
30416 ENDPROC(memset)
30417 ENDPROC(__memset)
30418@@ -62,6 +63,7 @@ ENTRY(memset_erms)
30419 movq %rdx,%rcx
30420 rep stosb
30421 movq %r9,%rax
30422+ pax_force_retaddr
30423 ret
30424 ENDPROC(memset_erms)
30425
30426@@ -126,6 +128,7 @@ ENTRY(memset_orig)
30427
30428 .Lende:
30429 movq %r10,%rax
30430+ pax_force_retaddr
30431 ret
30432
30433 CFI_RESTORE_STATE
30434diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30435index c9f2d9b..e7fd2c0 100644
30436--- a/arch/x86/lib/mmx_32.c
30437+++ b/arch/x86/lib/mmx_32.c
30438@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30439 {
30440 void *p;
30441 int i;
30442+ unsigned long cr0;
30443
30444 if (unlikely(in_interrupt()))
30445 return __memcpy(to, from, len);
30446@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30447 kernel_fpu_begin();
30448
30449 __asm__ __volatile__ (
30450- "1: prefetch (%0)\n" /* This set is 28 bytes */
30451- " prefetch 64(%0)\n"
30452- " prefetch 128(%0)\n"
30453- " prefetch 192(%0)\n"
30454- " prefetch 256(%0)\n"
30455+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30456+ " prefetch 64(%1)\n"
30457+ " prefetch 128(%1)\n"
30458+ " prefetch 192(%1)\n"
30459+ " prefetch 256(%1)\n"
30460 "2: \n"
30461 ".section .fixup, \"ax\"\n"
30462- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30463+ "3: \n"
30464+
30465+#ifdef CONFIG_PAX_KERNEXEC
30466+ " movl %%cr0, %0\n"
30467+ " movl %0, %%eax\n"
30468+ " andl $0xFFFEFFFF, %%eax\n"
30469+ " movl %%eax, %%cr0\n"
30470+#endif
30471+
30472+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30473+
30474+#ifdef CONFIG_PAX_KERNEXEC
30475+ " movl %0, %%cr0\n"
30476+#endif
30477+
30478 " jmp 2b\n"
30479 ".previous\n"
30480 _ASM_EXTABLE(1b, 3b)
30481- : : "r" (from));
30482+ : "=&r" (cr0) : "r" (from) : "ax");
30483
30484 for ( ; i > 5; i--) {
30485 __asm__ __volatile__ (
30486- "1: prefetch 320(%0)\n"
30487- "2: movq (%0), %%mm0\n"
30488- " movq 8(%0), %%mm1\n"
30489- " movq 16(%0), %%mm2\n"
30490- " movq 24(%0), %%mm3\n"
30491- " movq %%mm0, (%1)\n"
30492- " movq %%mm1, 8(%1)\n"
30493- " movq %%mm2, 16(%1)\n"
30494- " movq %%mm3, 24(%1)\n"
30495- " movq 32(%0), %%mm0\n"
30496- " movq 40(%0), %%mm1\n"
30497- " movq 48(%0), %%mm2\n"
30498- " movq 56(%0), %%mm3\n"
30499- " movq %%mm0, 32(%1)\n"
30500- " movq %%mm1, 40(%1)\n"
30501- " movq %%mm2, 48(%1)\n"
30502- " movq %%mm3, 56(%1)\n"
30503+ "1: prefetch 320(%1)\n"
30504+ "2: movq (%1), %%mm0\n"
30505+ " movq 8(%1), %%mm1\n"
30506+ " movq 16(%1), %%mm2\n"
30507+ " movq 24(%1), %%mm3\n"
30508+ " movq %%mm0, (%2)\n"
30509+ " movq %%mm1, 8(%2)\n"
30510+ " movq %%mm2, 16(%2)\n"
30511+ " movq %%mm3, 24(%2)\n"
30512+ " movq 32(%1), %%mm0\n"
30513+ " movq 40(%1), %%mm1\n"
30514+ " movq 48(%1), %%mm2\n"
30515+ " movq 56(%1), %%mm3\n"
30516+ " movq %%mm0, 32(%2)\n"
30517+ " movq %%mm1, 40(%2)\n"
30518+ " movq %%mm2, 48(%2)\n"
30519+ " movq %%mm3, 56(%2)\n"
30520 ".section .fixup, \"ax\"\n"
30521- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30522+ "3:\n"
30523+
30524+#ifdef CONFIG_PAX_KERNEXEC
30525+ " movl %%cr0, %0\n"
30526+ " movl %0, %%eax\n"
30527+ " andl $0xFFFEFFFF, %%eax\n"
30528+ " movl %%eax, %%cr0\n"
30529+#endif
30530+
30531+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30532+
30533+#ifdef CONFIG_PAX_KERNEXEC
30534+ " movl %0, %%cr0\n"
30535+#endif
30536+
30537 " jmp 2b\n"
30538 ".previous\n"
30539 _ASM_EXTABLE(1b, 3b)
30540- : : "r" (from), "r" (to) : "memory");
30541+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30542
30543 from += 64;
30544 to += 64;
30545@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30546 static void fast_copy_page(void *to, void *from)
30547 {
30548 int i;
30549+ unsigned long cr0;
30550
30551 kernel_fpu_begin();
30552
30553@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30554 * but that is for later. -AV
30555 */
30556 __asm__ __volatile__(
30557- "1: prefetch (%0)\n"
30558- " prefetch 64(%0)\n"
30559- " prefetch 128(%0)\n"
30560- " prefetch 192(%0)\n"
30561- " prefetch 256(%0)\n"
30562+ "1: prefetch (%1)\n"
30563+ " prefetch 64(%1)\n"
30564+ " prefetch 128(%1)\n"
30565+ " prefetch 192(%1)\n"
30566+ " prefetch 256(%1)\n"
30567 "2: \n"
30568 ".section .fixup, \"ax\"\n"
30569- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30570+ "3: \n"
30571+
30572+#ifdef CONFIG_PAX_KERNEXEC
30573+ " movl %%cr0, %0\n"
30574+ " movl %0, %%eax\n"
30575+ " andl $0xFFFEFFFF, %%eax\n"
30576+ " movl %%eax, %%cr0\n"
30577+#endif
30578+
30579+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30580+
30581+#ifdef CONFIG_PAX_KERNEXEC
30582+ " movl %0, %%cr0\n"
30583+#endif
30584+
30585 " jmp 2b\n"
30586 ".previous\n"
30587- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30588+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30589
30590 for (i = 0; i < (4096-320)/64; i++) {
30591 __asm__ __volatile__ (
30592- "1: prefetch 320(%0)\n"
30593- "2: movq (%0), %%mm0\n"
30594- " movntq %%mm0, (%1)\n"
30595- " movq 8(%0), %%mm1\n"
30596- " movntq %%mm1, 8(%1)\n"
30597- " movq 16(%0), %%mm2\n"
30598- " movntq %%mm2, 16(%1)\n"
30599- " movq 24(%0), %%mm3\n"
30600- " movntq %%mm3, 24(%1)\n"
30601- " movq 32(%0), %%mm4\n"
30602- " movntq %%mm4, 32(%1)\n"
30603- " movq 40(%0), %%mm5\n"
30604- " movntq %%mm5, 40(%1)\n"
30605- " movq 48(%0), %%mm6\n"
30606- " movntq %%mm6, 48(%1)\n"
30607- " movq 56(%0), %%mm7\n"
30608- " movntq %%mm7, 56(%1)\n"
30609+ "1: prefetch 320(%1)\n"
30610+ "2: movq (%1), %%mm0\n"
30611+ " movntq %%mm0, (%2)\n"
30612+ " movq 8(%1), %%mm1\n"
30613+ " movntq %%mm1, 8(%2)\n"
30614+ " movq 16(%1), %%mm2\n"
30615+ " movntq %%mm2, 16(%2)\n"
30616+ " movq 24(%1), %%mm3\n"
30617+ " movntq %%mm3, 24(%2)\n"
30618+ " movq 32(%1), %%mm4\n"
30619+ " movntq %%mm4, 32(%2)\n"
30620+ " movq 40(%1), %%mm5\n"
30621+ " movntq %%mm5, 40(%2)\n"
30622+ " movq 48(%1), %%mm6\n"
30623+ " movntq %%mm6, 48(%2)\n"
30624+ " movq 56(%1), %%mm7\n"
30625+ " movntq %%mm7, 56(%2)\n"
30626 ".section .fixup, \"ax\"\n"
30627- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30628+ "3:\n"
30629+
30630+#ifdef CONFIG_PAX_KERNEXEC
30631+ " movl %%cr0, %0\n"
30632+ " movl %0, %%eax\n"
30633+ " andl $0xFFFEFFFF, %%eax\n"
30634+ " movl %%eax, %%cr0\n"
30635+#endif
30636+
30637+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30638+
30639+#ifdef CONFIG_PAX_KERNEXEC
30640+ " movl %0, %%cr0\n"
30641+#endif
30642+
30643 " jmp 2b\n"
30644 ".previous\n"
30645- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30646+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30647
30648 from += 64;
30649 to += 64;
30650@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30651 static void fast_copy_page(void *to, void *from)
30652 {
30653 int i;
30654+ unsigned long cr0;
30655
30656 kernel_fpu_begin();
30657
30658 __asm__ __volatile__ (
30659- "1: prefetch (%0)\n"
30660- " prefetch 64(%0)\n"
30661- " prefetch 128(%0)\n"
30662- " prefetch 192(%0)\n"
30663- " prefetch 256(%0)\n"
30664+ "1: prefetch (%1)\n"
30665+ " prefetch 64(%1)\n"
30666+ " prefetch 128(%1)\n"
30667+ " prefetch 192(%1)\n"
30668+ " prefetch 256(%1)\n"
30669 "2: \n"
30670 ".section .fixup, \"ax\"\n"
30671- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30672+ "3: \n"
30673+
30674+#ifdef CONFIG_PAX_KERNEXEC
30675+ " movl %%cr0, %0\n"
30676+ " movl %0, %%eax\n"
30677+ " andl $0xFFFEFFFF, %%eax\n"
30678+ " movl %%eax, %%cr0\n"
30679+#endif
30680+
30681+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30682+
30683+#ifdef CONFIG_PAX_KERNEXEC
30684+ " movl %0, %%cr0\n"
30685+#endif
30686+
30687 " jmp 2b\n"
30688 ".previous\n"
30689- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30690+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30691
30692 for (i = 0; i < 4096/64; i++) {
30693 __asm__ __volatile__ (
30694- "1: prefetch 320(%0)\n"
30695- "2: movq (%0), %%mm0\n"
30696- " movq 8(%0), %%mm1\n"
30697- " movq 16(%0), %%mm2\n"
30698- " movq 24(%0), %%mm3\n"
30699- " movq %%mm0, (%1)\n"
30700- " movq %%mm1, 8(%1)\n"
30701- " movq %%mm2, 16(%1)\n"
30702- " movq %%mm3, 24(%1)\n"
30703- " movq 32(%0), %%mm0\n"
30704- " movq 40(%0), %%mm1\n"
30705- " movq 48(%0), %%mm2\n"
30706- " movq 56(%0), %%mm3\n"
30707- " movq %%mm0, 32(%1)\n"
30708- " movq %%mm1, 40(%1)\n"
30709- " movq %%mm2, 48(%1)\n"
30710- " movq %%mm3, 56(%1)\n"
30711+ "1: prefetch 320(%1)\n"
30712+ "2: movq (%1), %%mm0\n"
30713+ " movq 8(%1), %%mm1\n"
30714+ " movq 16(%1), %%mm2\n"
30715+ " movq 24(%1), %%mm3\n"
30716+ " movq %%mm0, (%2)\n"
30717+ " movq %%mm1, 8(%2)\n"
30718+ " movq %%mm2, 16(%2)\n"
30719+ " movq %%mm3, 24(%2)\n"
30720+ " movq 32(%1), %%mm0\n"
30721+ " movq 40(%1), %%mm1\n"
30722+ " movq 48(%1), %%mm2\n"
30723+ " movq 56(%1), %%mm3\n"
30724+ " movq %%mm0, 32(%2)\n"
30725+ " movq %%mm1, 40(%2)\n"
30726+ " movq %%mm2, 48(%2)\n"
30727+ " movq %%mm3, 56(%2)\n"
30728 ".section .fixup, \"ax\"\n"
30729- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30730+ "3:\n"
30731+
30732+#ifdef CONFIG_PAX_KERNEXEC
30733+ " movl %%cr0, %0\n"
30734+ " movl %0, %%eax\n"
30735+ " andl $0xFFFEFFFF, %%eax\n"
30736+ " movl %%eax, %%cr0\n"
30737+#endif
30738+
30739+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30740+
30741+#ifdef CONFIG_PAX_KERNEXEC
30742+ " movl %0, %%cr0\n"
30743+#endif
30744+
30745 " jmp 2b\n"
30746 ".previous\n"
30747 _ASM_EXTABLE(1b, 3b)
30748- : : "r" (from), "r" (to) : "memory");
30749+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30750
30751 from += 64;
30752 to += 64;
30753diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30754index 3ca5218..c2ae6bc 100644
30755--- a/arch/x86/lib/msr-reg.S
30756+++ b/arch/x86/lib/msr-reg.S
30757@@ -3,6 +3,7 @@
30758 #include <asm/dwarf2.h>
30759 #include <asm/asm.h>
30760 #include <asm/msr.h>
30761+#include <asm/alternative-asm.h>
30762
30763 #ifdef CONFIG_X86_64
30764 /*
30765@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30766 movl %edi, 28(%r10)
30767 popq_cfi_reg rbp
30768 popq_cfi_reg rbx
30769+ pax_force_retaddr
30770 ret
30771 3:
30772 CFI_RESTORE_STATE
30773diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30774index fc6ba17..14ad9a5 100644
30775--- a/arch/x86/lib/putuser.S
30776+++ b/arch/x86/lib/putuser.S
30777@@ -16,7 +16,9 @@
30778 #include <asm/errno.h>
30779 #include <asm/asm.h>
30780 #include <asm/smap.h>
30781-
30782+#include <asm/segment.h>
30783+#include <asm/pgtable.h>
30784+#include <asm/alternative-asm.h>
30785
30786 /*
30787 * __put_user_X
30788@@ -30,57 +32,125 @@
30789 * as they get called from within inline assembly.
30790 */
30791
30792-#define ENTER CFI_STARTPROC ; \
30793- GET_THREAD_INFO(%_ASM_BX)
30794-#define EXIT ASM_CLAC ; \
30795- ret ; \
30796+#define ENTER CFI_STARTPROC
30797+#define EXIT ASM_CLAC ; \
30798+ pax_force_retaddr ; \
30799+ ret ; \
30800 CFI_ENDPROC
30801
30802+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30803+#define _DEST %_ASM_CX,%_ASM_BX
30804+#else
30805+#define _DEST %_ASM_CX
30806+#endif
30807+
30808+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30809+#define __copyuser_seg gs;
30810+#else
30811+#define __copyuser_seg
30812+#endif
30813+
30814 .text
30815 ENTRY(__put_user_1)
30816 ENTER
30817+
30818+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30819+ GET_THREAD_INFO(%_ASM_BX)
30820 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30821 jae bad_put_user
30822+
30823+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30824+ mov pax_user_shadow_base,%_ASM_BX
30825+ cmp %_ASM_BX,%_ASM_CX
30826+ jb 1234f
30827+ xor %ebx,%ebx
30828+1234:
30829+#endif
30830+
30831+#endif
30832+
30833 ASM_STAC
30834-1: movb %al,(%_ASM_CX)
30835+1: __copyuser_seg movb %al,(_DEST)
30836 xor %eax,%eax
30837 EXIT
30838 ENDPROC(__put_user_1)
30839
30840 ENTRY(__put_user_2)
30841 ENTER
30842+
30843+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30844+ GET_THREAD_INFO(%_ASM_BX)
30845 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30846 sub $1,%_ASM_BX
30847 cmp %_ASM_BX,%_ASM_CX
30848 jae bad_put_user
30849+
30850+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30851+ mov pax_user_shadow_base,%_ASM_BX
30852+ cmp %_ASM_BX,%_ASM_CX
30853+ jb 1234f
30854+ xor %ebx,%ebx
30855+1234:
30856+#endif
30857+
30858+#endif
30859+
30860 ASM_STAC
30861-2: movw %ax,(%_ASM_CX)
30862+2: __copyuser_seg movw %ax,(_DEST)
30863 xor %eax,%eax
30864 EXIT
30865 ENDPROC(__put_user_2)
30866
30867 ENTRY(__put_user_4)
30868 ENTER
30869+
30870+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30871+ GET_THREAD_INFO(%_ASM_BX)
30872 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30873 sub $3,%_ASM_BX
30874 cmp %_ASM_BX,%_ASM_CX
30875 jae bad_put_user
30876+
30877+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30878+ mov pax_user_shadow_base,%_ASM_BX
30879+ cmp %_ASM_BX,%_ASM_CX
30880+ jb 1234f
30881+ xor %ebx,%ebx
30882+1234:
30883+#endif
30884+
30885+#endif
30886+
30887 ASM_STAC
30888-3: movl %eax,(%_ASM_CX)
30889+3: __copyuser_seg movl %eax,(_DEST)
30890 xor %eax,%eax
30891 EXIT
30892 ENDPROC(__put_user_4)
30893
30894 ENTRY(__put_user_8)
30895 ENTER
30896+
30897+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30898+ GET_THREAD_INFO(%_ASM_BX)
30899 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30900 sub $7,%_ASM_BX
30901 cmp %_ASM_BX,%_ASM_CX
30902 jae bad_put_user
30903+
30904+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30905+ mov pax_user_shadow_base,%_ASM_BX
30906+ cmp %_ASM_BX,%_ASM_CX
30907+ jb 1234f
30908+ xor %ebx,%ebx
30909+1234:
30910+#endif
30911+
30912+#endif
30913+
30914 ASM_STAC
30915-4: mov %_ASM_AX,(%_ASM_CX)
30916+4: __copyuser_seg mov %_ASM_AX,(_DEST)
30917 #ifdef CONFIG_X86_32
30918-5: movl %edx,4(%_ASM_CX)
30919+5: __copyuser_seg movl %edx,4(_DEST)
30920 #endif
30921 xor %eax,%eax
30922 EXIT
30923diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30924index 2322abe..1e78a75 100644
30925--- a/arch/x86/lib/rwsem.S
30926+++ b/arch/x86/lib/rwsem.S
30927@@ -92,6 +92,7 @@ ENTRY(call_rwsem_down_read_failed)
30928 call rwsem_down_read_failed
30929 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
30930 restore_common_regs
30931+ pax_force_retaddr
30932 ret
30933 CFI_ENDPROC
30934 ENDPROC(call_rwsem_down_read_failed)
30935@@ -102,6 +103,7 @@ ENTRY(call_rwsem_down_write_failed)
30936 movq %rax,%rdi
30937 call rwsem_down_write_failed
30938 restore_common_regs
30939+ pax_force_retaddr
30940 ret
30941 CFI_ENDPROC
30942 ENDPROC(call_rwsem_down_write_failed)
30943@@ -115,7 +117,8 @@ ENTRY(call_rwsem_wake)
30944 movq %rax,%rdi
30945 call rwsem_wake
30946 restore_common_regs
30947-1: ret
30948+1: pax_force_retaddr
30949+ ret
30950 CFI_ENDPROC
30951 ENDPROC(call_rwsem_wake)
30952
30953@@ -127,6 +130,7 @@ ENTRY(call_rwsem_downgrade_wake)
30954 call rwsem_downgrade_wake
30955 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
30956 restore_common_regs
30957+ pax_force_retaddr
30958 ret
30959 CFI_ENDPROC
30960 ENDPROC(call_rwsem_downgrade_wake)
30961diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30962index f89ba4e9..512b2de 100644
30963--- a/arch/x86/lib/thunk_64.S
30964+++ b/arch/x86/lib/thunk_64.S
30965@@ -9,6 +9,7 @@
30966 #include <asm/dwarf2.h>
30967 #include <asm/calling.h>
30968 #include <asm/asm.h>
30969+#include <asm/alternative-asm.h>
30970
30971 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30972 .macro THUNK name, func, put_ret_addr_in_rdi=0
30973@@ -69,6 +70,7 @@ restore:
30974 popq_cfi_reg rdx
30975 popq_cfi_reg rsi
30976 popq_cfi_reg rdi
30977+ pax_force_retaddr
30978 ret
30979 CFI_ENDPROC
30980 _ASM_NOKPROBE(restore)
30981diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c
30982index ddf9ecb..e342586 100644
30983--- a/arch/x86/lib/usercopy.c
30984+++ b/arch/x86/lib/usercopy.c
30985@@ -20,7 +20,7 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
30986 unsigned long ret;
30987
30988 if (__range_not_ok(from, n, TASK_SIZE))
30989- return 0;
30990+ return n;
30991
30992 /*
30993 * Even though this function is typically called from NMI/IRQ context
30994diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
30995index e2f5e21..4b22130 100644
30996--- a/arch/x86/lib/usercopy_32.c
30997+++ b/arch/x86/lib/usercopy_32.c
30998@@ -42,11 +42,13 @@ do { \
30999 int __d0; \
31000 might_fault(); \
31001 __asm__ __volatile__( \
31002+ __COPYUSER_SET_ES \
31003 ASM_STAC "\n" \
31004 "0: rep; stosl\n" \
31005 " movl %2,%0\n" \
31006 "1: rep; stosb\n" \
31007 "2: " ASM_CLAC "\n" \
31008+ __COPYUSER_RESTORE_ES \
31009 ".section .fixup,\"ax\"\n" \
31010 "3: lea 0(%2,%0,4),%0\n" \
31011 " jmp 2b\n" \
31012@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31013
31014 #ifdef CONFIG_X86_INTEL_USERCOPY
31015 static unsigned long
31016-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31017+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31018 {
31019 int d0, d1;
31020 __asm__ __volatile__(
31021@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31022 " .align 2,0x90\n"
31023 "3: movl 0(%4), %%eax\n"
31024 "4: movl 4(%4), %%edx\n"
31025- "5: movl %%eax, 0(%3)\n"
31026- "6: movl %%edx, 4(%3)\n"
31027+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31028+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31029 "7: movl 8(%4), %%eax\n"
31030 "8: movl 12(%4),%%edx\n"
31031- "9: movl %%eax, 8(%3)\n"
31032- "10: movl %%edx, 12(%3)\n"
31033+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31034+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31035 "11: movl 16(%4), %%eax\n"
31036 "12: movl 20(%4), %%edx\n"
31037- "13: movl %%eax, 16(%3)\n"
31038- "14: movl %%edx, 20(%3)\n"
31039+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31040+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31041 "15: movl 24(%4), %%eax\n"
31042 "16: movl 28(%4), %%edx\n"
31043- "17: movl %%eax, 24(%3)\n"
31044- "18: movl %%edx, 28(%3)\n"
31045+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31046+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31047 "19: movl 32(%4), %%eax\n"
31048 "20: movl 36(%4), %%edx\n"
31049- "21: movl %%eax, 32(%3)\n"
31050- "22: movl %%edx, 36(%3)\n"
31051+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31052+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31053 "23: movl 40(%4), %%eax\n"
31054 "24: movl 44(%4), %%edx\n"
31055- "25: movl %%eax, 40(%3)\n"
31056- "26: movl %%edx, 44(%3)\n"
31057+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31058+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31059 "27: movl 48(%4), %%eax\n"
31060 "28: movl 52(%4), %%edx\n"
31061- "29: movl %%eax, 48(%3)\n"
31062- "30: movl %%edx, 52(%3)\n"
31063+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31064+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31065 "31: movl 56(%4), %%eax\n"
31066 "32: movl 60(%4), %%edx\n"
31067- "33: movl %%eax, 56(%3)\n"
31068- "34: movl %%edx, 60(%3)\n"
31069+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31070+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31071 " addl $-64, %0\n"
31072 " addl $64, %4\n"
31073 " addl $64, %3\n"
31074@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31075 " shrl $2, %0\n"
31076 " andl $3, %%eax\n"
31077 " cld\n"
31078+ __COPYUSER_SET_ES
31079 "99: rep; movsl\n"
31080 "36: movl %%eax, %0\n"
31081 "37: rep; movsb\n"
31082 "100:\n"
31083+ __COPYUSER_RESTORE_ES
31084+ ".section .fixup,\"ax\"\n"
31085+ "101: lea 0(%%eax,%0,4),%0\n"
31086+ " jmp 100b\n"
31087+ ".previous\n"
31088+ _ASM_EXTABLE(1b,100b)
31089+ _ASM_EXTABLE(2b,100b)
31090+ _ASM_EXTABLE(3b,100b)
31091+ _ASM_EXTABLE(4b,100b)
31092+ _ASM_EXTABLE(5b,100b)
31093+ _ASM_EXTABLE(6b,100b)
31094+ _ASM_EXTABLE(7b,100b)
31095+ _ASM_EXTABLE(8b,100b)
31096+ _ASM_EXTABLE(9b,100b)
31097+ _ASM_EXTABLE(10b,100b)
31098+ _ASM_EXTABLE(11b,100b)
31099+ _ASM_EXTABLE(12b,100b)
31100+ _ASM_EXTABLE(13b,100b)
31101+ _ASM_EXTABLE(14b,100b)
31102+ _ASM_EXTABLE(15b,100b)
31103+ _ASM_EXTABLE(16b,100b)
31104+ _ASM_EXTABLE(17b,100b)
31105+ _ASM_EXTABLE(18b,100b)
31106+ _ASM_EXTABLE(19b,100b)
31107+ _ASM_EXTABLE(20b,100b)
31108+ _ASM_EXTABLE(21b,100b)
31109+ _ASM_EXTABLE(22b,100b)
31110+ _ASM_EXTABLE(23b,100b)
31111+ _ASM_EXTABLE(24b,100b)
31112+ _ASM_EXTABLE(25b,100b)
31113+ _ASM_EXTABLE(26b,100b)
31114+ _ASM_EXTABLE(27b,100b)
31115+ _ASM_EXTABLE(28b,100b)
31116+ _ASM_EXTABLE(29b,100b)
31117+ _ASM_EXTABLE(30b,100b)
31118+ _ASM_EXTABLE(31b,100b)
31119+ _ASM_EXTABLE(32b,100b)
31120+ _ASM_EXTABLE(33b,100b)
31121+ _ASM_EXTABLE(34b,100b)
31122+ _ASM_EXTABLE(35b,100b)
31123+ _ASM_EXTABLE(36b,100b)
31124+ _ASM_EXTABLE(37b,100b)
31125+ _ASM_EXTABLE(99b,101b)
31126+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31127+ : "1"(to), "2"(from), "0"(size)
31128+ : "eax", "edx", "memory");
31129+ return size;
31130+}
31131+
31132+static unsigned long
31133+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31134+{
31135+ int d0, d1;
31136+ __asm__ __volatile__(
31137+ " .align 2,0x90\n"
31138+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31139+ " cmpl $67, %0\n"
31140+ " jbe 3f\n"
31141+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31142+ " .align 2,0x90\n"
31143+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31144+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31145+ "5: movl %%eax, 0(%3)\n"
31146+ "6: movl %%edx, 4(%3)\n"
31147+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31148+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31149+ "9: movl %%eax, 8(%3)\n"
31150+ "10: movl %%edx, 12(%3)\n"
31151+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31152+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31153+ "13: movl %%eax, 16(%3)\n"
31154+ "14: movl %%edx, 20(%3)\n"
31155+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31156+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31157+ "17: movl %%eax, 24(%3)\n"
31158+ "18: movl %%edx, 28(%3)\n"
31159+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31160+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31161+ "21: movl %%eax, 32(%3)\n"
31162+ "22: movl %%edx, 36(%3)\n"
31163+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31164+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31165+ "25: movl %%eax, 40(%3)\n"
31166+ "26: movl %%edx, 44(%3)\n"
31167+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31168+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31169+ "29: movl %%eax, 48(%3)\n"
31170+ "30: movl %%edx, 52(%3)\n"
31171+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31172+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31173+ "33: movl %%eax, 56(%3)\n"
31174+ "34: movl %%edx, 60(%3)\n"
31175+ " addl $-64, %0\n"
31176+ " addl $64, %4\n"
31177+ " addl $64, %3\n"
31178+ " cmpl $63, %0\n"
31179+ " ja 1b\n"
31180+ "35: movl %0, %%eax\n"
31181+ " shrl $2, %0\n"
31182+ " andl $3, %%eax\n"
31183+ " cld\n"
31184+ "99: rep; "__copyuser_seg" movsl\n"
31185+ "36: movl %%eax, %0\n"
31186+ "37: rep; "__copyuser_seg" movsb\n"
31187+ "100:\n"
31188 ".section .fixup,\"ax\"\n"
31189 "101: lea 0(%%eax,%0,4),%0\n"
31190 " jmp 100b\n"
31191@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31192 int d0, d1;
31193 __asm__ __volatile__(
31194 " .align 2,0x90\n"
31195- "0: movl 32(%4), %%eax\n"
31196+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31197 " cmpl $67, %0\n"
31198 " jbe 2f\n"
31199- "1: movl 64(%4), %%eax\n"
31200+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31201 " .align 2,0x90\n"
31202- "2: movl 0(%4), %%eax\n"
31203- "21: movl 4(%4), %%edx\n"
31204+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31205+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31206 " movl %%eax, 0(%3)\n"
31207 " movl %%edx, 4(%3)\n"
31208- "3: movl 8(%4), %%eax\n"
31209- "31: movl 12(%4),%%edx\n"
31210+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31211+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31212 " movl %%eax, 8(%3)\n"
31213 " movl %%edx, 12(%3)\n"
31214- "4: movl 16(%4), %%eax\n"
31215- "41: movl 20(%4), %%edx\n"
31216+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31217+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31218 " movl %%eax, 16(%3)\n"
31219 " movl %%edx, 20(%3)\n"
31220- "10: movl 24(%4), %%eax\n"
31221- "51: movl 28(%4), %%edx\n"
31222+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31223+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31224 " movl %%eax, 24(%3)\n"
31225 " movl %%edx, 28(%3)\n"
31226- "11: movl 32(%4), %%eax\n"
31227- "61: movl 36(%4), %%edx\n"
31228+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31229+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31230 " movl %%eax, 32(%3)\n"
31231 " movl %%edx, 36(%3)\n"
31232- "12: movl 40(%4), %%eax\n"
31233- "71: movl 44(%4), %%edx\n"
31234+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31235+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31236 " movl %%eax, 40(%3)\n"
31237 " movl %%edx, 44(%3)\n"
31238- "13: movl 48(%4), %%eax\n"
31239- "81: movl 52(%4), %%edx\n"
31240+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31241+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31242 " movl %%eax, 48(%3)\n"
31243 " movl %%edx, 52(%3)\n"
31244- "14: movl 56(%4), %%eax\n"
31245- "91: movl 60(%4), %%edx\n"
31246+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31247+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31248 " movl %%eax, 56(%3)\n"
31249 " movl %%edx, 60(%3)\n"
31250 " addl $-64, %0\n"
31251@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31252 " shrl $2, %0\n"
31253 " andl $3, %%eax\n"
31254 " cld\n"
31255- "6: rep; movsl\n"
31256+ "6: rep; "__copyuser_seg" movsl\n"
31257 " movl %%eax,%0\n"
31258- "7: rep; movsb\n"
31259+ "7: rep; "__copyuser_seg" movsb\n"
31260 "8:\n"
31261 ".section .fixup,\"ax\"\n"
31262 "9: lea 0(%%eax,%0,4),%0\n"
31263@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31264
31265 __asm__ __volatile__(
31266 " .align 2,0x90\n"
31267- "0: movl 32(%4), %%eax\n"
31268+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31269 " cmpl $67, %0\n"
31270 " jbe 2f\n"
31271- "1: movl 64(%4), %%eax\n"
31272+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31273 " .align 2,0x90\n"
31274- "2: movl 0(%4), %%eax\n"
31275- "21: movl 4(%4), %%edx\n"
31276+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31277+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31278 " movnti %%eax, 0(%3)\n"
31279 " movnti %%edx, 4(%3)\n"
31280- "3: movl 8(%4), %%eax\n"
31281- "31: movl 12(%4),%%edx\n"
31282+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31283+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31284 " movnti %%eax, 8(%3)\n"
31285 " movnti %%edx, 12(%3)\n"
31286- "4: movl 16(%4), %%eax\n"
31287- "41: movl 20(%4), %%edx\n"
31288+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31289+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31290 " movnti %%eax, 16(%3)\n"
31291 " movnti %%edx, 20(%3)\n"
31292- "10: movl 24(%4), %%eax\n"
31293- "51: movl 28(%4), %%edx\n"
31294+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31295+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31296 " movnti %%eax, 24(%3)\n"
31297 " movnti %%edx, 28(%3)\n"
31298- "11: movl 32(%4), %%eax\n"
31299- "61: movl 36(%4), %%edx\n"
31300+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31301+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31302 " movnti %%eax, 32(%3)\n"
31303 " movnti %%edx, 36(%3)\n"
31304- "12: movl 40(%4), %%eax\n"
31305- "71: movl 44(%4), %%edx\n"
31306+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31307+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31308 " movnti %%eax, 40(%3)\n"
31309 " movnti %%edx, 44(%3)\n"
31310- "13: movl 48(%4), %%eax\n"
31311- "81: movl 52(%4), %%edx\n"
31312+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31313+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31314 " movnti %%eax, 48(%3)\n"
31315 " movnti %%edx, 52(%3)\n"
31316- "14: movl 56(%4), %%eax\n"
31317- "91: movl 60(%4), %%edx\n"
31318+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31319+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31320 " movnti %%eax, 56(%3)\n"
31321 " movnti %%edx, 60(%3)\n"
31322 " addl $-64, %0\n"
31323@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31324 " shrl $2, %0\n"
31325 " andl $3, %%eax\n"
31326 " cld\n"
31327- "6: rep; movsl\n"
31328+ "6: rep; "__copyuser_seg" movsl\n"
31329 " movl %%eax,%0\n"
31330- "7: rep; movsb\n"
31331+ "7: rep; "__copyuser_seg" movsb\n"
31332 "8:\n"
31333 ".section .fixup,\"ax\"\n"
31334 "9: lea 0(%%eax,%0,4),%0\n"
31335@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31336
31337 __asm__ __volatile__(
31338 " .align 2,0x90\n"
31339- "0: movl 32(%4), %%eax\n"
31340+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31341 " cmpl $67, %0\n"
31342 " jbe 2f\n"
31343- "1: movl 64(%4), %%eax\n"
31344+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31345 " .align 2,0x90\n"
31346- "2: movl 0(%4), %%eax\n"
31347- "21: movl 4(%4), %%edx\n"
31348+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31349+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31350 " movnti %%eax, 0(%3)\n"
31351 " movnti %%edx, 4(%3)\n"
31352- "3: movl 8(%4), %%eax\n"
31353- "31: movl 12(%4),%%edx\n"
31354+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31355+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31356 " movnti %%eax, 8(%3)\n"
31357 " movnti %%edx, 12(%3)\n"
31358- "4: movl 16(%4), %%eax\n"
31359- "41: movl 20(%4), %%edx\n"
31360+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31361+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31362 " movnti %%eax, 16(%3)\n"
31363 " movnti %%edx, 20(%3)\n"
31364- "10: movl 24(%4), %%eax\n"
31365- "51: movl 28(%4), %%edx\n"
31366+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31367+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31368 " movnti %%eax, 24(%3)\n"
31369 " movnti %%edx, 28(%3)\n"
31370- "11: movl 32(%4), %%eax\n"
31371- "61: movl 36(%4), %%edx\n"
31372+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31373+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31374 " movnti %%eax, 32(%3)\n"
31375 " movnti %%edx, 36(%3)\n"
31376- "12: movl 40(%4), %%eax\n"
31377- "71: movl 44(%4), %%edx\n"
31378+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31379+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31380 " movnti %%eax, 40(%3)\n"
31381 " movnti %%edx, 44(%3)\n"
31382- "13: movl 48(%4), %%eax\n"
31383- "81: movl 52(%4), %%edx\n"
31384+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31385+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31386 " movnti %%eax, 48(%3)\n"
31387 " movnti %%edx, 52(%3)\n"
31388- "14: movl 56(%4), %%eax\n"
31389- "91: movl 60(%4), %%edx\n"
31390+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31391+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31392 " movnti %%eax, 56(%3)\n"
31393 " movnti %%edx, 60(%3)\n"
31394 " addl $-64, %0\n"
31395@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31396 " shrl $2, %0\n"
31397 " andl $3, %%eax\n"
31398 " cld\n"
31399- "6: rep; movsl\n"
31400+ "6: rep; "__copyuser_seg" movsl\n"
31401 " movl %%eax,%0\n"
31402- "7: rep; movsb\n"
31403+ "7: rep; "__copyuser_seg" movsb\n"
31404 "8:\n"
31405 ".section .fixup,\"ax\"\n"
31406 "9: lea 0(%%eax,%0,4),%0\n"
31407@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31408 */
31409 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31410 unsigned long size);
31411-unsigned long __copy_user_intel(void __user *to, const void *from,
31412+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31413+ unsigned long size);
31414+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31415 unsigned long size);
31416 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31417 const void __user *from, unsigned long size);
31418 #endif /* CONFIG_X86_INTEL_USERCOPY */
31419
31420 /* Generic arbitrary sized copy. */
31421-#define __copy_user(to, from, size) \
31422+#define __copy_user(to, from, size, prefix, set, restore) \
31423 do { \
31424 int __d0, __d1, __d2; \
31425 __asm__ __volatile__( \
31426+ set \
31427 " cmp $7,%0\n" \
31428 " jbe 1f\n" \
31429 " movl %1,%0\n" \
31430 " negl %0\n" \
31431 " andl $7,%0\n" \
31432 " subl %0,%3\n" \
31433- "4: rep; movsb\n" \
31434+ "4: rep; "prefix"movsb\n" \
31435 " movl %3,%0\n" \
31436 " shrl $2,%0\n" \
31437 " andl $3,%3\n" \
31438 " .align 2,0x90\n" \
31439- "0: rep; movsl\n" \
31440+ "0: rep; "prefix"movsl\n" \
31441 " movl %3,%0\n" \
31442- "1: rep; movsb\n" \
31443+ "1: rep; "prefix"movsb\n" \
31444 "2:\n" \
31445+ restore \
31446 ".section .fixup,\"ax\"\n" \
31447 "5: addl %3,%0\n" \
31448 " jmp 2b\n" \
31449@@ -538,14 +650,14 @@ do { \
31450 " negl %0\n" \
31451 " andl $7,%0\n" \
31452 " subl %0,%3\n" \
31453- "4: rep; movsb\n" \
31454+ "4: rep; "__copyuser_seg"movsb\n" \
31455 " movl %3,%0\n" \
31456 " shrl $2,%0\n" \
31457 " andl $3,%3\n" \
31458 " .align 2,0x90\n" \
31459- "0: rep; movsl\n" \
31460+ "0: rep; "__copyuser_seg"movsl\n" \
31461 " movl %3,%0\n" \
31462- "1: rep; movsb\n" \
31463+ "1: rep; "__copyuser_seg"movsb\n" \
31464 "2:\n" \
31465 ".section .fixup,\"ax\"\n" \
31466 "5: addl %3,%0\n" \
31467@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31468 {
31469 stac();
31470 if (movsl_is_ok(to, from, n))
31471- __copy_user(to, from, n);
31472+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31473 else
31474- n = __copy_user_intel(to, from, n);
31475+ n = __generic_copy_to_user_intel(to, from, n);
31476 clac();
31477 return n;
31478 }
31479@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31480 {
31481 stac();
31482 if (movsl_is_ok(to, from, n))
31483- __copy_user(to, from, n);
31484+ __copy_user(to, from, n, __copyuser_seg, "", "");
31485 else
31486- n = __copy_user_intel((void __user *)to,
31487- (const void *)from, n);
31488+ n = __generic_copy_from_user_intel(to, from, n);
31489 clac();
31490 return n;
31491 }
31492@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31493 if (n > 64 && cpu_has_xmm2)
31494 n = __copy_user_intel_nocache(to, from, n);
31495 else
31496- __copy_user(to, from, n);
31497+ __copy_user(to, from, n, __copyuser_seg, "", "");
31498 #else
31499- __copy_user(to, from, n);
31500+ __copy_user(to, from, n, __copyuser_seg, "", "");
31501 #endif
31502 clac();
31503 return n;
31504 }
31505 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31506
31507-/**
31508- * copy_to_user: - Copy a block of data into user space.
31509- * @to: Destination address, in user space.
31510- * @from: Source address, in kernel space.
31511- * @n: Number of bytes to copy.
31512- *
31513- * Context: User context only. This function may sleep.
31514- *
31515- * Copy data from kernel space to user space.
31516- *
31517- * Returns number of bytes that could not be copied.
31518- * On success, this will be zero.
31519- */
31520-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31521+#ifdef CONFIG_PAX_MEMORY_UDEREF
31522+void __set_fs(mm_segment_t x)
31523 {
31524- if (access_ok(VERIFY_WRITE, to, n))
31525- n = __copy_to_user(to, from, n);
31526- return n;
31527+ switch (x.seg) {
31528+ case 0:
31529+ loadsegment(gs, 0);
31530+ break;
31531+ case TASK_SIZE_MAX:
31532+ loadsegment(gs, __USER_DS);
31533+ break;
31534+ case -1UL:
31535+ loadsegment(gs, __KERNEL_DS);
31536+ break;
31537+ default:
31538+ BUG();
31539+ }
31540 }
31541-EXPORT_SYMBOL(_copy_to_user);
31542+EXPORT_SYMBOL(__set_fs);
31543
31544-/**
31545- * copy_from_user: - Copy a block of data from user space.
31546- * @to: Destination address, in kernel space.
31547- * @from: Source address, in user space.
31548- * @n: Number of bytes to copy.
31549- *
31550- * Context: User context only. This function may sleep.
31551- *
31552- * Copy data from user space to kernel space.
31553- *
31554- * Returns number of bytes that could not be copied.
31555- * On success, this will be zero.
31556- *
31557- * If some data could not be copied, this function will pad the copied
31558- * data to the requested size using zero bytes.
31559- */
31560-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31561+void set_fs(mm_segment_t x)
31562 {
31563- if (access_ok(VERIFY_READ, from, n))
31564- n = __copy_from_user(to, from, n);
31565- else
31566- memset(to, 0, n);
31567- return n;
31568+ current_thread_info()->addr_limit = x;
31569+ __set_fs(x);
31570 }
31571-EXPORT_SYMBOL(_copy_from_user);
31572+EXPORT_SYMBOL(set_fs);
31573+#endif
31574diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31575index 0a42327..7a82465 100644
31576--- a/arch/x86/lib/usercopy_64.c
31577+++ b/arch/x86/lib/usercopy_64.c
31578@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31579 might_fault();
31580 /* no memory constraint because it doesn't change any memory gcc knows
31581 about */
31582+ pax_open_userland();
31583 stac();
31584 asm volatile(
31585 " testq %[size8],%[size8]\n"
31586@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31587 _ASM_EXTABLE(0b,3b)
31588 _ASM_EXTABLE(1b,2b)
31589 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31590- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31591+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31592 [zero] "r" (0UL), [eight] "r" (8UL));
31593 clac();
31594+ pax_close_userland();
31595 return size;
31596 }
31597 EXPORT_SYMBOL(__clear_user);
31598@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31599 }
31600 EXPORT_SYMBOL(clear_user);
31601
31602-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31603+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31604 {
31605- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31606- return copy_user_generic((__force void *)to, (__force void *)from, len);
31607- }
31608- return len;
31609+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31610+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31611+ return len;
31612 }
31613 EXPORT_SYMBOL(copy_in_user);
31614
31615@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31616 * it is not necessary to optimize tail handling.
31617 */
31618 __visible unsigned long
31619-copy_user_handle_tail(char *to, char *from, unsigned len)
31620+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31621 {
31622+ clac();
31623+ pax_close_userland();
31624 for (; len; --len, to++) {
31625 char c;
31626
31627@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31628 if (__put_user_nocheck(c, to, sizeof(char)))
31629 break;
31630 }
31631- clac();
31632
31633 /* If the destination is a kernel buffer, we always clear the end */
31634- if (!__addr_ok(to))
31635+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
31636 memset(to, 0, len);
31637 return len;
31638 }
31639diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31640index a482d10..1a6edb5 100644
31641--- a/arch/x86/mm/Makefile
31642+++ b/arch/x86/mm/Makefile
31643@@ -33,3 +33,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31644 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31645
31646 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31647+
31648+quote:="
31649+obj-$(CONFIG_X86_64) += uderef_64.o
31650+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) -fcall-saved-rax
31651diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31652index 903ec1e..c4166b2 100644
31653--- a/arch/x86/mm/extable.c
31654+++ b/arch/x86/mm/extable.c
31655@@ -6,12 +6,24 @@
31656 static inline unsigned long
31657 ex_insn_addr(const struct exception_table_entry *x)
31658 {
31659- return (unsigned long)&x->insn + x->insn;
31660+ unsigned long reloc = 0;
31661+
31662+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31663+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31664+#endif
31665+
31666+ return (unsigned long)&x->insn + x->insn + reloc;
31667 }
31668 static inline unsigned long
31669 ex_fixup_addr(const struct exception_table_entry *x)
31670 {
31671- return (unsigned long)&x->fixup + x->fixup;
31672+ unsigned long reloc = 0;
31673+
31674+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31675+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31676+#endif
31677+
31678+ return (unsigned long)&x->fixup + x->fixup + reloc;
31679 }
31680
31681 int fixup_exception(struct pt_regs *regs)
31682@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31683 unsigned long new_ip;
31684
31685 #ifdef CONFIG_PNPBIOS
31686- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31687+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31688 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31689 extern u32 pnp_bios_is_utter_crap;
31690 pnp_bios_is_utter_crap = 1;
31691@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31692 i += 4;
31693 p->fixup -= i;
31694 i += 4;
31695+
31696+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31697+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31698+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31699+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31700+#endif
31701+
31702 }
31703 }
31704
31705diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31706index 181c53b..d336596 100644
31707--- a/arch/x86/mm/fault.c
31708+++ b/arch/x86/mm/fault.c
31709@@ -13,12 +13,19 @@
31710 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31711 #include <linux/prefetch.h> /* prefetchw */
31712 #include <linux/context_tracking.h> /* exception_enter(), ... */
31713+#include <linux/unistd.h>
31714+#include <linux/compiler.h>
31715
31716 #include <asm/traps.h> /* dotraplinkage, ... */
31717 #include <asm/pgalloc.h> /* pgd_*(), ... */
31718 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31719 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31720 #include <asm/vsyscall.h> /* emulate_vsyscall */
31721+#include <asm/tlbflush.h>
31722+
31723+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31724+#include <asm/stacktrace.h>
31725+#endif
31726
31727 #define CREATE_TRACE_POINTS
31728 #include <asm/trace/exceptions.h>
31729@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31730 return !instr_lo || (instr_lo>>1) == 1;
31731 case 0x00:
31732 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31733- if (probe_kernel_address(instr, opcode))
31734+ if (user_mode(regs)) {
31735+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31736+ return 0;
31737+ } else if (probe_kernel_address(instr, opcode))
31738 return 0;
31739
31740 *prefetch = (instr_lo == 0xF) &&
31741@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31742 while (instr < max_instr) {
31743 unsigned char opcode;
31744
31745- if (probe_kernel_address(instr, opcode))
31746+ if (user_mode(regs)) {
31747+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31748+ break;
31749+ } else if (probe_kernel_address(instr, opcode))
31750 break;
31751
31752 instr++;
31753@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31754 force_sig_info(si_signo, &info, tsk);
31755 }
31756
31757+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31758+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31759+#endif
31760+
31761+#ifdef CONFIG_PAX_EMUTRAMP
31762+static int pax_handle_fetch_fault(struct pt_regs *regs);
31763+#endif
31764+
31765+#ifdef CONFIG_PAX_PAGEEXEC
31766+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31767+{
31768+ pgd_t *pgd;
31769+ pud_t *pud;
31770+ pmd_t *pmd;
31771+
31772+ pgd = pgd_offset(mm, address);
31773+ if (!pgd_present(*pgd))
31774+ return NULL;
31775+ pud = pud_offset(pgd, address);
31776+ if (!pud_present(*pud))
31777+ return NULL;
31778+ pmd = pmd_offset(pud, address);
31779+ if (!pmd_present(*pmd))
31780+ return NULL;
31781+ return pmd;
31782+}
31783+#endif
31784+
31785 DEFINE_SPINLOCK(pgd_lock);
31786 LIST_HEAD(pgd_list);
31787
31788@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31789 for (address = VMALLOC_START & PMD_MASK;
31790 address >= TASK_SIZE && address < FIXADDR_TOP;
31791 address += PMD_SIZE) {
31792+
31793+#ifdef CONFIG_PAX_PER_CPU_PGD
31794+ unsigned long cpu;
31795+#else
31796 struct page *page;
31797+#endif
31798
31799 spin_lock(&pgd_lock);
31800+
31801+#ifdef CONFIG_PAX_PER_CPU_PGD
31802+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31803+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31804+ pmd_t *ret;
31805+
31806+ ret = vmalloc_sync_one(pgd, address);
31807+ if (!ret)
31808+ break;
31809+ pgd = get_cpu_pgd(cpu, kernel);
31810+#else
31811 list_for_each_entry(page, &pgd_list, lru) {
31812+ pgd_t *pgd;
31813 spinlock_t *pgt_lock;
31814 pmd_t *ret;
31815
31816@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31817 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31818
31819 spin_lock(pgt_lock);
31820- ret = vmalloc_sync_one(page_address(page), address);
31821+ pgd = page_address(page);
31822+#endif
31823+
31824+ ret = vmalloc_sync_one(pgd, address);
31825+
31826+#ifndef CONFIG_PAX_PER_CPU_PGD
31827 spin_unlock(pgt_lock);
31828+#endif
31829
31830 if (!ret)
31831 break;
31832@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31833 * an interrupt in the middle of a task switch..
31834 */
31835 pgd_paddr = read_cr3();
31836+
31837+#ifdef CONFIG_PAX_PER_CPU_PGD
31838+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31839+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31840+#endif
31841+
31842 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31843 if (!pmd_k)
31844 return -1;
31845@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31846 * happen within a race in page table update. In the later
31847 * case just flush:
31848 */
31849- pgd = pgd_offset(current->active_mm, address);
31850+
31851 pgd_ref = pgd_offset_k(address);
31852 if (pgd_none(*pgd_ref))
31853 return -1;
31854
31855+#ifdef CONFIG_PAX_PER_CPU_PGD
31856+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31857+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31858+ if (pgd_none(*pgd)) {
31859+ set_pgd(pgd, *pgd_ref);
31860+ arch_flush_lazy_mmu_mode();
31861+ } else {
31862+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31863+ }
31864+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31865+#else
31866+ pgd = pgd_offset(current->active_mm, address);
31867+#endif
31868+
31869 if (pgd_none(*pgd)) {
31870 set_pgd(pgd, *pgd_ref);
31871 arch_flush_lazy_mmu_mode();
31872@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31873 static int is_errata100(struct pt_regs *regs, unsigned long address)
31874 {
31875 #ifdef CONFIG_X86_64
31876- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31877+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31878 return 1;
31879 #endif
31880 return 0;
31881@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31882 }
31883
31884 static const char nx_warning[] = KERN_CRIT
31885-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31886+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31887 static const char smep_warning[] = KERN_CRIT
31888-"unable to execute userspace code (SMEP?) (uid: %d)\n";
31889+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31890
31891 static void
31892 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31893@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31894 if (!oops_may_print())
31895 return;
31896
31897- if (error_code & PF_INSTR) {
31898+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31899 unsigned int level;
31900 pgd_t *pgd;
31901 pte_t *pte;
31902@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31903 pte = lookup_address_in_pgd(pgd, address, &level);
31904
31905 if (pte && pte_present(*pte) && !pte_exec(*pte))
31906- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31907+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31908 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31909 (pgd_flags(*pgd) & _PAGE_USER) &&
31910 (__read_cr4() & X86_CR4_SMEP))
31911- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31912+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31913 }
31914
31915+#ifdef CONFIG_PAX_KERNEXEC
31916+ if (init_mm.start_code <= address && address < init_mm.end_code) {
31917+ if (current->signal->curr_ip)
31918+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31919+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
31920+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31921+ else
31922+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31923+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31924+ }
31925+#endif
31926+
31927 printk(KERN_ALERT "BUG: unable to handle kernel ");
31928 if (address < PAGE_SIZE)
31929 printk(KERN_CONT "NULL pointer dereference");
31930@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31931 return;
31932 }
31933 #endif
31934+
31935+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31936+ if (pax_is_fetch_fault(regs, error_code, address)) {
31937+
31938+#ifdef CONFIG_PAX_EMUTRAMP
31939+ switch (pax_handle_fetch_fault(regs)) {
31940+ case 2:
31941+ return;
31942+ }
31943+#endif
31944+
31945+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31946+ do_group_exit(SIGKILL);
31947+ }
31948+#endif
31949+
31950 /* Kernel addresses are always protection faults: */
31951 if (address >= TASK_SIZE)
31952 error_code |= PF_PROT;
31953@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31954 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31955 printk(KERN_ERR
31956 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31957- tsk->comm, tsk->pid, address);
31958+ tsk->comm, task_pid_nr(tsk), address);
31959 code = BUS_MCEERR_AR;
31960 }
31961 #endif
31962@@ -916,6 +1028,107 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31963 return 1;
31964 }
31965
31966+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31967+static inline unsigned long get_limit(unsigned long segment)
31968+{
31969+ unsigned long __limit;
31970+
31971+ asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
31972+ return __limit + 1;
31973+}
31974+
31975+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
31976+{
31977+ pte_t *pte;
31978+ pmd_t *pmd;
31979+ spinlock_t *ptl;
31980+ unsigned char pte_mask;
31981+
31982+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
31983+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
31984+ return 0;
31985+
31986+ /* PaX: it's our fault, let's handle it if we can */
31987+
31988+ /* PaX: take a look at read faults before acquiring any locks */
31989+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
31990+ /* instruction fetch attempt from a protected page in user mode */
31991+ up_read(&mm->mmap_sem);
31992+
31993+#ifdef CONFIG_PAX_EMUTRAMP
31994+ switch (pax_handle_fetch_fault(regs)) {
31995+ case 2:
31996+ return 1;
31997+ }
31998+#endif
31999+
32000+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32001+ do_group_exit(SIGKILL);
32002+ }
32003+
32004+ pmd = pax_get_pmd(mm, address);
32005+ if (unlikely(!pmd))
32006+ return 0;
32007+
32008+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32009+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32010+ pte_unmap_unlock(pte, ptl);
32011+ return 0;
32012+ }
32013+
32014+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32015+ /* write attempt to a protected page in user mode */
32016+ pte_unmap_unlock(pte, ptl);
32017+ return 0;
32018+ }
32019+
32020+#ifdef CONFIG_SMP
32021+ if (likely(address > get_limit(regs->cs) && cpumask_test_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask)))
32022+#else
32023+ if (likely(address > get_limit(regs->cs)))
32024+#endif
32025+ {
32026+ set_pte(pte, pte_mkread(*pte));
32027+ __flush_tlb_one(address);
32028+ pte_unmap_unlock(pte, ptl);
32029+ up_read(&mm->mmap_sem);
32030+ return 1;
32031+ }
32032+
32033+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32034+
32035+ /*
32036+ * PaX: fill DTLB with user rights and retry
32037+ */
32038+ __asm__ __volatile__ (
32039+ "orb %2,(%1)\n"
32040+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32041+/*
32042+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32043+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32044+ * page fault when examined during a TLB load attempt. this is true not only
32045+ * for PTEs holding a non-present entry but also present entries that will
32046+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32047+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32048+ * for our target pages since their PTEs are simply not in the TLBs at all.
32049+
32050+ * the best thing in omitting it is that we gain around 15-20% speed in the
32051+ * fast path of the page fault handler and can get rid of tracing since we
32052+ * can no longer flush unintended entries.
32053+ */
32054+ "invlpg (%0)\n"
32055+#endif
32056+ __copyuser_seg"testb $0,(%0)\n"
32057+ "xorb %3,(%1)\n"
32058+ :
32059+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32060+ : "memory", "cc");
32061+ pte_unmap_unlock(pte, ptl);
32062+ up_read(&mm->mmap_sem);
32063+ return 1;
32064+}
32065+#endif
32066+
32067 /*
32068 * Handle a spurious fault caused by a stale TLB entry.
32069 *
32070@@ -1001,6 +1214,9 @@ int show_unhandled_signals = 1;
32071 static inline int
32072 access_error(unsigned long error_code, struct vm_area_struct *vma)
32073 {
32074+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32075+ return 1;
32076+
32077 if (error_code & PF_WRITE) {
32078 /* write, present and write, not present: */
32079 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32080@@ -1063,6 +1279,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32081 tsk = current;
32082 mm = tsk->mm;
32083
32084+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32085+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32086+ if (!search_exception_tables(regs->ip)) {
32087+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32088+ bad_area_nosemaphore(regs, error_code, address);
32089+ return;
32090+ }
32091+ if (address < pax_user_shadow_base) {
32092+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32093+ printk(KERN_EMERG "PAX: faulting IP: %pS\n", (void *)regs->ip);
32094+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_EMERG);
32095+ } else
32096+ address -= pax_user_shadow_base;
32097+ }
32098+#endif
32099+
32100 /*
32101 * Detect and handle instructions that would cause a page fault for
32102 * both a tracked kernel page and a userspace page.
32103@@ -1187,6 +1419,11 @@ retry:
32104 might_sleep();
32105 }
32106
32107+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32108+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32109+ return;
32110+#endif
32111+
32112 vma = find_vma(mm, address);
32113 if (unlikely(!vma)) {
32114 bad_area(regs, error_code, address);
32115@@ -1198,18 +1435,24 @@ retry:
32116 bad_area(regs, error_code, address);
32117 return;
32118 }
32119- if (error_code & PF_USER) {
32120- /*
32121- * Accessing the stack below %sp is always a bug.
32122- * The large cushion allows instructions like enter
32123- * and pusha to work. ("enter $65535, $31" pushes
32124- * 32 pointers and then decrements %sp by 65535.)
32125- */
32126- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32127- bad_area(regs, error_code, address);
32128- return;
32129- }
32130+ /*
32131+ * Accessing the stack below %sp is always a bug.
32132+ * The large cushion allows instructions like enter
32133+ * and pusha to work. ("enter $65535, $31" pushes
32134+ * 32 pointers and then decrements %sp by 65535.)
32135+ */
32136+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32137+ bad_area(regs, error_code, address);
32138+ return;
32139 }
32140+
32141+#ifdef CONFIG_PAX_SEGMEXEC
32142+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32143+ bad_area(regs, error_code, address);
32144+ return;
32145+ }
32146+#endif
32147+
32148 if (unlikely(expand_stack(vma, address))) {
32149 bad_area(regs, error_code, address);
32150 return;
32151@@ -1329,3 +1572,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32152 }
32153 NOKPROBE_SYMBOL(trace_do_page_fault);
32154 #endif /* CONFIG_TRACING */
32155+
32156+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32157+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32158+{
32159+ struct mm_struct *mm = current->mm;
32160+ unsigned long ip = regs->ip;
32161+
32162+ if (v8086_mode(regs))
32163+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32164+
32165+#ifdef CONFIG_PAX_PAGEEXEC
32166+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32167+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32168+ return true;
32169+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32170+ return true;
32171+ return false;
32172+ }
32173+#endif
32174+
32175+#ifdef CONFIG_PAX_SEGMEXEC
32176+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32177+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32178+ return true;
32179+ return false;
32180+ }
32181+#endif
32182+
32183+ return false;
32184+}
32185+#endif
32186+
32187+#ifdef CONFIG_PAX_EMUTRAMP
32188+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32189+{
32190+ int err;
32191+
32192+ do { /* PaX: libffi trampoline emulation */
32193+ unsigned char mov, jmp;
32194+ unsigned int addr1, addr2;
32195+
32196+#ifdef CONFIG_X86_64
32197+ if ((regs->ip + 9) >> 32)
32198+ break;
32199+#endif
32200+
32201+ err = get_user(mov, (unsigned char __user *)regs->ip);
32202+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32203+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32204+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32205+
32206+ if (err)
32207+ break;
32208+
32209+ if (mov == 0xB8 && jmp == 0xE9) {
32210+ regs->ax = addr1;
32211+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32212+ return 2;
32213+ }
32214+ } while (0);
32215+
32216+ do { /* PaX: gcc trampoline emulation #1 */
32217+ unsigned char mov1, mov2;
32218+ unsigned short jmp;
32219+ unsigned int addr1, addr2;
32220+
32221+#ifdef CONFIG_X86_64
32222+ if ((regs->ip + 11) >> 32)
32223+ break;
32224+#endif
32225+
32226+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32227+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32228+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32229+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32230+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32231+
32232+ if (err)
32233+ break;
32234+
32235+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32236+ regs->cx = addr1;
32237+ regs->ax = addr2;
32238+ regs->ip = addr2;
32239+ return 2;
32240+ }
32241+ } while (0);
32242+
32243+ do { /* PaX: gcc trampoline emulation #2 */
32244+ unsigned char mov, jmp;
32245+ unsigned int addr1, addr2;
32246+
32247+#ifdef CONFIG_X86_64
32248+ if ((regs->ip + 9) >> 32)
32249+ break;
32250+#endif
32251+
32252+ err = get_user(mov, (unsigned char __user *)regs->ip);
32253+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32254+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32255+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32256+
32257+ if (err)
32258+ break;
32259+
32260+ if (mov == 0xB9 && jmp == 0xE9) {
32261+ regs->cx = addr1;
32262+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32263+ return 2;
32264+ }
32265+ } while (0);
32266+
32267+ return 1; /* PaX in action */
32268+}
32269+
32270+#ifdef CONFIG_X86_64
32271+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32272+{
32273+ int err;
32274+
32275+ do { /* PaX: libffi trampoline emulation */
32276+ unsigned short mov1, mov2, jmp1;
32277+ unsigned char stcclc, jmp2;
32278+ unsigned long addr1, addr2;
32279+
32280+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32281+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32282+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32283+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32284+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32285+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32286+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32287+
32288+ if (err)
32289+ break;
32290+
32291+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32292+ regs->r11 = addr1;
32293+ regs->r10 = addr2;
32294+ if (stcclc == 0xF8)
32295+ regs->flags &= ~X86_EFLAGS_CF;
32296+ else
32297+ regs->flags |= X86_EFLAGS_CF;
32298+ regs->ip = addr1;
32299+ return 2;
32300+ }
32301+ } while (0);
32302+
32303+ do { /* PaX: gcc trampoline emulation #1 */
32304+ unsigned short mov1, mov2, jmp1;
32305+ unsigned char jmp2;
32306+ unsigned int addr1;
32307+ unsigned long addr2;
32308+
32309+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32310+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32311+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32312+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32313+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32314+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32315+
32316+ if (err)
32317+ break;
32318+
32319+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32320+ regs->r11 = addr1;
32321+ regs->r10 = addr2;
32322+ regs->ip = addr1;
32323+ return 2;
32324+ }
32325+ } while (0);
32326+
32327+ do { /* PaX: gcc trampoline emulation #2 */
32328+ unsigned short mov1, mov2, jmp1;
32329+ unsigned char jmp2;
32330+ unsigned long addr1, addr2;
32331+
32332+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32333+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32334+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32335+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32336+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32337+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32338+
32339+ if (err)
32340+ break;
32341+
32342+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32343+ regs->r11 = addr1;
32344+ regs->r10 = addr2;
32345+ regs->ip = addr1;
32346+ return 2;
32347+ }
32348+ } while (0);
32349+
32350+ return 1; /* PaX in action */
32351+}
32352+#endif
32353+
32354+/*
32355+ * PaX: decide what to do with offenders (regs->ip = fault address)
32356+ *
32357+ * returns 1 when task should be killed
32358+ * 2 when gcc trampoline was detected
32359+ */
32360+static int pax_handle_fetch_fault(struct pt_regs *regs)
32361+{
32362+ if (v8086_mode(regs))
32363+ return 1;
32364+
32365+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32366+ return 1;
32367+
32368+#ifdef CONFIG_X86_32
32369+ return pax_handle_fetch_fault_32(regs);
32370+#else
32371+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32372+ return pax_handle_fetch_fault_32(regs);
32373+ else
32374+ return pax_handle_fetch_fault_64(regs);
32375+#endif
32376+}
32377+#endif
32378+
32379+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32380+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32381+{
32382+ long i;
32383+
32384+ printk(KERN_ERR "PAX: bytes at PC: ");
32385+ for (i = 0; i < 20; i++) {
32386+ unsigned char c;
32387+ if (get_user(c, (unsigned char __force_user *)pc+i))
32388+ printk(KERN_CONT "?? ");
32389+ else
32390+ printk(KERN_CONT "%02x ", c);
32391+ }
32392+ printk("\n");
32393+
32394+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32395+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32396+ unsigned long c;
32397+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32398+#ifdef CONFIG_X86_32
32399+ printk(KERN_CONT "???????? ");
32400+#else
32401+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32402+ printk(KERN_CONT "???????? ???????? ");
32403+ else
32404+ printk(KERN_CONT "???????????????? ");
32405+#endif
32406+ } else {
32407+#ifdef CONFIG_X86_64
32408+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32409+ printk(KERN_CONT "%08x ", (unsigned int)c);
32410+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32411+ } else
32412+#endif
32413+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32414+ }
32415+ }
32416+ printk("\n");
32417+}
32418+#endif
32419+
32420+/**
32421+ * probe_kernel_write(): safely attempt to write to a location
32422+ * @dst: address to write to
32423+ * @src: pointer to the data that shall be written
32424+ * @size: size of the data chunk
32425+ *
32426+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32427+ * happens, handle that and return -EFAULT.
32428+ */
32429+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32430+{
32431+ long ret;
32432+ mm_segment_t old_fs = get_fs();
32433+
32434+ set_fs(KERNEL_DS);
32435+ pagefault_disable();
32436+ pax_open_kernel();
32437+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32438+ pax_close_kernel();
32439+ pagefault_enable();
32440+ set_fs(old_fs);
32441+
32442+ return ret ? -EFAULT : 0;
32443+}
32444diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32445index 81bf3d2..7ef25c2 100644
32446--- a/arch/x86/mm/gup.c
32447+++ b/arch/x86/mm/gup.c
32448@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32449 addr = start;
32450 len = (unsigned long) nr_pages << PAGE_SHIFT;
32451 end = start + len;
32452- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32453+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32454 (void __user *)start, len)))
32455 return 0;
32456
32457@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32458 goto slow_irqon;
32459 #endif
32460
32461+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32462+ (void __user *)start, len)))
32463+ return 0;
32464+
32465 /*
32466 * XXX: batch / limit 'nr', to avoid large irq off latency
32467 * needs some instrumenting to determine the common sizes used by
32468diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32469index 4500142..53a363c 100644
32470--- a/arch/x86/mm/highmem_32.c
32471+++ b/arch/x86/mm/highmem_32.c
32472@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32473 idx = type + KM_TYPE_NR*smp_processor_id();
32474 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32475 BUG_ON(!pte_none(*(kmap_pte-idx)));
32476+
32477+ pax_open_kernel();
32478 set_pte(kmap_pte-idx, mk_pte(page, prot));
32479+ pax_close_kernel();
32480+
32481 arch_flush_lazy_mmu_mode();
32482
32483 return (void *)vaddr;
32484diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32485index 42982b2..7168fc3 100644
32486--- a/arch/x86/mm/hugetlbpage.c
32487+++ b/arch/x86/mm/hugetlbpage.c
32488@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32489 #ifdef CONFIG_HUGETLB_PAGE
32490 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32491 unsigned long addr, unsigned long len,
32492- unsigned long pgoff, unsigned long flags)
32493+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32494 {
32495 struct hstate *h = hstate_file(file);
32496 struct vm_unmapped_area_info info;
32497-
32498+
32499 info.flags = 0;
32500 info.length = len;
32501 info.low_limit = current->mm->mmap_legacy_base;
32502 info.high_limit = TASK_SIZE;
32503 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32504 info.align_offset = 0;
32505+ info.threadstack_offset = offset;
32506 return vm_unmapped_area(&info);
32507 }
32508
32509 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32510 unsigned long addr0, unsigned long len,
32511- unsigned long pgoff, unsigned long flags)
32512+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32513 {
32514 struct hstate *h = hstate_file(file);
32515 struct vm_unmapped_area_info info;
32516@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32517 info.high_limit = current->mm->mmap_base;
32518 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32519 info.align_offset = 0;
32520+ info.threadstack_offset = offset;
32521 addr = vm_unmapped_area(&info);
32522
32523 /*
32524@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32525 VM_BUG_ON(addr != -ENOMEM);
32526 info.flags = 0;
32527 info.low_limit = TASK_UNMAPPED_BASE;
32528+
32529+#ifdef CONFIG_PAX_RANDMMAP
32530+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32531+ info.low_limit += current->mm->delta_mmap;
32532+#endif
32533+
32534 info.high_limit = TASK_SIZE;
32535 addr = vm_unmapped_area(&info);
32536 }
32537@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32538 struct hstate *h = hstate_file(file);
32539 struct mm_struct *mm = current->mm;
32540 struct vm_area_struct *vma;
32541+ unsigned long pax_task_size = TASK_SIZE;
32542+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32543
32544 if (len & ~huge_page_mask(h))
32545 return -EINVAL;
32546- if (len > TASK_SIZE)
32547+
32548+#ifdef CONFIG_PAX_SEGMEXEC
32549+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32550+ pax_task_size = SEGMEXEC_TASK_SIZE;
32551+#endif
32552+
32553+ pax_task_size -= PAGE_SIZE;
32554+
32555+ if (len > pax_task_size)
32556 return -ENOMEM;
32557
32558 if (flags & MAP_FIXED) {
32559@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32560 return addr;
32561 }
32562
32563+#ifdef CONFIG_PAX_RANDMMAP
32564+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32565+#endif
32566+
32567 if (addr) {
32568 addr = ALIGN(addr, huge_page_size(h));
32569 vma = find_vma(mm, addr);
32570- if (TASK_SIZE - len >= addr &&
32571- (!vma || addr + len <= vma->vm_start))
32572+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32573 return addr;
32574 }
32575 if (mm->get_unmapped_area == arch_get_unmapped_area)
32576 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32577- pgoff, flags);
32578+ pgoff, flags, offset);
32579 else
32580 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32581- pgoff, flags);
32582+ pgoff, flags, offset);
32583 }
32584 #endif /* CONFIG_HUGETLB_PAGE */
32585
32586diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32587index 1d55318..d58fd6a 100644
32588--- a/arch/x86/mm/init.c
32589+++ b/arch/x86/mm/init.c
32590@@ -4,6 +4,7 @@
32591 #include <linux/swap.h>
32592 #include <linux/memblock.h>
32593 #include <linux/bootmem.h> /* for max_low_pfn */
32594+#include <linux/tboot.h>
32595
32596 #include <asm/cacheflush.h>
32597 #include <asm/e820.h>
32598@@ -17,6 +18,8 @@
32599 #include <asm/proto.h>
32600 #include <asm/dma.h> /* for MAX_DMA_PFN */
32601 #include <asm/microcode.h>
32602+#include <asm/desc.h>
32603+#include <asm/bios_ebda.h>
32604
32605 /*
32606 * We need to define the tracepoints somewhere, and tlb.c
32607@@ -615,7 +618,18 @@ void __init init_mem_mapping(void)
32608 early_ioremap_page_table_range_init();
32609 #endif
32610
32611+#ifdef CONFIG_PAX_PER_CPU_PGD
32612+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32613+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32614+ KERNEL_PGD_PTRS);
32615+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32616+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32617+ KERNEL_PGD_PTRS);
32618+ load_cr3(get_cpu_pgd(0, kernel));
32619+#else
32620 load_cr3(swapper_pg_dir);
32621+#endif
32622+
32623 __flush_tlb_all();
32624
32625 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32626@@ -631,10 +645,40 @@ void __init init_mem_mapping(void)
32627 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32628 * mmio resources as well as potential bios/acpi data regions.
32629 */
32630+
32631+#ifdef CONFIG_GRKERNSEC_KMEM
32632+static unsigned int ebda_start __read_only;
32633+static unsigned int ebda_end __read_only;
32634+#endif
32635+
32636 int devmem_is_allowed(unsigned long pagenr)
32637 {
32638- if (pagenr < 256)
32639+#ifdef CONFIG_GRKERNSEC_KMEM
32640+ /* allow BDA */
32641+ if (!pagenr)
32642 return 1;
32643+ /* allow EBDA */
32644+ if (pagenr >= ebda_start && pagenr < ebda_end)
32645+ return 1;
32646+ /* if tboot is in use, allow access to its hardcoded serial log range */
32647+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32648+ return 1;
32649+#else
32650+ if (!pagenr)
32651+ return 1;
32652+#ifdef CONFIG_VM86
32653+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32654+ return 1;
32655+#endif
32656+#endif
32657+
32658+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32659+ return 1;
32660+#ifdef CONFIG_GRKERNSEC_KMEM
32661+ /* throw out everything else below 1MB */
32662+ if (pagenr <= 256)
32663+ return 0;
32664+#endif
32665 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32666 return 0;
32667 if (!page_is_ram(pagenr))
32668@@ -680,8 +724,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32669 #endif
32670 }
32671
32672+#ifdef CONFIG_GRKERNSEC_KMEM
32673+static inline void gr_init_ebda(void)
32674+{
32675+ unsigned int ebda_addr;
32676+ unsigned int ebda_size = 0;
32677+
32678+ ebda_addr = get_bios_ebda();
32679+ if (ebda_addr) {
32680+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32681+ ebda_size <<= 10;
32682+ }
32683+ if (ebda_addr && ebda_size) {
32684+ ebda_start = ebda_addr >> PAGE_SHIFT;
32685+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32686+ } else {
32687+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32688+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32689+ }
32690+}
32691+#else
32692+static inline void gr_init_ebda(void) { }
32693+#endif
32694+
32695 void free_initmem(void)
32696 {
32697+#ifdef CONFIG_PAX_KERNEXEC
32698+#ifdef CONFIG_X86_32
32699+ /* PaX: limit KERNEL_CS to actual size */
32700+ unsigned long addr, limit;
32701+ struct desc_struct d;
32702+ int cpu;
32703+#else
32704+ pgd_t *pgd;
32705+ pud_t *pud;
32706+ pmd_t *pmd;
32707+ unsigned long addr, end;
32708+#endif
32709+#endif
32710+
32711+ gr_init_ebda();
32712+
32713+#ifdef CONFIG_PAX_KERNEXEC
32714+#ifdef CONFIG_X86_32
32715+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32716+ limit = (limit - 1UL) >> PAGE_SHIFT;
32717+
32718+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32719+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32720+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32721+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32722+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32723+ }
32724+
32725+ /* PaX: make KERNEL_CS read-only */
32726+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32727+ if (!paravirt_enabled())
32728+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32729+/*
32730+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32731+ pgd = pgd_offset_k(addr);
32732+ pud = pud_offset(pgd, addr);
32733+ pmd = pmd_offset(pud, addr);
32734+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32735+ }
32736+*/
32737+#ifdef CONFIG_X86_PAE
32738+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32739+/*
32740+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32741+ pgd = pgd_offset_k(addr);
32742+ pud = pud_offset(pgd, addr);
32743+ pmd = pmd_offset(pud, addr);
32744+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32745+ }
32746+*/
32747+#endif
32748+
32749+#ifdef CONFIG_MODULES
32750+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32751+#endif
32752+
32753+#else
32754+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32755+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32756+ pgd = pgd_offset_k(addr);
32757+ pud = pud_offset(pgd, addr);
32758+ pmd = pmd_offset(pud, addr);
32759+ if (!pmd_present(*pmd))
32760+ continue;
32761+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32762+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32763+ else
32764+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32765+ }
32766+
32767+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32768+ end = addr + KERNEL_IMAGE_SIZE;
32769+ for (; addr < end; addr += PMD_SIZE) {
32770+ pgd = pgd_offset_k(addr);
32771+ pud = pud_offset(pgd, addr);
32772+ pmd = pmd_offset(pud, addr);
32773+ if (!pmd_present(*pmd))
32774+ continue;
32775+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32776+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32777+ }
32778+#endif
32779+
32780+ flush_tlb_all();
32781+#endif
32782+
32783 free_init_pages("unused kernel",
32784 (unsigned long)(&__init_begin),
32785 (unsigned long)(&__init_end));
32786diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32787index c8140e1..59257fc 100644
32788--- a/arch/x86/mm/init_32.c
32789+++ b/arch/x86/mm/init_32.c
32790@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32791 bool __read_mostly __vmalloc_start_set = false;
32792
32793 /*
32794- * Creates a middle page table and puts a pointer to it in the
32795- * given global directory entry. This only returns the gd entry
32796- * in non-PAE compilation mode, since the middle layer is folded.
32797- */
32798-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32799-{
32800- pud_t *pud;
32801- pmd_t *pmd_table;
32802-
32803-#ifdef CONFIG_X86_PAE
32804- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32805- pmd_table = (pmd_t *)alloc_low_page();
32806- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32807- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32808- pud = pud_offset(pgd, 0);
32809- BUG_ON(pmd_table != pmd_offset(pud, 0));
32810-
32811- return pmd_table;
32812- }
32813-#endif
32814- pud = pud_offset(pgd, 0);
32815- pmd_table = pmd_offset(pud, 0);
32816-
32817- return pmd_table;
32818-}
32819-
32820-/*
32821 * Create a page table and place a pointer to it in a middle page
32822 * directory entry:
32823 */
32824@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32825 pte_t *page_table = (pte_t *)alloc_low_page();
32826
32827 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32828+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32829+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32830+#else
32831 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32832+#endif
32833 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32834 }
32835
32836 return pte_offset_kernel(pmd, 0);
32837 }
32838
32839+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32840+{
32841+ pud_t *pud;
32842+ pmd_t *pmd_table;
32843+
32844+ pud = pud_offset(pgd, 0);
32845+ pmd_table = pmd_offset(pud, 0);
32846+
32847+ return pmd_table;
32848+}
32849+
32850 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32851 {
32852 int pgd_idx = pgd_index(vaddr);
32853@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32854 int pgd_idx, pmd_idx;
32855 unsigned long vaddr;
32856 pgd_t *pgd;
32857+ pud_t *pud;
32858 pmd_t *pmd;
32859 pte_t *pte = NULL;
32860 unsigned long count = page_table_range_init_count(start, end);
32861@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32862 pgd = pgd_base + pgd_idx;
32863
32864 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32865- pmd = one_md_table_init(pgd);
32866- pmd = pmd + pmd_index(vaddr);
32867+ pud = pud_offset(pgd, vaddr);
32868+ pmd = pmd_offset(pud, vaddr);
32869+
32870+#ifdef CONFIG_X86_PAE
32871+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32872+#endif
32873+
32874 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32875 pmd++, pmd_idx++) {
32876 pte = page_table_kmap_check(one_page_table_init(pmd),
32877@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32878 }
32879 }
32880
32881-static inline int is_kernel_text(unsigned long addr)
32882+static inline int is_kernel_text(unsigned long start, unsigned long end)
32883 {
32884- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32885- return 1;
32886- return 0;
32887+ if ((start >= ktla_ktva((unsigned long)_etext) ||
32888+ end <= ktla_ktva((unsigned long)_stext)) &&
32889+ (start >= ktla_ktva((unsigned long)_einittext) ||
32890+ end <= ktla_ktva((unsigned long)_sinittext)) &&
32891+
32892+#ifdef CONFIG_ACPI_SLEEP
32893+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32894+#endif
32895+
32896+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32897+ return 0;
32898+ return 1;
32899 }
32900
32901 /*
32902@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32903 unsigned long last_map_addr = end;
32904 unsigned long start_pfn, end_pfn;
32905 pgd_t *pgd_base = swapper_pg_dir;
32906- int pgd_idx, pmd_idx, pte_ofs;
32907+ unsigned int pgd_idx, pmd_idx, pte_ofs;
32908 unsigned long pfn;
32909 pgd_t *pgd;
32910+ pud_t *pud;
32911 pmd_t *pmd;
32912 pte_t *pte;
32913 unsigned pages_2m, pages_4k;
32914@@ -291,8 +295,13 @@ repeat:
32915 pfn = start_pfn;
32916 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32917 pgd = pgd_base + pgd_idx;
32918- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32919- pmd = one_md_table_init(pgd);
32920+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32921+ pud = pud_offset(pgd, 0);
32922+ pmd = pmd_offset(pud, 0);
32923+
32924+#ifdef CONFIG_X86_PAE
32925+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32926+#endif
32927
32928 if (pfn >= end_pfn)
32929 continue;
32930@@ -304,14 +313,13 @@ repeat:
32931 #endif
32932 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32933 pmd++, pmd_idx++) {
32934- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32935+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32936
32937 /*
32938 * Map with big pages if possible, otherwise
32939 * create normal page tables:
32940 */
32941 if (use_pse) {
32942- unsigned int addr2;
32943 pgprot_t prot = PAGE_KERNEL_LARGE;
32944 /*
32945 * first pass will use the same initial
32946@@ -322,11 +330,7 @@ repeat:
32947 _PAGE_PSE);
32948
32949 pfn &= PMD_MASK >> PAGE_SHIFT;
32950- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32951- PAGE_OFFSET + PAGE_SIZE-1;
32952-
32953- if (is_kernel_text(addr) ||
32954- is_kernel_text(addr2))
32955+ if (is_kernel_text(address, address + PMD_SIZE))
32956 prot = PAGE_KERNEL_LARGE_EXEC;
32957
32958 pages_2m++;
32959@@ -343,7 +347,7 @@ repeat:
32960 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32961 pte += pte_ofs;
32962 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
32963- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
32964+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
32965 pgprot_t prot = PAGE_KERNEL;
32966 /*
32967 * first pass will use the same initial
32968@@ -351,7 +355,7 @@ repeat:
32969 */
32970 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
32971
32972- if (is_kernel_text(addr))
32973+ if (is_kernel_text(address, address + PAGE_SIZE))
32974 prot = PAGE_KERNEL_EXEC;
32975
32976 pages_4k++;
32977@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
32978
32979 pud = pud_offset(pgd, va);
32980 pmd = pmd_offset(pud, va);
32981- if (!pmd_present(*pmd))
32982+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
32983 break;
32984
32985 /* should not be large page here */
32986@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
32987
32988 static void __init pagetable_init(void)
32989 {
32990- pgd_t *pgd_base = swapper_pg_dir;
32991-
32992- permanent_kmaps_init(pgd_base);
32993+ permanent_kmaps_init(swapper_pg_dir);
32994 }
32995
32996-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
32997+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
32998 EXPORT_SYMBOL_GPL(__supported_pte_mask);
32999
33000 /* user-defined highmem size */
33001@@ -787,10 +789,10 @@ void __init mem_init(void)
33002 ((unsigned long)&__init_end -
33003 (unsigned long)&__init_begin) >> 10,
33004
33005- (unsigned long)&_etext, (unsigned long)&_edata,
33006- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33007+ (unsigned long)&_sdata, (unsigned long)&_edata,
33008+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33009
33010- (unsigned long)&_text, (unsigned long)&_etext,
33011+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33012 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33013
33014 /*
33015@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33016 if (!kernel_set_to_readonly)
33017 return;
33018
33019+ start = ktla_ktva(start);
33020 pr_debug("Set kernel text: %lx - %lx for read write\n",
33021 start, start+size);
33022
33023@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33024 if (!kernel_set_to_readonly)
33025 return;
33026
33027+ start = ktla_ktva(start);
33028 pr_debug("Set kernel text: %lx - %lx for read only\n",
33029 start, start+size);
33030
33031@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33032 unsigned long start = PFN_ALIGN(_text);
33033 unsigned long size = PFN_ALIGN(_etext) - start;
33034
33035+ start = ktla_ktva(start);
33036 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33037 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33038 size >> 10);
33039diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33040index 3fba623..5ee9802 100644
33041--- a/arch/x86/mm/init_64.c
33042+++ b/arch/x86/mm/init_64.c
33043@@ -136,7 +136,7 @@ int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
33044 * around without checking the pgd every time.
33045 */
33046
33047-pteval_t __supported_pte_mask __read_mostly = ~0;
33048+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33049 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33050
33051 int force_personality32;
33052@@ -169,7 +169,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33053
33054 for (address = start; address <= end; address += PGDIR_SIZE) {
33055 const pgd_t *pgd_ref = pgd_offset_k(address);
33056+
33057+#ifdef CONFIG_PAX_PER_CPU_PGD
33058+ unsigned long cpu;
33059+#else
33060 struct page *page;
33061+#endif
33062
33063 /*
33064 * When it is called after memory hot remove, pgd_none()
33065@@ -180,6 +185,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33066 continue;
33067
33068 spin_lock(&pgd_lock);
33069+
33070+#ifdef CONFIG_PAX_PER_CPU_PGD
33071+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33072+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33073+
33074+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33075+ BUG_ON(pgd_page_vaddr(*pgd)
33076+ != pgd_page_vaddr(*pgd_ref));
33077+
33078+ if (removed) {
33079+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33080+ pgd_clear(pgd);
33081+ } else {
33082+ if (pgd_none(*pgd))
33083+ set_pgd(pgd, *pgd_ref);
33084+ }
33085+
33086+ pgd = pgd_offset_cpu(cpu, kernel, address);
33087+#else
33088 list_for_each_entry(page, &pgd_list, lru) {
33089 pgd_t *pgd;
33090 spinlock_t *pgt_lock;
33091@@ -188,6 +212,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33092 /* the pgt_lock only for Xen */
33093 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33094 spin_lock(pgt_lock);
33095+#endif
33096
33097 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33098 BUG_ON(pgd_page_vaddr(*pgd)
33099@@ -201,7 +226,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33100 set_pgd(pgd, *pgd_ref);
33101 }
33102
33103+#ifndef CONFIG_PAX_PER_CPU_PGD
33104 spin_unlock(pgt_lock);
33105+#endif
33106+
33107 }
33108 spin_unlock(&pgd_lock);
33109 }
33110@@ -234,7 +262,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33111 {
33112 if (pgd_none(*pgd)) {
33113 pud_t *pud = (pud_t *)spp_getpage();
33114- pgd_populate(&init_mm, pgd, pud);
33115+ pgd_populate_kernel(&init_mm, pgd, pud);
33116 if (pud != pud_offset(pgd, 0))
33117 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33118 pud, pud_offset(pgd, 0));
33119@@ -246,7 +274,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33120 {
33121 if (pud_none(*pud)) {
33122 pmd_t *pmd = (pmd_t *) spp_getpage();
33123- pud_populate(&init_mm, pud, pmd);
33124+ pud_populate_kernel(&init_mm, pud, pmd);
33125 if (pmd != pmd_offset(pud, 0))
33126 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33127 pmd, pmd_offset(pud, 0));
33128@@ -275,7 +303,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33129 pmd = fill_pmd(pud, vaddr);
33130 pte = fill_pte(pmd, vaddr);
33131
33132+ pax_open_kernel();
33133 set_pte(pte, new_pte);
33134+ pax_close_kernel();
33135
33136 /*
33137 * It's enough to flush this one mapping.
33138@@ -337,14 +367,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33139 pgd = pgd_offset_k((unsigned long)__va(phys));
33140 if (pgd_none(*pgd)) {
33141 pud = (pud_t *) spp_getpage();
33142- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33143- _PAGE_USER));
33144+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33145 }
33146 pud = pud_offset(pgd, (unsigned long)__va(phys));
33147 if (pud_none(*pud)) {
33148 pmd = (pmd_t *) spp_getpage();
33149- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33150- _PAGE_USER));
33151+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33152 }
33153 pmd = pmd_offset(pud, phys);
33154 BUG_ON(!pmd_none(*pmd));
33155@@ -585,7 +613,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33156 prot);
33157
33158 spin_lock(&init_mm.page_table_lock);
33159- pud_populate(&init_mm, pud, pmd);
33160+ pud_populate_kernel(&init_mm, pud, pmd);
33161 spin_unlock(&init_mm.page_table_lock);
33162 }
33163 __flush_tlb_all();
33164@@ -626,7 +654,7 @@ kernel_physical_mapping_init(unsigned long start,
33165 page_size_mask);
33166
33167 spin_lock(&init_mm.page_table_lock);
33168- pgd_populate(&init_mm, pgd, pud);
33169+ pgd_populate_kernel(&init_mm, pgd, pud);
33170 spin_unlock(&init_mm.page_table_lock);
33171 pgd_changed = true;
33172 }
33173diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33174index 9ca35fc..4b2b7b7 100644
33175--- a/arch/x86/mm/iomap_32.c
33176+++ b/arch/x86/mm/iomap_32.c
33177@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33178 type = kmap_atomic_idx_push();
33179 idx = type + KM_TYPE_NR * smp_processor_id();
33180 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33181+
33182+ pax_open_kernel();
33183 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33184+ pax_close_kernel();
33185+
33186 arch_flush_lazy_mmu_mode();
33187
33188 return (void *)vaddr;
33189diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33190index 70e7444..e9904fd 100644
33191--- a/arch/x86/mm/ioremap.c
33192+++ b/arch/x86/mm/ioremap.c
33193@@ -56,12 +56,10 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33194 unsigned long i;
33195
33196 for (i = 0; i < nr_pages; ++i)
33197- if (pfn_valid(start_pfn + i) &&
33198- !PageReserved(pfn_to_page(start_pfn + i)))
33199+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33200+ !PageReserved(pfn_to_page(start_pfn + i))))
33201 return 1;
33202
33203- WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33204-
33205 return 0;
33206 }
33207
33208@@ -91,7 +89,6 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
33209 pgprot_t prot;
33210 int retval;
33211 void __iomem *ret_addr;
33212- int ram_region;
33213
33214 /* Don't allow wraparound or zero size */
33215 last_addr = phys_addr + size - 1;
33216@@ -114,23 +111,15 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
33217 /*
33218 * Don't allow anybody to remap normal RAM that we're using..
33219 */
33220- /* First check if whole region can be identified as RAM or not */
33221- ram_region = region_is_ram(phys_addr, size);
33222- if (ram_region > 0) {
33223- WARN_ONCE(1, "ioremap on RAM at 0x%lx - 0x%lx\n",
33224- (unsigned long int)phys_addr,
33225- (unsigned long int)last_addr);
33226+ pfn = phys_addr >> PAGE_SHIFT;
33227+ last_pfn = last_addr >> PAGE_SHIFT;
33228+ if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
33229+ __ioremap_check_ram) == 1) {
33230+ WARN_ONCE(1, "ioremap on RAM at 0x%llx - 0x%llx\n",
33231+ phys_addr, last_addr);
33232 return NULL;
33233 }
33234
33235- /* If could not be identified(-1), check page by page */
33236- if (ram_region < 0) {
33237- pfn = phys_addr >> PAGE_SHIFT;
33238- last_pfn = last_addr >> PAGE_SHIFT;
33239- if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
33240- __ioremap_check_ram) == 1)
33241- return NULL;
33242- }
33243 /*
33244 * Mappings have to be page-aligned
33245 */
33246@@ -288,7 +277,7 @@ EXPORT_SYMBOL(ioremap_prot);
33247 *
33248 * Caller must ensure there is only one unmapping for the same pointer.
33249 */
33250-void iounmap(volatile void __iomem *addr)
33251+void iounmap(const volatile void __iomem *addr)
33252 {
33253 struct vm_struct *p, *o;
33254
33255@@ -351,32 +340,36 @@ int arch_ioremap_pmd_supported(void)
33256 */
33257 void *xlate_dev_mem_ptr(phys_addr_t phys)
33258 {
33259- unsigned long start = phys & PAGE_MASK;
33260- unsigned long offset = phys & ~PAGE_MASK;
33261- unsigned long vaddr;
33262+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33263
33264- /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33265- if (page_is_ram(start >> PAGE_SHIFT))
33266- return __va(phys);
33267+ if (page_is_ram(pfn)) {
33268+#ifdef CONFIG_HIGHMEM
33269+ if (pfn >= max_low_pfn)
33270+ return kmap_high(pfn_to_page(pfn));
33271+ else
33272+#endif
33273+ return __va(phys);
33274+ }
33275
33276- vaddr = (unsigned long)ioremap_cache(start, PAGE_SIZE);
33277- /* Only add the offset on success and return NULL if the ioremap() failed: */
33278- if (vaddr)
33279- vaddr += offset;
33280-
33281- return (void *)vaddr;
33282+ return (void __force *)ioremap_cache(phys, 1);
33283 }
33284
33285 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33286 {
33287- if (page_is_ram(phys >> PAGE_SHIFT))
33288+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33289+
33290+ if (page_is_ram(pfn)) {
33291+#ifdef CONFIG_HIGHMEM
33292+ if (pfn >= max_low_pfn)
33293+ kunmap_high(pfn_to_page(pfn));
33294+#endif
33295 return;
33296+ }
33297
33298- iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33299- return;
33300+ iounmap((void __iomem __force *)addr);
33301 }
33302
33303-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33304+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33305
33306 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33307 {
33308@@ -412,8 +405,7 @@ void __init early_ioremap_init(void)
33309 early_ioremap_setup();
33310
33311 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33312- memset(bm_pte, 0, sizeof(bm_pte));
33313- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33314+ pmd_populate_user(&init_mm, pmd, bm_pte);
33315
33316 /*
33317 * The boot-ioremap range spans multiple pmds, for which
33318diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33319index b4f2e7e..96c9c3e 100644
33320--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33321+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33322@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33323 * memory (e.g. tracked pages)? For now, we need this to avoid
33324 * invoking kmemcheck for PnP BIOS calls.
33325 */
33326- if (regs->flags & X86_VM_MASK)
33327+ if (v8086_mode(regs))
33328 return false;
33329- if (regs->cs != __KERNEL_CS)
33330+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33331 return false;
33332
33333 pte = kmemcheck_pte_lookup(address);
33334diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33335index 844b06d..f363c86 100644
33336--- a/arch/x86/mm/mmap.c
33337+++ b/arch/x86/mm/mmap.c
33338@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33339 * Leave an at least ~128 MB hole with possible stack randomization.
33340 */
33341 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33342-#define MAX_GAP (TASK_SIZE/6*5)
33343+#define MAX_GAP (pax_task_size/6*5)
33344
33345 static int mmap_is_legacy(void)
33346 {
33347@@ -81,27 +81,40 @@ unsigned long arch_mmap_rnd(void)
33348 return rnd << PAGE_SHIFT;
33349 }
33350
33351-static unsigned long mmap_base(unsigned long rnd)
33352+static unsigned long mmap_base(struct mm_struct *mm, unsigned long rnd)
33353 {
33354 unsigned long gap = rlimit(RLIMIT_STACK);
33355+ unsigned long pax_task_size = TASK_SIZE;
33356+
33357+#ifdef CONFIG_PAX_SEGMEXEC
33358+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33359+ pax_task_size = SEGMEXEC_TASK_SIZE;
33360+#endif
33361
33362 if (gap < MIN_GAP)
33363 gap = MIN_GAP;
33364 else if (gap > MAX_GAP)
33365 gap = MAX_GAP;
33366
33367- return PAGE_ALIGN(TASK_SIZE - gap - rnd);
33368+ return PAGE_ALIGN(pax_task_size - gap - rnd);
33369 }
33370
33371 /*
33372 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33373 * does, but not when emulating X86_32
33374 */
33375-static unsigned long mmap_legacy_base(unsigned long rnd)
33376+static unsigned long mmap_legacy_base(struct mm_struct *mm, unsigned long rnd)
33377 {
33378- if (mmap_is_ia32())
33379+ if (mmap_is_ia32()) {
33380+
33381+#ifdef CONFIG_PAX_SEGMEXEC
33382+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33383+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33384+ else
33385+#endif
33386+
33387 return TASK_UNMAPPED_BASE;
33388- else
33389+ } else
33390 return TASK_UNMAPPED_BASE + rnd;
33391 }
33392
33393@@ -113,18 +126,29 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
33394 {
33395 unsigned long random_factor = 0UL;
33396
33397+#ifdef CONFIG_PAX_RANDMMAP
33398+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
33399+#endif
33400 if (current->flags & PF_RANDOMIZE)
33401 random_factor = arch_mmap_rnd();
33402
33403- mm->mmap_legacy_base = mmap_legacy_base(random_factor);
33404+ mm->mmap_legacy_base = mmap_legacy_base(mm, random_factor);
33405
33406 if (mmap_is_legacy()) {
33407 mm->mmap_base = mm->mmap_legacy_base;
33408 mm->get_unmapped_area = arch_get_unmapped_area;
33409 } else {
33410- mm->mmap_base = mmap_base(random_factor);
33411+ mm->mmap_base = mmap_base(mm, random_factor);
33412 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
33413 }
33414+
33415+#ifdef CONFIG_PAX_RANDMMAP
33416+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33417+ mm->mmap_legacy_base += mm->delta_mmap;
33418+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33419+ }
33420+#endif
33421+
33422 }
33423
33424 const char *arch_vma_name(struct vm_area_struct *vma)
33425diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33426index 0057a7a..95c7edd 100644
33427--- a/arch/x86/mm/mmio-mod.c
33428+++ b/arch/x86/mm/mmio-mod.c
33429@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33430 break;
33431 default:
33432 {
33433- unsigned char *ip = (unsigned char *)instptr;
33434+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33435 my_trace->opcode = MMIO_UNKNOWN_OP;
33436 my_trace->width = 0;
33437 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33438@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33439 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33440 void __iomem *addr)
33441 {
33442- static atomic_t next_id;
33443+ static atomic_unchecked_t next_id;
33444 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33445 /* These are page-unaligned. */
33446 struct mmiotrace_map map = {
33447@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33448 .private = trace
33449 },
33450 .phys = offset,
33451- .id = atomic_inc_return(&next_id)
33452+ .id = atomic_inc_return_unchecked(&next_id)
33453 };
33454 map.map_id = trace->id;
33455
33456@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33457 ioremap_trace_core(offset, size, addr);
33458 }
33459
33460-static void iounmap_trace_core(volatile void __iomem *addr)
33461+static void iounmap_trace_core(const volatile void __iomem *addr)
33462 {
33463 struct mmiotrace_map map = {
33464 .phys = 0,
33465@@ -328,7 +328,7 @@ not_enabled:
33466 }
33467 }
33468
33469-void mmiotrace_iounmap(volatile void __iomem *addr)
33470+void mmiotrace_iounmap(const volatile void __iomem *addr)
33471 {
33472 might_sleep();
33473 if (is_enabled()) /* recheck and proper locking in *_core() */
33474diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33475index 4053bb5..b1ad3dc 100644
33476--- a/arch/x86/mm/numa.c
33477+++ b/arch/x86/mm/numa.c
33478@@ -506,7 +506,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33479 }
33480 }
33481
33482-static int __init numa_register_memblks(struct numa_meminfo *mi)
33483+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33484 {
33485 unsigned long uninitialized_var(pfn_align);
33486 int i, nid;
33487diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33488index 89af288..05381957 100644
33489--- a/arch/x86/mm/pageattr.c
33490+++ b/arch/x86/mm/pageattr.c
33491@@ -260,7 +260,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33492 */
33493 #ifdef CONFIG_PCI_BIOS
33494 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33495- pgprot_val(forbidden) |= _PAGE_NX;
33496+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33497 #endif
33498
33499 /*
33500@@ -268,9 +268,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33501 * Does not cover __inittext since that is gone later on. On
33502 * 64bit we do not enforce !NX on the low mapping
33503 */
33504- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33505- pgprot_val(forbidden) |= _PAGE_NX;
33506+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33507+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33508
33509+#ifdef CONFIG_DEBUG_RODATA
33510 /*
33511 * The .rodata section needs to be read-only. Using the pfn
33512 * catches all aliases.
33513@@ -278,6 +279,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33514 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33515 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33516 pgprot_val(forbidden) |= _PAGE_RW;
33517+#endif
33518
33519 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33520 /*
33521@@ -316,6 +318,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33522 }
33523 #endif
33524
33525+#ifdef CONFIG_PAX_KERNEXEC
33526+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33527+ pgprot_val(forbidden) |= _PAGE_RW;
33528+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33529+ }
33530+#endif
33531+
33532 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33533
33534 return prot;
33535@@ -438,23 +447,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33536 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33537 {
33538 /* change init_mm */
33539+ pax_open_kernel();
33540 set_pte_atomic(kpte, pte);
33541+
33542 #ifdef CONFIG_X86_32
33543 if (!SHARED_KERNEL_PMD) {
33544+
33545+#ifdef CONFIG_PAX_PER_CPU_PGD
33546+ unsigned long cpu;
33547+#else
33548 struct page *page;
33549+#endif
33550
33551+#ifdef CONFIG_PAX_PER_CPU_PGD
33552+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33553+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33554+#else
33555 list_for_each_entry(page, &pgd_list, lru) {
33556- pgd_t *pgd;
33557+ pgd_t *pgd = (pgd_t *)page_address(page);
33558+#endif
33559+
33560 pud_t *pud;
33561 pmd_t *pmd;
33562
33563- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33564+ pgd += pgd_index(address);
33565 pud = pud_offset(pgd, address);
33566 pmd = pmd_offset(pud, address);
33567 set_pte_atomic((pte_t *)pmd, pte);
33568 }
33569 }
33570 #endif
33571+ pax_close_kernel();
33572 }
33573
33574 static int
33575diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33576index 35af677..e7bf11f 100644
33577--- a/arch/x86/mm/pat.c
33578+++ b/arch/x86/mm/pat.c
33579@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33580 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33581
33582 if (pg_flags == _PGMT_DEFAULT)
33583- return -1;
33584+ return _PAGE_CACHE_MODE_NUM;
33585 else if (pg_flags == _PGMT_WC)
33586 return _PAGE_CACHE_MODE_WC;
33587 else if (pg_flags == _PGMT_UC_MINUS)
33588@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33589
33590 page = pfn_to_page(pfn);
33591 type = get_page_memtype(page);
33592- if (type != -1) {
33593+ if (type != _PAGE_CACHE_MODE_NUM) {
33594 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33595 start, end - 1, type, req_type);
33596 if (new_type)
33597@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33598
33599 if (!entry) {
33600 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33601- current->comm, current->pid, start, end - 1);
33602+ current->comm, task_pid_nr(current), start, end - 1);
33603 return -EINVAL;
33604 }
33605
33606@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33607 page = pfn_to_page(paddr >> PAGE_SHIFT);
33608 rettype = get_page_memtype(page);
33609 /*
33610- * -1 from get_page_memtype() implies RAM page is in its
33611+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33612 * default state and not reserved, and hence of type WB
33613 */
33614- if (rettype == -1)
33615+ if (rettype == _PAGE_CACHE_MODE_NUM)
33616 rettype = _PAGE_CACHE_MODE_WB;
33617
33618 return rettype;
33619@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33620
33621 while (cursor < to) {
33622 if (!devmem_is_allowed(pfn)) {
33623- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx], PAT prevents it\n",
33624- current->comm, from, to - 1);
33625+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx), PAT prevents it\n",
33626+ current->comm, from, to - 1, cursor);
33627 return 0;
33628 }
33629 cursor += PAGE_SIZE;
33630@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33631 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33632 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33633 "for [mem %#010Lx-%#010Lx]\n",
33634- current->comm, current->pid,
33635+ current->comm, task_pid_nr(current),
33636 cattr_name(pcm),
33637 base, (unsigned long long)(base + size-1));
33638 return -EINVAL;
33639@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33640 pcm = lookup_memtype(paddr);
33641 if (want_pcm != pcm) {
33642 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33643- current->comm, current->pid,
33644+ current->comm, task_pid_nr(current),
33645 cattr_name(want_pcm),
33646 (unsigned long long)paddr,
33647 (unsigned long long)(paddr + size - 1),
33648@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33649 free_memtype(paddr, paddr + size);
33650 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33651 " for [mem %#010Lx-%#010Lx], got %s\n",
33652- current->comm, current->pid,
33653+ current->comm, task_pid_nr(current),
33654 cattr_name(want_pcm),
33655 (unsigned long long)paddr,
33656 (unsigned long long)(paddr + size - 1),
33657diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33658index 6582adc..fcc5d0b 100644
33659--- a/arch/x86/mm/pat_rbtree.c
33660+++ b/arch/x86/mm/pat_rbtree.c
33661@@ -161,7 +161,7 @@ success:
33662
33663 failure:
33664 printk(KERN_INFO "%s:%d conflicting memory types "
33665- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33666+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33667 end, cattr_name(found_type), cattr_name(match->type));
33668 return -EBUSY;
33669 }
33670diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33671index 9f0614d..92ae64a 100644
33672--- a/arch/x86/mm/pf_in.c
33673+++ b/arch/x86/mm/pf_in.c
33674@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33675 int i;
33676 enum reason_type rv = OTHERS;
33677
33678- p = (unsigned char *)ins_addr;
33679+ p = (unsigned char *)ktla_ktva(ins_addr);
33680 p += skip_prefix(p, &prf);
33681 p += get_opcode(p, &opcode);
33682
33683@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33684 struct prefix_bits prf;
33685 int i;
33686
33687- p = (unsigned char *)ins_addr;
33688+ p = (unsigned char *)ktla_ktva(ins_addr);
33689 p += skip_prefix(p, &prf);
33690 p += get_opcode(p, &opcode);
33691
33692@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33693 struct prefix_bits prf;
33694 int i;
33695
33696- p = (unsigned char *)ins_addr;
33697+ p = (unsigned char *)ktla_ktva(ins_addr);
33698 p += skip_prefix(p, &prf);
33699 p += get_opcode(p, &opcode);
33700
33701@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33702 struct prefix_bits prf;
33703 int i;
33704
33705- p = (unsigned char *)ins_addr;
33706+ p = (unsigned char *)ktla_ktva(ins_addr);
33707 p += skip_prefix(p, &prf);
33708 p += get_opcode(p, &opcode);
33709 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33710@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33711 struct prefix_bits prf;
33712 int i;
33713
33714- p = (unsigned char *)ins_addr;
33715+ p = (unsigned char *)ktla_ktva(ins_addr);
33716 p += skip_prefix(p, &prf);
33717 p += get_opcode(p, &opcode);
33718 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33719diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33720index 0b97d2c..597bb38 100644
33721--- a/arch/x86/mm/pgtable.c
33722+++ b/arch/x86/mm/pgtable.c
33723@@ -98,10 +98,75 @@ static inline void pgd_list_del(pgd_t *pgd)
33724 list_del(&page->lru);
33725 }
33726
33727-#define UNSHARED_PTRS_PER_PGD \
33728- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33729+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33730+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33731
33732+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33733+{
33734+ unsigned int count = USER_PGD_PTRS;
33735
33736+ if (!pax_user_shadow_base)
33737+ return;
33738+
33739+ while (count--)
33740+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33741+}
33742+#endif
33743+
33744+#ifdef CONFIG_PAX_PER_CPU_PGD
33745+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33746+{
33747+ unsigned int count = USER_PGD_PTRS;
33748+
33749+ while (count--) {
33750+ pgd_t pgd;
33751+
33752+#ifdef CONFIG_X86_64
33753+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33754+#else
33755+ pgd = *src++;
33756+#endif
33757+
33758+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33759+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33760+#endif
33761+
33762+ *dst++ = pgd;
33763+ }
33764+
33765+}
33766+#endif
33767+
33768+#ifdef CONFIG_X86_64
33769+#define pxd_t pud_t
33770+#define pyd_t pgd_t
33771+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33772+#define pgtable_pxd_page_ctor(page) true
33773+#define pgtable_pxd_page_dtor(page) do {} while (0)
33774+#define pxd_free(mm, pud) pud_free((mm), (pud))
33775+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33776+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33777+#define PYD_SIZE PGDIR_SIZE
33778+#define mm_inc_nr_pxds(mm) do {} while (0)
33779+#define mm_dec_nr_pxds(mm) do {} while (0)
33780+#else
33781+#define pxd_t pmd_t
33782+#define pyd_t pud_t
33783+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33784+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33785+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33786+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33787+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33788+#define pyd_offset(mm, address) pud_offset((mm), (address))
33789+#define PYD_SIZE PUD_SIZE
33790+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
33791+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
33792+#endif
33793+
33794+#ifdef CONFIG_PAX_PER_CPU_PGD
33795+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33796+static inline void pgd_dtor(pgd_t *pgd) {}
33797+#else
33798 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33799 {
33800 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33801@@ -142,6 +207,7 @@ static void pgd_dtor(pgd_t *pgd)
33802 pgd_list_del(pgd);
33803 spin_unlock(&pgd_lock);
33804 }
33805+#endif
33806
33807 /*
33808 * List of all pgd's needed for non-PAE so it can invalidate entries
33809@@ -154,7 +220,7 @@ static void pgd_dtor(pgd_t *pgd)
33810 * -- nyc
33811 */
33812
33813-#ifdef CONFIG_X86_PAE
33814+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33815 /*
33816 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33817 * updating the top-level pagetable entries to guarantee the
33818@@ -166,7 +232,7 @@ static void pgd_dtor(pgd_t *pgd)
33819 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33820 * and initialize the kernel pmds here.
33821 */
33822-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33823+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33824
33825 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33826 {
33827@@ -184,46 +250,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33828 */
33829 flush_tlb_mm(mm);
33830 }
33831+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33832+#define PREALLOCATED_PXDS USER_PGD_PTRS
33833 #else /* !CONFIG_X86_PAE */
33834
33835 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33836-#define PREALLOCATED_PMDS 0
33837+#define PREALLOCATED_PXDS 0
33838
33839 #endif /* CONFIG_X86_PAE */
33840
33841-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
33842+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
33843 {
33844 int i;
33845
33846- for(i = 0; i < PREALLOCATED_PMDS; i++)
33847- if (pmds[i]) {
33848- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33849- free_page((unsigned long)pmds[i]);
33850- mm_dec_nr_pmds(mm);
33851+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33852+ if (pxds[i]) {
33853+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33854+ free_page((unsigned long)pxds[i]);
33855+ mm_dec_nr_pxds(mm);
33856 }
33857 }
33858
33859-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33860+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
33861 {
33862 int i;
33863 bool failed = false;
33864
33865- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33866- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33867- if (!pmd)
33868+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33869+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33870+ if (!pxd)
33871 failed = true;
33872- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33873- free_page((unsigned long)pmd);
33874- pmd = NULL;
33875+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33876+ free_page((unsigned long)pxd);
33877+ pxd = NULL;
33878 failed = true;
33879 }
33880- if (pmd)
33881- mm_inc_nr_pmds(mm);
33882- pmds[i] = pmd;
33883+ if (pxd)
33884+ mm_inc_nr_pxds(mm);
33885+ pxds[i] = pxd;
33886 }
33887
33888 if (failed) {
33889- free_pmds(mm, pmds);
33890+ free_pxds(mm, pxds);
33891 return -ENOMEM;
33892 }
33893
33894@@ -236,43 +304,47 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33895 * preallocate which never got a corresponding vma will need to be
33896 * freed manually.
33897 */
33898-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33899+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33900 {
33901 int i;
33902
33903- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33904+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33905 pgd_t pgd = pgdp[i];
33906
33907 if (pgd_val(pgd) != 0) {
33908- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33909+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33910
33911- pgdp[i] = native_make_pgd(0);
33912+ set_pgd(pgdp + i, native_make_pgd(0));
33913
33914- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33915- pmd_free(mm, pmd);
33916- mm_dec_nr_pmds(mm);
33917+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33918+ pxd_free(mm, pxd);
33919+ mm_dec_nr_pxds(mm);
33920 }
33921 }
33922 }
33923
33924-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33925+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33926 {
33927- pud_t *pud;
33928+ pyd_t *pyd;
33929 int i;
33930
33931- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33932+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33933 return;
33934
33935- pud = pud_offset(pgd, 0);
33936+#ifdef CONFIG_X86_64
33937+ pyd = pyd_offset(mm, 0L);
33938+#else
33939+ pyd = pyd_offset(pgd, 0L);
33940+#endif
33941
33942- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33943- pmd_t *pmd = pmds[i];
33944+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33945+ pxd_t *pxd = pxds[i];
33946
33947 if (i >= KERNEL_PGD_BOUNDARY)
33948- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33949- sizeof(pmd_t) * PTRS_PER_PMD);
33950+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33951+ sizeof(pxd_t) * PTRS_PER_PMD);
33952
33953- pud_populate(mm, pud, pmd);
33954+ pyd_populate(mm, pyd, pxd);
33955 }
33956 }
33957
33958@@ -354,7 +426,7 @@ static inline void _pgd_free(pgd_t *pgd)
33959 pgd_t *pgd_alloc(struct mm_struct *mm)
33960 {
33961 pgd_t *pgd;
33962- pmd_t *pmds[PREALLOCATED_PMDS];
33963+ pxd_t *pxds[PREALLOCATED_PXDS];
33964
33965 pgd = _pgd_alloc();
33966
33967@@ -363,11 +435,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33968
33969 mm->pgd = pgd;
33970
33971- if (preallocate_pmds(mm, pmds) != 0)
33972+ if (preallocate_pxds(mm, pxds) != 0)
33973 goto out_free_pgd;
33974
33975 if (paravirt_pgd_alloc(mm) != 0)
33976- goto out_free_pmds;
33977+ goto out_free_pxds;
33978
33979 /*
33980 * Make sure that pre-populating the pmds is atomic with
33981@@ -377,14 +449,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33982 spin_lock(&pgd_lock);
33983
33984 pgd_ctor(mm, pgd);
33985- pgd_prepopulate_pmd(mm, pgd, pmds);
33986+ pgd_prepopulate_pxd(mm, pgd, pxds);
33987
33988 spin_unlock(&pgd_lock);
33989
33990 return pgd;
33991
33992-out_free_pmds:
33993- free_pmds(mm, pmds);
33994+out_free_pxds:
33995+ free_pxds(mm, pxds);
33996 out_free_pgd:
33997 _pgd_free(pgd);
33998 out:
33999@@ -393,7 +465,7 @@ out:
34000
34001 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34002 {
34003- pgd_mop_up_pmds(mm, pgd);
34004+ pgd_mop_up_pxds(mm, pgd);
34005 pgd_dtor(pgd);
34006 paravirt_pgd_free(mm, pgd);
34007 _pgd_free(pgd);
34008diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34009index 75cc097..79a097f 100644
34010--- a/arch/x86/mm/pgtable_32.c
34011+++ b/arch/x86/mm/pgtable_32.c
34012@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34013 return;
34014 }
34015 pte = pte_offset_kernel(pmd, vaddr);
34016+
34017+ pax_open_kernel();
34018 if (pte_val(pteval))
34019 set_pte_at(&init_mm, vaddr, pte, pteval);
34020 else
34021 pte_clear(&init_mm, vaddr, pte);
34022+ pax_close_kernel();
34023
34024 /*
34025 * It's enough to flush this one mapping.
34026diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34027index e666cbb..61788c45 100644
34028--- a/arch/x86/mm/physaddr.c
34029+++ b/arch/x86/mm/physaddr.c
34030@@ -10,7 +10,7 @@
34031 #ifdef CONFIG_X86_64
34032
34033 #ifdef CONFIG_DEBUG_VIRTUAL
34034-unsigned long __phys_addr(unsigned long x)
34035+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34036 {
34037 unsigned long y = x - __START_KERNEL_map;
34038
34039@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34040 #else
34041
34042 #ifdef CONFIG_DEBUG_VIRTUAL
34043-unsigned long __phys_addr(unsigned long x)
34044+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34045 {
34046 unsigned long phys_addr = x - PAGE_OFFSET;
34047 /* VMALLOC_* aren't constants */
34048diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34049index 90555bf..f5f1828 100644
34050--- a/arch/x86/mm/setup_nx.c
34051+++ b/arch/x86/mm/setup_nx.c
34052@@ -5,8 +5,10 @@
34053 #include <asm/pgtable.h>
34054 #include <asm/proto.h>
34055
34056+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34057 static int disable_nx;
34058
34059+#ifndef CONFIG_PAX_PAGEEXEC
34060 /*
34061 * noexec = on|off
34062 *
34063@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34064 return 0;
34065 }
34066 early_param("noexec", noexec_setup);
34067+#endif
34068+
34069+#endif
34070
34071 void x86_configure_nx(void)
34072 {
34073+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34074 if (cpu_has_nx && !disable_nx)
34075 __supported_pte_mask |= _PAGE_NX;
34076 else
34077+#endif
34078 __supported_pte_mask &= ~_PAGE_NX;
34079 }
34080
34081diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34082index 90b924a..4197ac2 100644
34083--- a/arch/x86/mm/tlb.c
34084+++ b/arch/x86/mm/tlb.c
34085@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34086 BUG();
34087 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34088 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34089+
34090+#ifndef CONFIG_PAX_PER_CPU_PGD
34091 load_cr3(swapper_pg_dir);
34092+#endif
34093+
34094 /*
34095 * This gets called in the idle path where RCU
34096 * functions differently. Tracing normally
34097diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34098new file mode 100644
34099index 0000000..3fda3f3
34100--- /dev/null
34101+++ b/arch/x86/mm/uderef_64.c
34102@@ -0,0 +1,37 @@
34103+#include <linux/mm.h>
34104+#include <asm/pgtable.h>
34105+#include <asm/uaccess.h>
34106+
34107+#ifdef CONFIG_PAX_MEMORY_UDEREF
34108+/* PaX: due to the special call convention these functions must
34109+ * - remain leaf functions under all configurations,
34110+ * - never be called directly, only dereferenced from the wrappers.
34111+ */
34112+void __used __pax_open_userland(void)
34113+{
34114+ unsigned int cpu;
34115+
34116+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34117+ return;
34118+
34119+ cpu = raw_get_cpu();
34120+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34121+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34122+ raw_put_cpu_no_resched();
34123+}
34124+EXPORT_SYMBOL(__pax_open_userland);
34125+
34126+void __used __pax_close_userland(void)
34127+{
34128+ unsigned int cpu;
34129+
34130+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34131+ return;
34132+
34133+ cpu = raw_get_cpu();
34134+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34135+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34136+ raw_put_cpu_no_resched();
34137+}
34138+EXPORT_SYMBOL(__pax_close_userland);
34139+#endif
34140diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34141index 6440221..f84b5c7 100644
34142--- a/arch/x86/net/bpf_jit.S
34143+++ b/arch/x86/net/bpf_jit.S
34144@@ -9,6 +9,7 @@
34145 */
34146 #include <linux/linkage.h>
34147 #include <asm/dwarf2.h>
34148+#include <asm/alternative-asm.h>
34149
34150 /*
34151 * Calling convention :
34152@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34153 jle bpf_slow_path_word
34154 mov (SKBDATA,%rsi),%eax
34155 bswap %eax /* ntohl() */
34156+ pax_force_retaddr
34157 ret
34158
34159 sk_load_half:
34160@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34161 jle bpf_slow_path_half
34162 movzwl (SKBDATA,%rsi),%eax
34163 rol $8,%ax # ntohs()
34164+ pax_force_retaddr
34165 ret
34166
34167 sk_load_byte:
34168@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34169 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34170 jle bpf_slow_path_byte
34171 movzbl (SKBDATA,%rsi),%eax
34172+ pax_force_retaddr
34173 ret
34174
34175 /* rsi contains offset and can be scratched */
34176@@ -90,6 +94,7 @@ bpf_slow_path_word:
34177 js bpf_error
34178 mov - MAX_BPF_STACK + 32(%rbp),%eax
34179 bswap %eax
34180+ pax_force_retaddr
34181 ret
34182
34183 bpf_slow_path_half:
34184@@ -98,12 +103,14 @@ bpf_slow_path_half:
34185 mov - MAX_BPF_STACK + 32(%rbp),%ax
34186 rol $8,%ax
34187 movzwl %ax,%eax
34188+ pax_force_retaddr
34189 ret
34190
34191 bpf_slow_path_byte:
34192 bpf_slow_path_common(1)
34193 js bpf_error
34194 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34195+ pax_force_retaddr
34196 ret
34197
34198 #define sk_negative_common(SIZE) \
34199@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34200 sk_negative_common(4)
34201 mov (%rax), %eax
34202 bswap %eax
34203+ pax_force_retaddr
34204 ret
34205
34206 bpf_slow_path_half_neg:
34207@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34208 mov (%rax),%ax
34209 rol $8,%ax
34210 movzwl %ax,%eax
34211+ pax_force_retaddr
34212 ret
34213
34214 bpf_slow_path_byte_neg:
34215@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34216 .globl sk_load_byte_negative_offset
34217 sk_negative_common(1)
34218 movzbl (%rax), %eax
34219+ pax_force_retaddr
34220 ret
34221
34222 bpf_error:
34223@@ -156,4 +166,5 @@ bpf_error:
34224 mov - MAX_BPF_STACK + 16(%rbp),%r14
34225 mov - MAX_BPF_STACK + 24(%rbp),%r15
34226 leaveq
34227+ pax_force_retaddr
34228 ret
34229diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34230index ddeff48..877ead6 100644
34231--- a/arch/x86/net/bpf_jit_comp.c
34232+++ b/arch/x86/net/bpf_jit_comp.c
34233@@ -13,7 +13,11 @@
34234 #include <linux/if_vlan.h>
34235 #include <asm/cacheflush.h>
34236
34237+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34238+int bpf_jit_enable __read_only;
34239+#else
34240 int bpf_jit_enable __read_mostly;
34241+#endif
34242
34243 /*
34244 * assembly code in arch/x86/net/bpf_jit.S
34245@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34246 static void jit_fill_hole(void *area, unsigned int size)
34247 {
34248 /* fill whole space with int3 instructions */
34249+ pax_open_kernel();
34250 memset(area, 0xcc, size);
34251+ pax_close_kernel();
34252 }
34253
34254 struct jit_context {
34255@@ -924,7 +930,9 @@ common_load:
34256 pr_err("bpf_jit_compile fatal error\n");
34257 return -EFAULT;
34258 }
34259+ pax_open_kernel();
34260 memcpy(image + proglen, temp, ilen);
34261+ pax_close_kernel();
34262 }
34263 proglen += ilen;
34264 addrs[i] = proglen;
34265@@ -1001,7 +1009,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34266
34267 if (image) {
34268 bpf_flush_icache(header, image + proglen);
34269- set_memory_ro((unsigned long)header, header->pages);
34270 prog->bpf_func = (void *)image;
34271 prog->jited = true;
34272 }
34273@@ -1014,12 +1021,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34274 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34275 struct bpf_binary_header *header = (void *)addr;
34276
34277- if (!fp->jited)
34278- goto free_filter;
34279+ if (fp->jited)
34280+ bpf_jit_binary_free(header);
34281
34282- set_memory_rw(addr, header->pages);
34283- bpf_jit_binary_free(header);
34284-
34285-free_filter:
34286 bpf_prog_unlock_free(fp);
34287 }
34288diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34289index 4e664bd..2beeaa2 100644
34290--- a/arch/x86/oprofile/backtrace.c
34291+++ b/arch/x86/oprofile/backtrace.c
34292@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34293 struct stack_frame_ia32 *fp;
34294 unsigned long bytes;
34295
34296- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34297+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34298 if (bytes != 0)
34299 return NULL;
34300
34301- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34302+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34303
34304 oprofile_add_trace(bufhead[0].return_address);
34305
34306@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34307 struct stack_frame bufhead[2];
34308 unsigned long bytes;
34309
34310- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34311+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34312 if (bytes != 0)
34313 return NULL;
34314
34315diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34316index 1d2e639..f6ef82a 100644
34317--- a/arch/x86/oprofile/nmi_int.c
34318+++ b/arch/x86/oprofile/nmi_int.c
34319@@ -23,6 +23,7 @@
34320 #include <asm/nmi.h>
34321 #include <asm/msr.h>
34322 #include <asm/apic.h>
34323+#include <asm/pgtable.h>
34324
34325 #include "op_counter.h"
34326 #include "op_x86_model.h"
34327@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34328 if (ret)
34329 return ret;
34330
34331- if (!model->num_virt_counters)
34332- model->num_virt_counters = model->num_counters;
34333+ if (!model->num_virt_counters) {
34334+ pax_open_kernel();
34335+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34336+ pax_close_kernel();
34337+ }
34338
34339 mux_init(ops);
34340
34341diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34342index 50d86c0..7985318 100644
34343--- a/arch/x86/oprofile/op_model_amd.c
34344+++ b/arch/x86/oprofile/op_model_amd.c
34345@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34346 num_counters = AMD64_NUM_COUNTERS;
34347 }
34348
34349- op_amd_spec.num_counters = num_counters;
34350- op_amd_spec.num_controls = num_counters;
34351- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34352+ pax_open_kernel();
34353+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34354+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34355+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34356+ pax_close_kernel();
34357
34358 return 0;
34359 }
34360diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34361index d90528e..0127e2b 100644
34362--- a/arch/x86/oprofile/op_model_ppro.c
34363+++ b/arch/x86/oprofile/op_model_ppro.c
34364@@ -19,6 +19,7 @@
34365 #include <asm/msr.h>
34366 #include <asm/apic.h>
34367 #include <asm/nmi.h>
34368+#include <asm/pgtable.h>
34369
34370 #include "op_x86_model.h"
34371 #include "op_counter.h"
34372@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34373
34374 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34375
34376- op_arch_perfmon_spec.num_counters = num_counters;
34377- op_arch_perfmon_spec.num_controls = num_counters;
34378+ pax_open_kernel();
34379+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34380+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34381+ pax_close_kernel();
34382 }
34383
34384 static int arch_perfmon_init(struct oprofile_operations *ignore)
34385diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34386index 71e8a67..6a313bb 100644
34387--- a/arch/x86/oprofile/op_x86_model.h
34388+++ b/arch/x86/oprofile/op_x86_model.h
34389@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34390 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34391 struct op_msrs const * const msrs);
34392 #endif
34393-};
34394+} __do_const;
34395
34396 struct op_counter_config;
34397
34398diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34399index 852aa4c..71613f2 100644
34400--- a/arch/x86/pci/intel_mid_pci.c
34401+++ b/arch/x86/pci/intel_mid_pci.c
34402@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34403 pci_mmcfg_late_init();
34404 pcibios_enable_irq = intel_mid_pci_irq_enable;
34405 pcibios_disable_irq = intel_mid_pci_irq_disable;
34406- pci_root_ops = intel_mid_pci_ops;
34407+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34408 pci_soc_mode = 1;
34409 /* Continue with standard init */
34410 return 1;
34411diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34412index 5dc6ca5..25c03f5 100644
34413--- a/arch/x86/pci/irq.c
34414+++ b/arch/x86/pci/irq.c
34415@@ -51,7 +51,7 @@ struct irq_router {
34416 struct irq_router_handler {
34417 u16 vendor;
34418 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34419-};
34420+} __do_const;
34421
34422 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34423 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34424@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34425 return 0;
34426 }
34427
34428-static __initdata struct irq_router_handler pirq_routers[] = {
34429+static __initconst const struct irq_router_handler pirq_routers[] = {
34430 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34431 { PCI_VENDOR_ID_AL, ali_router_probe },
34432 { PCI_VENDOR_ID_ITE, ite_router_probe },
34433@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34434 static void __init pirq_find_router(struct irq_router *r)
34435 {
34436 struct irq_routing_table *rt = pirq_table;
34437- struct irq_router_handler *h;
34438+ const struct irq_router_handler *h;
34439
34440 #ifdef CONFIG_PCI_BIOS
34441 if (!rt->signature) {
34442@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34443 return 0;
34444 }
34445
34446-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34447+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34448 {
34449 .callback = fix_broken_hp_bios_irq9,
34450 .ident = "HP Pavilion N5400 Series Laptop",
34451diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34452index 9b83b90..4112152 100644
34453--- a/arch/x86/pci/pcbios.c
34454+++ b/arch/x86/pci/pcbios.c
34455@@ -79,7 +79,7 @@ union bios32 {
34456 static struct {
34457 unsigned long address;
34458 unsigned short segment;
34459-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34460+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34461
34462 /*
34463 * Returns the entry point for the given service, NULL on error
34464@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34465 unsigned long length; /* %ecx */
34466 unsigned long entry; /* %edx */
34467 unsigned long flags;
34468+ struct desc_struct d, *gdt;
34469
34470 local_irq_save(flags);
34471- __asm__("lcall *(%%edi); cld"
34472+
34473+ gdt = get_cpu_gdt_table(smp_processor_id());
34474+
34475+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34476+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34477+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34478+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34479+
34480+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34481 : "=a" (return_code),
34482 "=b" (address),
34483 "=c" (length),
34484 "=d" (entry)
34485 : "0" (service),
34486 "1" (0),
34487- "D" (&bios32_indirect));
34488+ "D" (&bios32_indirect),
34489+ "r"(__PCIBIOS_DS)
34490+ : "memory");
34491+
34492+ pax_open_kernel();
34493+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34494+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34495+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34496+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34497+ pax_close_kernel();
34498+
34499 local_irq_restore(flags);
34500
34501 switch (return_code) {
34502- case 0:
34503- return address + entry;
34504- case 0x80: /* Not present */
34505- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34506- return 0;
34507- default: /* Shouldn't happen */
34508- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34509- service, return_code);
34510+ case 0: {
34511+ int cpu;
34512+ unsigned char flags;
34513+
34514+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34515+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34516+ printk(KERN_WARNING "bios32_service: not valid\n");
34517 return 0;
34518+ }
34519+ address = address + PAGE_OFFSET;
34520+ length += 16UL; /* some BIOSs underreport this... */
34521+ flags = 4;
34522+ if (length >= 64*1024*1024) {
34523+ length >>= PAGE_SHIFT;
34524+ flags |= 8;
34525+ }
34526+
34527+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34528+ gdt = get_cpu_gdt_table(cpu);
34529+ pack_descriptor(&d, address, length, 0x9b, flags);
34530+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34531+ pack_descriptor(&d, address, length, 0x93, flags);
34532+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34533+ }
34534+ return entry;
34535+ }
34536+ case 0x80: /* Not present */
34537+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34538+ return 0;
34539+ default: /* Shouldn't happen */
34540+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34541+ service, return_code);
34542+ return 0;
34543 }
34544 }
34545
34546 static struct {
34547 unsigned long address;
34548 unsigned short segment;
34549-} pci_indirect = { 0, __KERNEL_CS };
34550+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34551
34552-static int pci_bios_present;
34553+static int pci_bios_present __read_only;
34554
34555 static int __init check_pcibios(void)
34556 {
34557@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34558 unsigned long flags, pcibios_entry;
34559
34560 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34561- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34562+ pci_indirect.address = pcibios_entry;
34563
34564 local_irq_save(flags);
34565- __asm__(
34566- "lcall *(%%edi); cld\n\t"
34567+ __asm__("movw %w6, %%ds\n\t"
34568+ "lcall *%%ss:(%%edi); cld\n\t"
34569+ "push %%ss\n\t"
34570+ "pop %%ds\n\t"
34571 "jc 1f\n\t"
34572 "xor %%ah, %%ah\n"
34573 "1:"
34574@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34575 "=b" (ebx),
34576 "=c" (ecx)
34577 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34578- "D" (&pci_indirect)
34579+ "D" (&pci_indirect),
34580+ "r" (__PCIBIOS_DS)
34581 : "memory");
34582 local_irq_restore(flags);
34583
34584@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34585
34586 switch (len) {
34587 case 1:
34588- __asm__("lcall *(%%esi); cld\n\t"
34589+ __asm__("movw %w6, %%ds\n\t"
34590+ "lcall *%%ss:(%%esi); cld\n\t"
34591+ "push %%ss\n\t"
34592+ "pop %%ds\n\t"
34593 "jc 1f\n\t"
34594 "xor %%ah, %%ah\n"
34595 "1:"
34596@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34597 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34598 "b" (bx),
34599 "D" ((long)reg),
34600- "S" (&pci_indirect));
34601+ "S" (&pci_indirect),
34602+ "r" (__PCIBIOS_DS));
34603 /*
34604 * Zero-extend the result beyond 8 bits, do not trust the
34605 * BIOS having done it:
34606@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34607 *value &= 0xff;
34608 break;
34609 case 2:
34610- __asm__("lcall *(%%esi); cld\n\t"
34611+ __asm__("movw %w6, %%ds\n\t"
34612+ "lcall *%%ss:(%%esi); cld\n\t"
34613+ "push %%ss\n\t"
34614+ "pop %%ds\n\t"
34615 "jc 1f\n\t"
34616 "xor %%ah, %%ah\n"
34617 "1:"
34618@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34619 : "1" (PCIBIOS_READ_CONFIG_WORD),
34620 "b" (bx),
34621 "D" ((long)reg),
34622- "S" (&pci_indirect));
34623+ "S" (&pci_indirect),
34624+ "r" (__PCIBIOS_DS));
34625 /*
34626 * Zero-extend the result beyond 16 bits, do not trust the
34627 * BIOS having done it:
34628@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34629 *value &= 0xffff;
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@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34641 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34642 "b" (bx),
34643 "D" ((long)reg),
34644- "S" (&pci_indirect));
34645+ "S" (&pci_indirect),
34646+ "r" (__PCIBIOS_DS));
34647 break;
34648 }
34649
34650@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34651
34652 switch (len) {
34653 case 1:
34654- __asm__("lcall *(%%esi); cld\n\t"
34655+ __asm__("movw %w6, %%ds\n\t"
34656+ "lcall *%%ss:(%%esi); cld\n\t"
34657+ "push %%ss\n\t"
34658+ "pop %%ds\n\t"
34659 "jc 1f\n\t"
34660 "xor %%ah, %%ah\n"
34661 "1:"
34662@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34663 "c" (value),
34664 "b" (bx),
34665 "D" ((long)reg),
34666- "S" (&pci_indirect));
34667+ "S" (&pci_indirect),
34668+ "r" (__PCIBIOS_DS));
34669 break;
34670 case 2:
34671- __asm__("lcall *(%%esi); cld\n\t"
34672+ __asm__("movw %w6, %%ds\n\t"
34673+ "lcall *%%ss:(%%esi); cld\n\t"
34674+ "push %%ss\n\t"
34675+ "pop %%ds\n\t"
34676 "jc 1f\n\t"
34677 "xor %%ah, %%ah\n"
34678 "1:"
34679@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34680 "c" (value),
34681 "b" (bx),
34682 "D" ((long)reg),
34683- "S" (&pci_indirect));
34684+ "S" (&pci_indirect),
34685+ "r" (__PCIBIOS_DS));
34686 break;
34687 case 4:
34688- __asm__("lcall *(%%esi); cld\n\t"
34689+ __asm__("movw %w6, %%ds\n\t"
34690+ "lcall *%%ss:(%%esi); cld\n\t"
34691+ "push %%ss\n\t"
34692+ "pop %%ds\n\t"
34693 "jc 1f\n\t"
34694 "xor %%ah, %%ah\n"
34695 "1:"
34696@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34697 "c" (value),
34698 "b" (bx),
34699 "D" ((long)reg),
34700- "S" (&pci_indirect));
34701+ "S" (&pci_indirect),
34702+ "r" (__PCIBIOS_DS));
34703 break;
34704 }
34705
34706@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34707
34708 DBG("PCI: Fetching IRQ routing table... ");
34709 __asm__("push %%es\n\t"
34710+ "movw %w8, %%ds\n\t"
34711 "push %%ds\n\t"
34712 "pop %%es\n\t"
34713- "lcall *(%%esi); cld\n\t"
34714+ "lcall *%%ss:(%%esi); cld\n\t"
34715 "pop %%es\n\t"
34716+ "push %%ss\n\t"
34717+ "pop %%ds\n"
34718 "jc 1f\n\t"
34719 "xor %%ah, %%ah\n"
34720 "1:"
34721@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34722 "1" (0),
34723 "D" ((long) &opt),
34724 "S" (&pci_indirect),
34725- "m" (opt)
34726+ "m" (opt),
34727+ "r" (__PCIBIOS_DS)
34728 : "memory");
34729 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34730 if (ret & 0xff00)
34731@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34732 {
34733 int ret;
34734
34735- __asm__("lcall *(%%esi); cld\n\t"
34736+ __asm__("movw %w5, %%ds\n\t"
34737+ "lcall *%%ss:(%%esi); cld\n\t"
34738+ "push %%ss\n\t"
34739+ "pop %%ds\n"
34740 "jc 1f\n\t"
34741 "xor %%ah, %%ah\n"
34742 "1:"
34743@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34744 : "0" (PCIBIOS_SET_PCI_HW_INT),
34745 "b" ((dev->bus->number << 8) | dev->devfn),
34746 "c" ((irq << 8) | (pin + 10)),
34747- "S" (&pci_indirect));
34748+ "S" (&pci_indirect),
34749+ "r" (__PCIBIOS_DS));
34750 return !(ret & 0xff00);
34751 }
34752 EXPORT_SYMBOL(pcibios_set_irq_routing);
34753diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34754index ed5b673..24d2d53 100644
34755--- a/arch/x86/platform/efi/efi_32.c
34756+++ b/arch/x86/platform/efi/efi_32.c
34757@@ -61,11 +61,27 @@ pgd_t * __init efi_call_phys_prolog(void)
34758 struct desc_ptr gdt_descr;
34759 pgd_t *save_pgd;
34760
34761+#ifdef CONFIG_PAX_KERNEXEC
34762+ struct desc_struct d;
34763+#endif
34764+
34765 /* Current pgd is swapper_pg_dir, we'll restore it later: */
34766+#ifdef CONFIG_PAX_PER_CPU_PGD
34767+ save_pgd = get_cpu_pgd(smp_processor_id(), kernel);
34768+#else
34769 save_pgd = swapper_pg_dir;
34770+#endif
34771+
34772 load_cr3(initial_page_table);
34773 __flush_tlb_all();
34774
34775+#ifdef CONFIG_PAX_KERNEXEC
34776+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34777+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34778+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34779+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34780+#endif
34781+
34782 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34783 gdt_descr.size = GDT_SIZE - 1;
34784 load_gdt(&gdt_descr);
34785@@ -77,6 +93,14 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
34786 {
34787 struct desc_ptr gdt_descr;
34788
34789+#ifdef CONFIG_PAX_KERNEXEC
34790+ struct desc_struct d;
34791+
34792+ memset(&d, 0, sizeof d);
34793+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34794+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34795+#endif
34796+
34797 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34798 gdt_descr.size = GDT_SIZE - 1;
34799 load_gdt(&gdt_descr);
34800diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34801index a0ac0f9..f41d324 100644
34802--- a/arch/x86/platform/efi/efi_64.c
34803+++ b/arch/x86/platform/efi/efi_64.c
34804@@ -96,6 +96,11 @@ pgd_t * __init efi_call_phys_prolog(void)
34805 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34806 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34807 }
34808+
34809+#ifdef CONFIG_PAX_PER_CPU_PGD
34810+ load_cr3(swapper_pg_dir);
34811+#endif
34812+
34813 __flush_tlb_all();
34814
34815 return save_pgd;
34816@@ -119,6 +124,10 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
34817
34818 kfree(save_pgd);
34819
34820+#ifdef CONFIG_PAX_PER_CPU_PGD
34821+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34822+#endif
34823+
34824 __flush_tlb_all();
34825 early_code_mapping_set_exec(0);
34826 }
34827@@ -148,8 +157,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34828 unsigned npages;
34829 pgd_t *pgd;
34830
34831- if (efi_enabled(EFI_OLD_MEMMAP))
34832+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34833+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34834+ * able to execute the EFI services.
34835+ */
34836+ if (__supported_pte_mask & _PAGE_NX) {
34837+ unsigned long addr = (unsigned long) __va(0);
34838+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34839+
34840+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34841+#ifdef CONFIG_PAX_PER_CPU_PGD
34842+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34843+#endif
34844+ set_pgd(pgd_offset_k(addr), pe);
34845+ }
34846+
34847 return 0;
34848+ }
34849
34850 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34851 pgd = __va(efi_scratch.efi_pgt);
34852diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34853index 040192b..7d3300f 100644
34854--- a/arch/x86/platform/efi/efi_stub_32.S
34855+++ b/arch/x86/platform/efi/efi_stub_32.S
34856@@ -6,7 +6,9 @@
34857 */
34858
34859 #include <linux/linkage.h>
34860+#include <linux/init.h>
34861 #include <asm/page_types.h>
34862+#include <asm/segment.h>
34863
34864 /*
34865 * efi_call_phys(void *, ...) is a function with variable parameters.
34866@@ -20,7 +22,7 @@
34867 * service functions will comply with gcc calling convention, too.
34868 */
34869
34870-.text
34871+__INIT
34872 ENTRY(efi_call_phys)
34873 /*
34874 * 0. The function can only be called in Linux kernel. So CS has been
34875@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34876 * The mapping of lower virtual memory has been created in prolog and
34877 * epilog.
34878 */
34879- movl $1f, %edx
34880- subl $__PAGE_OFFSET, %edx
34881- jmp *%edx
34882+#ifdef CONFIG_PAX_KERNEXEC
34883+ movl $(__KERNEXEC_EFI_DS), %edx
34884+ mov %edx, %ds
34885+ mov %edx, %es
34886+ mov %edx, %ss
34887+ addl $2f,(1f)
34888+ ljmp *(1f)
34889+
34890+__INITDATA
34891+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34892+.previous
34893+
34894+2:
34895+ subl $2b,(1b)
34896+#else
34897+ jmp 1f-__PAGE_OFFSET
34898 1:
34899+#endif
34900
34901 /*
34902 * 2. Now on the top of stack is the return
34903@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34904 * parameter 2, ..., param n. To make things easy, we save the return
34905 * address of efi_call_phys in a global variable.
34906 */
34907- popl %edx
34908- movl %edx, saved_return_addr
34909- /* get the function pointer into ECX*/
34910- popl %ecx
34911- movl %ecx, efi_rt_function_ptr
34912- movl $2f, %edx
34913- subl $__PAGE_OFFSET, %edx
34914- pushl %edx
34915+ popl (saved_return_addr)
34916+ popl (efi_rt_function_ptr)
34917
34918 /*
34919 * 3. Clear PG bit in %CR0.
34920@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34921 /*
34922 * 5. Call the physical function.
34923 */
34924- jmp *%ecx
34925+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
34926
34927-2:
34928 /*
34929 * 6. After EFI runtime service returns, control will return to
34930 * following instruction. We'd better readjust stack pointer first.
34931@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34932 movl %cr0, %edx
34933 orl $0x80000000, %edx
34934 movl %edx, %cr0
34935- jmp 1f
34936-1:
34937+
34938 /*
34939 * 8. Now restore the virtual mode from flat mode by
34940 * adding EIP with PAGE_OFFSET.
34941 */
34942- movl $1f, %edx
34943- jmp *%edx
34944+#ifdef CONFIG_PAX_KERNEXEC
34945+ movl $(__KERNEL_DS), %edx
34946+ mov %edx, %ds
34947+ mov %edx, %es
34948+ mov %edx, %ss
34949+ ljmp $(__KERNEL_CS),$1f
34950+#else
34951+ jmp 1f+__PAGE_OFFSET
34952+#endif
34953 1:
34954
34955 /*
34956 * 9. Balance the stack. And because EAX contain the return value,
34957 * we'd better not clobber it.
34958 */
34959- leal efi_rt_function_ptr, %edx
34960- movl (%edx), %ecx
34961- pushl %ecx
34962+ pushl (efi_rt_function_ptr)
34963
34964 /*
34965- * 10. Push the saved return address onto the stack and return.
34966+ * 10. Return to the saved return address.
34967 */
34968- leal saved_return_addr, %edx
34969- movl (%edx), %ecx
34970- pushl %ecx
34971- ret
34972+ jmpl *(saved_return_addr)
34973 ENDPROC(efi_call_phys)
34974 .previous
34975
34976-.data
34977+__INITDATA
34978 saved_return_addr:
34979 .long 0
34980 efi_rt_function_ptr:
34981diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34982index 86d0f9e..6d499f4 100644
34983--- a/arch/x86/platform/efi/efi_stub_64.S
34984+++ b/arch/x86/platform/efi/efi_stub_64.S
34985@@ -11,6 +11,7 @@
34986 #include <asm/msr.h>
34987 #include <asm/processor-flags.h>
34988 #include <asm/page_types.h>
34989+#include <asm/alternative-asm.h>
34990
34991 #define SAVE_XMM \
34992 mov %rsp, %rax; \
34993@@ -88,6 +89,7 @@ ENTRY(efi_call)
34994 RESTORE_PGT
34995 addq $48, %rsp
34996 RESTORE_XMM
34997+ pax_force_retaddr 0, 1
34998 ret
34999 ENDPROC(efi_call)
35000
35001diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35002index 3005f0c..d06aeb0 100644
35003--- a/arch/x86/platform/intel-mid/intel-mid.c
35004+++ b/arch/x86/platform/intel-mid/intel-mid.c
35005@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35006 /* intel_mid_ops to store sub arch ops */
35007 struct intel_mid_ops *intel_mid_ops;
35008 /* getter function for sub arch ops*/
35009-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35010+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35011 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35012 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35013
35014@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35015 {
35016 };
35017
35018-static void intel_mid_reboot(void)
35019+static void __noreturn intel_mid_reboot(void)
35020 {
35021 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35022+ BUG();
35023 }
35024
35025 static unsigned long __init intel_mid_calibrate_tsc(void)
35026diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35027index 3c1c386..59a68ed 100644
35028--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35029+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35030@@ -13,6 +13,6 @@
35031 /* For every CPU addition a new get_<cpuname>_ops interface needs
35032 * to be added.
35033 */
35034-extern void *get_penwell_ops(void);
35035-extern void *get_cloverview_ops(void);
35036-extern void *get_tangier_ops(void);
35037+extern const void *get_penwell_ops(void);
35038+extern const void *get_cloverview_ops(void);
35039+extern const void *get_tangier_ops(void);
35040diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35041index 23381d2..8ddc10e 100644
35042--- a/arch/x86/platform/intel-mid/mfld.c
35043+++ b/arch/x86/platform/intel-mid/mfld.c
35044@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35045 pm_power_off = mfld_power_off;
35046 }
35047
35048-void *get_penwell_ops(void)
35049+const void *get_penwell_ops(void)
35050 {
35051 return &penwell_ops;
35052 }
35053
35054-void *get_cloverview_ops(void)
35055+const void *get_cloverview_ops(void)
35056 {
35057 return &penwell_ops;
35058 }
35059diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35060index aaca917..66eadbc 100644
35061--- a/arch/x86/platform/intel-mid/mrfl.c
35062+++ b/arch/x86/platform/intel-mid/mrfl.c
35063@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35064 .arch_setup = tangier_arch_setup,
35065 };
35066
35067-void *get_tangier_ops(void)
35068+const void *get_tangier_ops(void)
35069 {
35070 return &tangier_ops;
35071 }
35072diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35073index 278e4da..55e8d8a 100644
35074--- a/arch/x86/platform/intel-quark/imr_selftest.c
35075+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35076@@ -55,7 +55,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35077 */
35078 static void __init imr_self_test(void)
35079 {
35080- phys_addr_t base = virt_to_phys(&_text);
35081+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35082 size_t size = virt_to_phys(&__end_rodata) - base;
35083 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35084 int ret;
35085diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35086index d6ee929..3637cb5 100644
35087--- a/arch/x86/platform/olpc/olpc_dt.c
35088+++ b/arch/x86/platform/olpc/olpc_dt.c
35089@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35090 return res;
35091 }
35092
35093-static struct of_pdt_ops prom_olpc_ops __initdata = {
35094+static struct of_pdt_ops prom_olpc_ops __initconst = {
35095 .nextprop = olpc_dt_nextprop,
35096 .getproplen = olpc_dt_getproplen,
35097 .getproperty = olpc_dt_getproperty,
35098diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35099index 757678f..9895d9b 100644
35100--- a/arch/x86/power/cpu.c
35101+++ b/arch/x86/power/cpu.c
35102@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35103 static void fix_processor_context(void)
35104 {
35105 int cpu = smp_processor_id();
35106- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
35107-#ifdef CONFIG_X86_64
35108- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35109- tss_desc tss;
35110-#endif
35111+ struct tss_struct *t = cpu_tss + cpu;
35112+
35113 set_tss_desc(cpu, t); /*
35114 * This just modifies memory; should not be
35115 * necessary. But... This is necessary, because
35116@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35117 */
35118
35119 #ifdef CONFIG_X86_64
35120- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35121- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35122- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35123-
35124 syscall_init(); /* This sets MSR_*STAR and related */
35125 #endif
35126 load_TR_desc(); /* This does ltr */
35127diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35128index 0b7a63d..0d0f2c2 100644
35129--- a/arch/x86/realmode/init.c
35130+++ b/arch/x86/realmode/init.c
35131@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35132 __va(real_mode_header->trampoline_header);
35133
35134 #ifdef CONFIG_X86_32
35135- trampoline_header->start = __pa_symbol(startup_32_smp);
35136+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35137+
35138+#ifdef CONFIG_PAX_KERNEXEC
35139+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35140+#endif
35141+
35142+ trampoline_header->boot_cs = __BOOT_CS;
35143 trampoline_header->gdt_limit = __BOOT_DS + 7;
35144 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35145 #else
35146@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35147 *trampoline_cr4_features = __read_cr4();
35148
35149 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35150- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35151+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35152 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35153 #endif
35154 }
35155diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35156index 2730d77..2e4cd19 100644
35157--- a/arch/x86/realmode/rm/Makefile
35158+++ b/arch/x86/realmode/rm/Makefile
35159@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35160
35161 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35162 -I$(srctree)/arch/x86/boot
35163+ifdef CONSTIFY_PLUGIN
35164+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35165+endif
35166 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35167 GCOV_PROFILE := n
35168diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35169index a28221d..93c40f1 100644
35170--- a/arch/x86/realmode/rm/header.S
35171+++ b/arch/x86/realmode/rm/header.S
35172@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35173 #endif
35174 /* APM/BIOS reboot */
35175 .long pa_machine_real_restart_asm
35176-#ifdef CONFIG_X86_64
35177+#ifdef CONFIG_X86_32
35178+ .long __KERNEL_CS
35179+#else
35180 .long __KERNEL32_CS
35181 #endif
35182 END(real_mode_header)
35183diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35184index d66c607..3def845 100644
35185--- a/arch/x86/realmode/rm/reboot.S
35186+++ b/arch/x86/realmode/rm/reboot.S
35187@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35188 lgdtl pa_tr_gdt
35189
35190 /* Disable paging to drop us out of long mode */
35191+ movl %cr4, %eax
35192+ andl $~X86_CR4_PCIDE, %eax
35193+ movl %eax, %cr4
35194+
35195 movl %cr0, %eax
35196 andl $~X86_CR0_PG, %eax
35197 movl %eax, %cr0
35198diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35199index 48ddd76..c26749f 100644
35200--- a/arch/x86/realmode/rm/trampoline_32.S
35201+++ b/arch/x86/realmode/rm/trampoline_32.S
35202@@ -24,6 +24,12 @@
35203 #include <asm/page_types.h>
35204 #include "realmode.h"
35205
35206+#ifdef CONFIG_PAX_KERNEXEC
35207+#define ta(X) (X)
35208+#else
35209+#define ta(X) (pa_ ## X)
35210+#endif
35211+
35212 .text
35213 .code16
35214
35215@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35216
35217 cli # We should be safe anyway
35218
35219- movl tr_start, %eax # where we need to go
35220-
35221 movl $0xA5A5A5A5, trampoline_status
35222 # write marker for master knows we're running
35223
35224@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35225 movw $1, %dx # protected mode (PE) bit
35226 lmsw %dx # into protected mode
35227
35228- ljmpl $__BOOT_CS, $pa_startup_32
35229+ ljmpl *(trampoline_header)
35230
35231 .section ".text32","ax"
35232 .code32
35233@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35234 .balign 8
35235 GLOBAL(trampoline_header)
35236 tr_start: .space 4
35237- tr_gdt_pad: .space 2
35238+ tr_boot_cs: .space 2
35239 tr_gdt: .space 6
35240 END(trampoline_header)
35241
35242diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35243index dac7b20..72dbaca 100644
35244--- a/arch/x86/realmode/rm/trampoline_64.S
35245+++ b/arch/x86/realmode/rm/trampoline_64.S
35246@@ -93,6 +93,7 @@ ENTRY(startup_32)
35247 movl %edx, %gs
35248
35249 movl pa_tr_cr4, %eax
35250+ andl $~X86_CR4_PCIDE, %eax
35251 movl %eax, %cr4 # Enable PAE mode
35252
35253 # Setup trampoline 4 level pagetables
35254@@ -106,7 +107,7 @@ ENTRY(startup_32)
35255 wrmsr
35256
35257 # Enable paging and in turn activate Long Mode
35258- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35259+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35260 movl %eax, %cr0
35261
35262 /*
35263diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35264index 9e7e147..25a4158 100644
35265--- a/arch/x86/realmode/rm/wakeup_asm.S
35266+++ b/arch/x86/realmode/rm/wakeup_asm.S
35267@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35268 lgdtl pmode_gdt
35269
35270 /* This really couldn't... */
35271- movl pmode_entry, %eax
35272 movl pmode_cr0, %ecx
35273 movl %ecx, %cr0
35274- ljmpl $__KERNEL_CS, $pa_startup_32
35275- /* -> jmp *%eax in trampoline_32.S */
35276+
35277+ ljmpl *pmode_entry
35278 #else
35279 jmp trampoline_start
35280 #endif
35281diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35282index 604a37e..e49702a 100644
35283--- a/arch/x86/tools/Makefile
35284+++ b/arch/x86/tools/Makefile
35285@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35286
35287 $(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
35288
35289-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35290+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35291 hostprogs-y += relocs
35292 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35293 PHONY += relocs
35294diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35295index 0c2fae8..88036b7 100644
35296--- a/arch/x86/tools/relocs.c
35297+++ b/arch/x86/tools/relocs.c
35298@@ -1,5 +1,7 @@
35299 /* This is included from relocs_32/64.c */
35300
35301+#include "../../../include/generated/autoconf.h"
35302+
35303 #define ElfW(type) _ElfW(ELF_BITS, type)
35304 #define _ElfW(bits, type) __ElfW(bits, type)
35305 #define __ElfW(bits, type) Elf##bits##_##type
35306@@ -11,6 +13,7 @@
35307 #define Elf_Sym ElfW(Sym)
35308
35309 static Elf_Ehdr ehdr;
35310+static Elf_Phdr *phdr;
35311
35312 struct relocs {
35313 uint32_t *offset;
35314@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35315 }
35316 }
35317
35318+static void read_phdrs(FILE *fp)
35319+{
35320+ unsigned int i;
35321+
35322+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35323+ if (!phdr) {
35324+ die("Unable to allocate %d program headers\n",
35325+ ehdr.e_phnum);
35326+ }
35327+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35328+ die("Seek to %d failed: %s\n",
35329+ ehdr.e_phoff, strerror(errno));
35330+ }
35331+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35332+ die("Cannot read ELF program headers: %s\n",
35333+ strerror(errno));
35334+ }
35335+ for(i = 0; i < ehdr.e_phnum; i++) {
35336+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35337+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35338+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35339+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35340+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35341+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35342+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35343+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35344+ }
35345+
35346+}
35347+
35348 static void read_shdrs(FILE *fp)
35349 {
35350- int i;
35351+ unsigned int i;
35352 Elf_Shdr shdr;
35353
35354 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35355@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35356
35357 static void read_strtabs(FILE *fp)
35358 {
35359- int i;
35360+ unsigned int i;
35361 for (i = 0; i < ehdr.e_shnum; i++) {
35362 struct section *sec = &secs[i];
35363 if (sec->shdr.sh_type != SHT_STRTAB) {
35364@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35365
35366 static void read_symtabs(FILE *fp)
35367 {
35368- int i,j;
35369+ unsigned int i,j;
35370 for (i = 0; i < ehdr.e_shnum; i++) {
35371 struct section *sec = &secs[i];
35372 if (sec->shdr.sh_type != SHT_SYMTAB) {
35373@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35374 }
35375
35376
35377-static void read_relocs(FILE *fp)
35378+static void read_relocs(FILE *fp, int use_real_mode)
35379 {
35380- int i,j;
35381+ unsigned int i,j;
35382+ uint32_t base;
35383+
35384 for (i = 0; i < ehdr.e_shnum; i++) {
35385 struct section *sec = &secs[i];
35386 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35387@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35388 die("Cannot read symbol table: %s\n",
35389 strerror(errno));
35390 }
35391+ base = 0;
35392+
35393+#ifdef CONFIG_X86_32
35394+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35395+ if (phdr[j].p_type != PT_LOAD )
35396+ continue;
35397+ 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)
35398+ continue;
35399+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35400+ break;
35401+ }
35402+#endif
35403+
35404 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35405 Elf_Rel *rel = &sec->reltab[j];
35406- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35407+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35408 rel->r_info = elf_xword_to_cpu(rel->r_info);
35409 #if (SHT_REL_TYPE == SHT_RELA)
35410 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35411@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35412
35413 static void print_absolute_symbols(void)
35414 {
35415- int i;
35416+ unsigned int i;
35417 const char *format;
35418
35419 if (ELF_BITS == 64)
35420@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35421 for (i = 0; i < ehdr.e_shnum; i++) {
35422 struct section *sec = &secs[i];
35423 char *sym_strtab;
35424- int j;
35425+ unsigned int j;
35426
35427 if (sec->shdr.sh_type != SHT_SYMTAB) {
35428 continue;
35429@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35430
35431 static void print_absolute_relocs(void)
35432 {
35433- int i, printed = 0;
35434+ unsigned int i, printed = 0;
35435 const char *format;
35436
35437 if (ELF_BITS == 64)
35438@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35439 struct section *sec_applies, *sec_symtab;
35440 char *sym_strtab;
35441 Elf_Sym *sh_symtab;
35442- int j;
35443+ unsigned int j;
35444 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35445 continue;
35446 }
35447@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35448 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35449 Elf_Sym *sym, const char *symname))
35450 {
35451- int i;
35452+ unsigned int i;
35453 /* Walk through the relocations */
35454 for (i = 0; i < ehdr.e_shnum; i++) {
35455 char *sym_strtab;
35456 Elf_Sym *sh_symtab;
35457 struct section *sec_applies, *sec_symtab;
35458- int j;
35459+ unsigned int j;
35460 struct section *sec = &secs[i];
35461
35462 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35463@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35464 {
35465 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35466 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35467+ char *sym_strtab = sec->link->link->strtab;
35468+
35469+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35470+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35471+ return 0;
35472+
35473+#ifdef CONFIG_PAX_KERNEXEC
35474+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35475+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35476+ return 0;
35477+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35478+ return 0;
35479+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35480+ return 0;
35481+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35482+ return 0;
35483+#endif
35484
35485 switch (r_type) {
35486 case R_386_NONE:
35487@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35488
35489 static void emit_relocs(int as_text, int use_real_mode)
35490 {
35491- int i;
35492+ unsigned int i;
35493 int (*write_reloc)(uint32_t, FILE *) = write32;
35494 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35495 const char *symname);
35496@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35497 {
35498 regex_init(use_real_mode);
35499 read_ehdr(fp);
35500+ read_phdrs(fp);
35501 read_shdrs(fp);
35502 read_strtabs(fp);
35503 read_symtabs(fp);
35504- read_relocs(fp);
35505+ read_relocs(fp, use_real_mode);
35506 if (ELF_BITS == 64)
35507 percpu_init();
35508 if (show_absolute_syms) {
35509diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35510index f40281e..92728c9 100644
35511--- a/arch/x86/um/mem_32.c
35512+++ b/arch/x86/um/mem_32.c
35513@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35514 gate_vma.vm_start = FIXADDR_USER_START;
35515 gate_vma.vm_end = FIXADDR_USER_END;
35516 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35517- gate_vma.vm_page_prot = __P101;
35518+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35519
35520 return 0;
35521 }
35522diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35523index 80ffa5b..a33bd15 100644
35524--- a/arch/x86/um/tls_32.c
35525+++ b/arch/x86/um/tls_32.c
35526@@ -260,7 +260,7 @@ out:
35527 if (unlikely(task == current &&
35528 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35529 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35530- "without flushed TLS.", current->pid);
35531+ "without flushed TLS.", task_pid_nr(current));
35532 }
35533
35534 return 0;
35535diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35536index e970320..c006fea 100644
35537--- a/arch/x86/vdso/Makefile
35538+++ b/arch/x86/vdso/Makefile
35539@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35540 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35541 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35542
35543-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35544+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35545 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35546 GCOV_PROFILE := n
35547
35548diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35549index 0224987..c7d65a5 100644
35550--- a/arch/x86/vdso/vdso2c.h
35551+++ b/arch/x86/vdso/vdso2c.h
35552@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35553 unsigned long load_size = -1; /* Work around bogus warning */
35554 unsigned long mapping_size;
35555 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35556- int i;
35557+ unsigned int i;
35558 unsigned long j;
35559 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35560 *alt_sec = NULL;
35561diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35562index e904c27..b9eaa03 100644
35563--- a/arch/x86/vdso/vdso32-setup.c
35564+++ b/arch/x86/vdso/vdso32-setup.c
35565@@ -14,6 +14,7 @@
35566 #include <asm/cpufeature.h>
35567 #include <asm/processor.h>
35568 #include <asm/vdso.h>
35569+#include <asm/mman.h>
35570
35571 #ifdef CONFIG_COMPAT_VDSO
35572 #define VDSO_DEFAULT 0
35573diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35574index 1c9f750..cfddb1a 100644
35575--- a/arch/x86/vdso/vma.c
35576+++ b/arch/x86/vdso/vma.c
35577@@ -19,10 +19,7 @@
35578 #include <asm/page.h>
35579 #include <asm/hpet.h>
35580 #include <asm/desc.h>
35581-
35582-#if defined(CONFIG_X86_64)
35583-unsigned int __read_mostly vdso64_enabled = 1;
35584-#endif
35585+#include <asm/mman.h>
35586
35587 void __init init_vdso_image(const struct vdso_image *image)
35588 {
35589@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35590 .pages = no_pages,
35591 };
35592
35593+#ifdef CONFIG_PAX_RANDMMAP
35594+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35595+ calculate_addr = false;
35596+#endif
35597+
35598 if (calculate_addr) {
35599 addr = vdso_addr(current->mm->start_stack,
35600 image->size - image->sym_vvar_start);
35601@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35602 down_write(&mm->mmap_sem);
35603
35604 addr = get_unmapped_area(NULL, addr,
35605- image->size - image->sym_vvar_start, 0, 0);
35606+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35607 if (IS_ERR_VALUE(addr)) {
35608 ret = addr;
35609 goto up_fail;
35610 }
35611
35612 text_start = addr - image->sym_vvar_start;
35613- current->mm->context.vdso = (void __user *)text_start;
35614+ mm->context.vdso = text_start;
35615
35616 /*
35617 * MAYWRITE to allow gdb to COW and set breakpoints
35618@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35619 hpet_address >> PAGE_SHIFT,
35620 PAGE_SIZE,
35621 pgprot_noncached(PAGE_READONLY));
35622-
35623- if (ret)
35624- goto up_fail;
35625 }
35626 #endif
35627
35628 up_fail:
35629 if (ret)
35630- current->mm->context.vdso = NULL;
35631+ current->mm->context.vdso = 0;
35632
35633 up_write(&mm->mmap_sem);
35634 return ret;
35635@@ -191,8 +190,8 @@ static int load_vdso32(void)
35636
35637 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35638 current_thread_info()->sysenter_return =
35639- current->mm->context.vdso +
35640- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35641+ (void __force_user *)(current->mm->context.vdso +
35642+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35643
35644 return 0;
35645 }
35646@@ -201,9 +200,6 @@ static int load_vdso32(void)
35647 #ifdef CONFIG_X86_64
35648 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35649 {
35650- if (!vdso64_enabled)
35651- return 0;
35652-
35653 return map_vdso(&vdso_image_64, true);
35654 }
35655
35656@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35657 int uses_interp)
35658 {
35659 #ifdef CONFIG_X86_X32_ABI
35660- if (test_thread_flag(TIF_X32)) {
35661- if (!vdso64_enabled)
35662- return 0;
35663-
35664+ if (test_thread_flag(TIF_X32))
35665 return map_vdso(&vdso_image_x32, true);
35666- }
35667 #endif
35668
35669 return load_vdso32();
35670@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35671 #endif
35672
35673 #ifdef CONFIG_X86_64
35674-static __init int vdso_setup(char *s)
35675-{
35676- vdso64_enabled = simple_strtoul(s, NULL, 0);
35677- return 0;
35678-}
35679-__setup("vdso=", vdso_setup);
35680-#endif
35681-
35682-#ifdef CONFIG_X86_64
35683 static void vgetcpu_cpu_init(void *arg)
35684 {
35685 int cpu = smp_processor_id();
35686diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35687index e88fda8..76ce7ce 100644
35688--- a/arch/x86/xen/Kconfig
35689+++ b/arch/x86/xen/Kconfig
35690@@ -9,6 +9,7 @@ config XEN
35691 select XEN_HAVE_PVMMU
35692 depends on X86_64 || (X86_32 && X86_PAE)
35693 depends on X86_TSC
35694+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35695 help
35696 This is the Linux Xen port. Enabling this will allow the
35697 kernel to boot in a paravirtualized environment under the
35698diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35699index a671e83..a9dc1d9 100644
35700--- a/arch/x86/xen/enlighten.c
35701+++ b/arch/x86/xen/enlighten.c
35702@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35703
35704 struct shared_info xen_dummy_shared_info;
35705
35706-void *xen_initial_gdt;
35707-
35708 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35709 __read_mostly int xen_have_vector_callback;
35710 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35711@@ -584,8 +582,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35712 {
35713 unsigned long va = dtr->address;
35714 unsigned int size = dtr->size + 1;
35715- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35716- unsigned long frames[pages];
35717+ unsigned long frames[65536 / PAGE_SIZE];
35718 int f;
35719
35720 /*
35721@@ -633,8 +630,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35722 {
35723 unsigned long va = dtr->address;
35724 unsigned int size = dtr->size + 1;
35725- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35726- unsigned long frames[pages];
35727+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35728 int f;
35729
35730 /*
35731@@ -642,7 +638,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35732 * 8-byte entries, or 16 4k pages..
35733 */
35734
35735- BUG_ON(size > 65536);
35736+ BUG_ON(size > GDT_SIZE);
35737 BUG_ON(va & ~PAGE_MASK);
35738
35739 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35740@@ -1263,30 +1259,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35741 #endif
35742 };
35743
35744-static void xen_reboot(int reason)
35745+static __noreturn void xen_reboot(int reason)
35746 {
35747 struct sched_shutdown r = { .reason = reason };
35748
35749- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35750- BUG();
35751+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35752+ BUG();
35753 }
35754
35755-static void xen_restart(char *msg)
35756+static __noreturn void xen_restart(char *msg)
35757 {
35758 xen_reboot(SHUTDOWN_reboot);
35759 }
35760
35761-static void xen_emergency_restart(void)
35762+static __noreturn void xen_emergency_restart(void)
35763 {
35764 xen_reboot(SHUTDOWN_reboot);
35765 }
35766
35767-static void xen_machine_halt(void)
35768+static __noreturn void xen_machine_halt(void)
35769 {
35770 xen_reboot(SHUTDOWN_poweroff);
35771 }
35772
35773-static void xen_machine_power_off(void)
35774+static __noreturn void xen_machine_power_off(void)
35775 {
35776 if (pm_power_off)
35777 pm_power_off();
35778@@ -1439,8 +1435,11 @@ static void __ref xen_setup_gdt(int cpu)
35779 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35780 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35781
35782- setup_stack_canary_segment(0);
35783- switch_to_new_gdt(0);
35784+ setup_stack_canary_segment(cpu);
35785+#ifdef CONFIG_X86_64
35786+ load_percpu_segment(cpu);
35787+#endif
35788+ switch_to_new_gdt(cpu);
35789
35790 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35791 pv_cpu_ops.load_gdt = xen_load_gdt;
35792@@ -1555,7 +1554,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35793 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35794
35795 /* Work out if we support NX */
35796- x86_configure_nx();
35797+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35798+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35799+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35800+ unsigned l, h;
35801+
35802+ __supported_pte_mask |= _PAGE_NX;
35803+ rdmsr(MSR_EFER, l, h);
35804+ l |= EFER_NX;
35805+ wrmsr(MSR_EFER, l, h);
35806+ }
35807+#endif
35808
35809 /* Get mfn list */
35810 xen_build_dynamic_phys_to_machine();
35811@@ -1583,13 +1592,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35812
35813 machine_ops = xen_machine_ops;
35814
35815- /*
35816- * The only reliable way to retain the initial address of the
35817- * percpu gdt_page is to remember it here, so we can go and
35818- * mark it RW later, when the initial percpu area is freed.
35819- */
35820- xen_initial_gdt = &per_cpu(gdt_page, 0);
35821-
35822 xen_smp_init();
35823
35824 #ifdef CONFIG_ACPI_NUMA
35825diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35826index dd151b2..d5ab952 100644
35827--- a/arch/x86/xen/mmu.c
35828+++ b/arch/x86/xen/mmu.c
35829@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35830 return val;
35831 }
35832
35833-static pteval_t pte_pfn_to_mfn(pteval_t val)
35834+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35835 {
35836 if (val & _PAGE_PRESENT) {
35837 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35838@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35839 * L3_k[511] -> level2_fixmap_pgt */
35840 convert_pfn_mfn(level3_kernel_pgt);
35841
35842+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35843+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35844+ convert_pfn_mfn(level3_vmemmap_pgt);
35845 /* L3_k[511][506] -> level1_fixmap_pgt */
35846+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35847 convert_pfn_mfn(level2_fixmap_pgt);
35848 }
35849 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35850@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35851 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35852 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35853 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35854+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35855+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35856+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35857 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35858 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35859+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35860 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35861 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35862- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35863+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
35864+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
35865+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
35866+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35867
35868 /* Pin down new L4 */
35869 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35870@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
35871 pv_mmu_ops.set_pud = xen_set_pud;
35872 #if CONFIG_PGTABLE_LEVELS == 4
35873 pv_mmu_ops.set_pgd = xen_set_pgd;
35874+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35875 #endif
35876
35877 /* This will work as long as patching hasn't happened yet
35878@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35879 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35880 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35881 .set_pgd = xen_set_pgd_hyper,
35882+ .set_pgd_batched = xen_set_pgd_hyper,
35883
35884 .alloc_pud = xen_alloc_pmd_init,
35885 .release_pud = xen_release_pmd_init,
35886diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35887index 8648438..18bac20 100644
35888--- a/arch/x86/xen/smp.c
35889+++ b/arch/x86/xen/smp.c
35890@@ -284,17 +284,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35891
35892 if (xen_pv_domain()) {
35893 if (!xen_feature(XENFEAT_writable_page_tables))
35894- /* We've switched to the "real" per-cpu gdt, so make
35895- * sure the old memory can be recycled. */
35896- make_lowmem_page_readwrite(xen_initial_gdt);
35897-
35898 #ifdef CONFIG_X86_32
35899 /*
35900 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35901 * expects __USER_DS
35902 */
35903- loadsegment(ds, __USER_DS);
35904- loadsegment(es, __USER_DS);
35905+ loadsegment(ds, __KERNEL_DS);
35906+ loadsegment(es, __KERNEL_DS);
35907 #endif
35908
35909 xen_filter_cpu_maps();
35910@@ -375,7 +371,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35911 #ifdef CONFIG_X86_32
35912 /* Note: PVH is not yet supported on x86_32. */
35913 ctxt->user_regs.fs = __KERNEL_PERCPU;
35914- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35915+ savesegment(gs, ctxt->user_regs.gs);
35916 #endif
35917 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
35918
35919@@ -383,8 +379,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35920 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35921 ctxt->flags = VGCF_IN_KERNEL;
35922 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35923- ctxt->user_regs.ds = __USER_DS;
35924- ctxt->user_regs.es = __USER_DS;
35925+ ctxt->user_regs.ds = __KERNEL_DS;
35926+ ctxt->user_regs.es = __KERNEL_DS;
35927 ctxt->user_regs.ss = __KERNEL_DS;
35928
35929 xen_copy_trap_info(ctxt->trap_ctxt);
35930@@ -720,7 +716,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35931
35932 void __init xen_smp_init(void)
35933 {
35934- smp_ops = xen_smp_ops;
35935+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35936 xen_fill_possible_map();
35937 }
35938
35939diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35940index fd92a64..1f72641 100644
35941--- a/arch/x86/xen/xen-asm_32.S
35942+++ b/arch/x86/xen/xen-asm_32.S
35943@@ -99,7 +99,7 @@ ENTRY(xen_iret)
35944 pushw %fs
35945 movl $(__KERNEL_PERCPU), %eax
35946 movl %eax, %fs
35947- movl %fs:xen_vcpu, %eax
35948+ mov PER_CPU_VAR(xen_vcpu), %eax
35949 POP_FS
35950 #else
35951 movl %ss:xen_vcpu, %eax
35952diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35953index 8afdfcc..79239db 100644
35954--- a/arch/x86/xen/xen-head.S
35955+++ b/arch/x86/xen/xen-head.S
35956@@ -41,6 +41,17 @@ ENTRY(startup_xen)
35957 #ifdef CONFIG_X86_32
35958 mov %esi,xen_start_info
35959 mov $init_thread_union+THREAD_SIZE,%esp
35960+#ifdef CONFIG_SMP
35961+ movl $cpu_gdt_table,%edi
35962+ movl $__per_cpu_load,%eax
35963+ movw %ax,__KERNEL_PERCPU + 2(%edi)
35964+ rorl $16,%eax
35965+ movb %al,__KERNEL_PERCPU + 4(%edi)
35966+ movb %ah,__KERNEL_PERCPU + 7(%edi)
35967+ movl $__per_cpu_end - 1,%eax
35968+ subl $__per_cpu_start,%eax
35969+ movw %ax,__KERNEL_PERCPU + 0(%edi)
35970+#endif
35971 #else
35972 mov %rsi,xen_start_info
35973 mov $init_thread_union+THREAD_SIZE,%rsp
35974diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35975index 9e195c6..523ed36 100644
35976--- a/arch/x86/xen/xen-ops.h
35977+++ b/arch/x86/xen/xen-ops.h
35978@@ -16,8 +16,6 @@ void xen_syscall_target(void);
35979 void xen_syscall32_target(void);
35980 #endif
35981
35982-extern void *xen_initial_gdt;
35983-
35984 struct trap_info;
35985 void xen_copy_trap_info(struct trap_info *traps);
35986
35987diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35988index 525bd3d..ef888b1 100644
35989--- a/arch/xtensa/variants/dc232b/include/variant/core.h
35990+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35991@@ -119,9 +119,9 @@
35992 ----------------------------------------------------------------------*/
35993
35994 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35995-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35996 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35997 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35998+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35999
36000 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36001 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36002diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36003index 2f33760..835e50a 100644
36004--- a/arch/xtensa/variants/fsf/include/variant/core.h
36005+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36006@@ -11,6 +11,7 @@
36007 #ifndef _XTENSA_CORE_H
36008 #define _XTENSA_CORE_H
36009
36010+#include <linux/const.h>
36011
36012 /****************************************************************************
36013 Parameters Useful for Any Code, USER or PRIVILEGED
36014@@ -112,9 +113,9 @@
36015 ----------------------------------------------------------------------*/
36016
36017 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36018-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36019 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36020 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36021+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36022
36023 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36024 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36025diff --git a/block/bio.c b/block/bio.c
36026index 4441522..dedbafc 100644
36027--- a/block/bio.c
36028+++ b/block/bio.c
36029@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36030 /*
36031 * Overflow, abort
36032 */
36033- if (end < start)
36034+ if (end < start || end - start > INT_MAX - nr_pages)
36035 return ERR_PTR(-EINVAL);
36036
36037 nr_pages += end - start;
36038@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36039 /*
36040 * Overflow, abort
36041 */
36042- if (end < start)
36043+ if (end < start || end - start > INT_MAX - nr_pages)
36044 return ERR_PTR(-EINVAL);
36045
36046 nr_pages += end - start;
36047diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36048index 0736729..2ec3b48 100644
36049--- a/block/blk-iopoll.c
36050+++ b/block/blk-iopoll.c
36051@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36052 }
36053 EXPORT_SYMBOL(blk_iopoll_complete);
36054
36055-static void blk_iopoll_softirq(struct softirq_action *h)
36056+static __latent_entropy void blk_iopoll_softirq(void)
36057 {
36058 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36059 int rearm = 0, budget = blk_iopoll_budget;
36060diff --git a/block/blk-map.c b/block/blk-map.c
36061index da310a1..213b5c9 100644
36062--- a/block/blk-map.c
36063+++ b/block/blk-map.c
36064@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36065 if (!len || !kbuf)
36066 return -EINVAL;
36067
36068- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36069+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36070 if (do_copy)
36071 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36072 else
36073diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36074index 53b1737..08177d2e 100644
36075--- a/block/blk-softirq.c
36076+++ b/block/blk-softirq.c
36077@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36078 * Softirq action handler - move entries to local list and loop over them
36079 * while passing them to the queue registered handler.
36080 */
36081-static void blk_done_softirq(struct softirq_action *h)
36082+static __latent_entropy void blk_done_softirq(void)
36083 {
36084 struct list_head *cpu_list, local_list;
36085
36086diff --git a/block/bsg.c b/block/bsg.c
36087index d214e92..9649863 100644
36088--- a/block/bsg.c
36089+++ b/block/bsg.c
36090@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36091 struct sg_io_v4 *hdr, struct bsg_device *bd,
36092 fmode_t has_write_perm)
36093 {
36094+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36095+ unsigned char *cmdptr;
36096+
36097 if (hdr->request_len > BLK_MAX_CDB) {
36098 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36099 if (!rq->cmd)
36100 return -ENOMEM;
36101- }
36102+ cmdptr = rq->cmd;
36103+ } else
36104+ cmdptr = tmpcmd;
36105
36106- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36107+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36108 hdr->request_len))
36109 return -EFAULT;
36110
36111+ if (cmdptr != rq->cmd)
36112+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36113+
36114 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36115 if (blk_verify_command(rq->cmd, has_write_perm))
36116 return -EPERM;
36117diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36118index f678c73..f35aa18 100644
36119--- a/block/compat_ioctl.c
36120+++ b/block/compat_ioctl.c
36121@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36122 cgc = compat_alloc_user_space(sizeof(*cgc));
36123 cgc32 = compat_ptr(arg);
36124
36125- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36126+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36127 get_user(data, &cgc32->buffer) ||
36128 put_user(compat_ptr(data), &cgc->buffer) ||
36129 copy_in_user(&cgc->buflen, &cgc32->buflen,
36130@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36131 err |= __get_user(f->spec1, &uf->spec1);
36132 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36133 err |= __get_user(name, &uf->name);
36134- f->name = compat_ptr(name);
36135+ f->name = (void __force_kernel *)compat_ptr(name);
36136 if (err) {
36137 err = -EFAULT;
36138 goto out;
36139diff --git a/block/genhd.c b/block/genhd.c
36140index ea982ea..86e0f9e 100644
36141--- a/block/genhd.c
36142+++ b/block/genhd.c
36143@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36144
36145 /*
36146 * Register device numbers dev..(dev+range-1)
36147- * range must be nonzero
36148+ * Noop if @range is zero.
36149 * The hash chain is sorted on range, so that subranges can override.
36150 */
36151 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36152 struct kobject *(*probe)(dev_t, int *, void *),
36153 int (*lock)(dev_t, void *), void *data)
36154 {
36155- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36156+ if (range)
36157+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36158 }
36159
36160 EXPORT_SYMBOL(blk_register_region);
36161
36162+/* undo blk_register_region(), noop if @range is zero */
36163 void blk_unregister_region(dev_t devt, unsigned long range)
36164 {
36165- kobj_unmap(bdev_map, devt, range);
36166+ if (range)
36167+ kobj_unmap(bdev_map, devt, range);
36168 }
36169
36170 EXPORT_SYMBOL(blk_unregister_region);
36171diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36172index 26cb624..a49c3a5 100644
36173--- a/block/partitions/efi.c
36174+++ b/block/partitions/efi.c
36175@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36176 if (!gpt)
36177 return NULL;
36178
36179+ if (!le32_to_cpu(gpt->num_partition_entries))
36180+ return NULL;
36181+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36182+ if (!pte)
36183+ return NULL;
36184+
36185 count = le32_to_cpu(gpt->num_partition_entries) *
36186 le32_to_cpu(gpt->sizeof_partition_entry);
36187- if (!count)
36188- return NULL;
36189- pte = kmalloc(count, GFP_KERNEL);
36190- if (!pte)
36191- return NULL;
36192-
36193 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36194 (u8 *) pte, count) < count) {
36195 kfree(pte);
36196diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36197index 55b6f15..b602c9a 100644
36198--- a/block/scsi_ioctl.c
36199+++ b/block/scsi_ioctl.c
36200@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36201 return put_user(0, p);
36202 }
36203
36204-static int sg_get_timeout(struct request_queue *q)
36205+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36206 {
36207 return jiffies_to_clock_t(q->sg_timeout);
36208 }
36209@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36210 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36211 struct sg_io_hdr *hdr, fmode_t mode)
36212 {
36213- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36214+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36215+ unsigned char *cmdptr;
36216+
36217+ if (rq->cmd != rq->__cmd)
36218+ cmdptr = rq->cmd;
36219+ else
36220+ cmdptr = tmpcmd;
36221+
36222+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36223 return -EFAULT;
36224+
36225+ if (cmdptr != rq->cmd)
36226+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36227+
36228 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36229 return -EPERM;
36230
36231@@ -420,6 +432,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36232 int err;
36233 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36234 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36235+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36236+ unsigned char *cmdptr;
36237
36238 if (!sic)
36239 return -EINVAL;
36240@@ -458,9 +472,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36241 */
36242 err = -EFAULT;
36243 rq->cmd_len = cmdlen;
36244- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36245+
36246+ if (rq->cmd != rq->__cmd)
36247+ cmdptr = rq->cmd;
36248+ else
36249+ cmdptr = tmpcmd;
36250+
36251+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36252 goto error;
36253
36254+ if (rq->cmd != cmdptr)
36255+ memcpy(rq->cmd, cmdptr, cmdlen);
36256+
36257 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36258 goto error;
36259
36260diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36261index b0602ba..fb71850 100644
36262--- a/crypto/cryptd.c
36263+++ b/crypto/cryptd.c
36264@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36265
36266 struct cryptd_blkcipher_request_ctx {
36267 crypto_completion_t complete;
36268-};
36269+} __no_const;
36270
36271 struct cryptd_hash_ctx {
36272 struct crypto_shash *child;
36273@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36274
36275 struct cryptd_aead_request_ctx {
36276 crypto_completion_t complete;
36277-};
36278+} __no_const;
36279
36280 static void cryptd_queue_worker(struct work_struct *work);
36281
36282diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36283index c305d41..a96de79 100644
36284--- a/crypto/pcrypt.c
36285+++ b/crypto/pcrypt.c
36286@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36287 int ret;
36288
36289 pinst->kobj.kset = pcrypt_kset;
36290- ret = kobject_add(&pinst->kobj, NULL, name);
36291+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36292 if (!ret)
36293 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36294
36295diff --git a/crypto/zlib.c b/crypto/zlib.c
36296index 0eefa9d..0fa3d29 100644
36297--- a/crypto/zlib.c
36298+++ b/crypto/zlib.c
36299@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36300 zlib_comp_exit(ctx);
36301
36302 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36303- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36304+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36305 : MAX_WBITS;
36306 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36307- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36308+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36309 : DEF_MEM_LEVEL;
36310
36311 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36312diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36313index 3b37676..898edfa 100644
36314--- a/drivers/acpi/acpica/hwxfsleep.c
36315+++ b/drivers/acpi/acpica/hwxfsleep.c
36316@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36317 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36318
36319 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36320- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36321- acpi_hw_extended_sleep},
36322- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36323- acpi_hw_extended_wake_prep},
36324- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36325+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36326+ .extended_function = acpi_hw_extended_sleep},
36327+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36328+ .extended_function = acpi_hw_extended_wake_prep},
36329+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36330+ .extended_function = acpi_hw_extended_wake}
36331 };
36332
36333 /*
36334diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36335index 16129c7..8b675cd 100644
36336--- a/drivers/acpi/apei/apei-internal.h
36337+++ b/drivers/acpi/apei/apei-internal.h
36338@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36339 struct apei_exec_ins_type {
36340 u32 flags;
36341 apei_exec_ins_func_t run;
36342-};
36343+} __do_const;
36344
36345 struct apei_exec_context {
36346 u32 ip;
36347diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36348index e82d097..0c855c1 100644
36349--- a/drivers/acpi/apei/ghes.c
36350+++ b/drivers/acpi/apei/ghes.c
36351@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36352 const struct acpi_hest_generic *generic,
36353 const struct acpi_hest_generic_status *estatus)
36354 {
36355- static atomic_t seqno;
36356+ static atomic_unchecked_t seqno;
36357 unsigned int curr_seqno;
36358 char pfx_seq[64];
36359
36360@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36361 else
36362 pfx = KERN_ERR;
36363 }
36364- curr_seqno = atomic_inc_return(&seqno);
36365+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36366 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36367 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36368 pfx_seq, generic->header.source_id);
36369diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36370index a83e3c6..c3d617f 100644
36371--- a/drivers/acpi/bgrt.c
36372+++ b/drivers/acpi/bgrt.c
36373@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36374 if (!bgrt_image)
36375 return -ENODEV;
36376
36377- bin_attr_image.private = bgrt_image;
36378- bin_attr_image.size = bgrt_image_size;
36379+ pax_open_kernel();
36380+ *(void **)&bin_attr_image.private = bgrt_image;
36381+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36382+ pax_close_kernel();
36383
36384 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36385 if (!bgrt_kobj)
36386diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36387index 1d17919..315e955 100644
36388--- a/drivers/acpi/blacklist.c
36389+++ b/drivers/acpi/blacklist.c
36390@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36391 u32 is_critical_error;
36392 };
36393
36394-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36395+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36396
36397 /*
36398 * POLICY: If *anything* doesn't work, put it on the blacklist.
36399@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36400 return 0;
36401 }
36402
36403-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36404+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36405 {
36406 .callback = dmi_disable_osi_vista,
36407 .ident = "Fujitsu Siemens",
36408diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36409index 513e7230e..802015a 100644
36410--- a/drivers/acpi/bus.c
36411+++ b/drivers/acpi/bus.c
36412@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36413 }
36414 #endif
36415
36416-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36417+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36418 /*
36419 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36420 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36421@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36422 {}
36423 };
36424 #else
36425-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36426+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36427 {}
36428 };
36429 #endif
36430diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36431index c68e724..e863008 100644
36432--- a/drivers/acpi/custom_method.c
36433+++ b/drivers/acpi/custom_method.c
36434@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36435 struct acpi_table_header table;
36436 acpi_status status;
36437
36438+#ifdef CONFIG_GRKERNSEC_KMEM
36439+ return -EPERM;
36440+#endif
36441+
36442 if (!(*ppos)) {
36443 /* parse the table header to get the table length */
36444 if (count <= sizeof(struct acpi_table_header))
36445diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36446index 8217e0b..3294cb6 100644
36447--- a/drivers/acpi/device_pm.c
36448+++ b/drivers/acpi/device_pm.c
36449@@ -1026,6 +1026,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36450
36451 #endif /* CONFIG_PM_SLEEP */
36452
36453+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36454+
36455 static struct dev_pm_domain acpi_general_pm_domain = {
36456 .ops = {
36457 .runtime_suspend = acpi_subsys_runtime_suspend,
36458@@ -1042,6 +1044,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36459 .restore_early = acpi_subsys_resume_early,
36460 #endif
36461 },
36462+ .detach = acpi_dev_pm_detach
36463 };
36464
36465 /**
36466@@ -1111,7 +1114,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36467 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36468 }
36469
36470- dev->pm_domain->detach = acpi_dev_pm_detach;
36471 return 0;
36472 }
36473 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36474diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36475index 5e8fed4..d9bb545 100644
36476--- a/drivers/acpi/ec.c
36477+++ b/drivers/acpi/ec.c
36478@@ -1293,7 +1293,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36479 return 0;
36480 }
36481
36482-static struct dmi_system_id ec_dmi_table[] __initdata = {
36483+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36484 {
36485 ec_skip_dsdt_scan, "Compal JFL92", {
36486 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36487diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36488index 139d9e4..9a9d799 100644
36489--- a/drivers/acpi/pci_slot.c
36490+++ b/drivers/acpi/pci_slot.c
36491@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36492 return 0;
36493 }
36494
36495-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36496+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36497 /*
36498 * Fujitsu Primequest machines will return 1023 to indicate an
36499 * error if the _SUN method is evaluated on SxFy objects that
36500diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36501index d9f7158..168e742 100644
36502--- a/drivers/acpi/processor_driver.c
36503+++ b/drivers/acpi/processor_driver.c
36504@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36505 return NOTIFY_OK;
36506 }
36507
36508-static struct notifier_block __refdata acpi_cpu_notifier = {
36509+static struct notifier_block __refconst acpi_cpu_notifier = {
36510 .notifier_call = acpi_cpu_soft_notify,
36511 };
36512
36513diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36514index 39e0c8e..b5ae20c 100644
36515--- a/drivers/acpi/processor_idle.c
36516+++ b/drivers/acpi/processor_idle.c
36517@@ -910,7 +910,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36518 {
36519 int i, count = CPUIDLE_DRIVER_STATE_START;
36520 struct acpi_processor_cx *cx;
36521- struct cpuidle_state *state;
36522+ cpuidle_state_no_const *state;
36523 struct cpuidle_driver *drv = &acpi_idle_driver;
36524
36525 if (!pr->flags.power_setup_done)
36526diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36527index e5dd808..1eceed1 100644
36528--- a/drivers/acpi/processor_pdc.c
36529+++ b/drivers/acpi/processor_pdc.c
36530@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36531 return 0;
36532 }
36533
36534-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36535+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36536 {
36537 set_no_mwait, "Extensa 5220", {
36538 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36539diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36540index 2f0d4db..b9e9b15 100644
36541--- a/drivers/acpi/sleep.c
36542+++ b/drivers/acpi/sleep.c
36543@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36544 return 0;
36545 }
36546
36547-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36548+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36549 {
36550 .callback = init_old_suspend_ordering,
36551 .ident = "Abit KN9 (nForce4 variant)",
36552diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36553index 0876d77b..3ba0127 100644
36554--- a/drivers/acpi/sysfs.c
36555+++ b/drivers/acpi/sysfs.c
36556@@ -423,11 +423,11 @@ static u32 num_counters;
36557 static struct attribute **all_attrs;
36558 static u32 acpi_gpe_count;
36559
36560-static struct attribute_group interrupt_stats_attr_group = {
36561+static attribute_group_no_const interrupt_stats_attr_group = {
36562 .name = "interrupts",
36563 };
36564
36565-static struct kobj_attribute *counter_attrs;
36566+static kobj_attribute_no_const *counter_attrs;
36567
36568 static void delete_gpe_attr_array(void)
36569 {
36570diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36571index d24fa19..782f1e6 100644
36572--- a/drivers/acpi/thermal.c
36573+++ b/drivers/acpi/thermal.c
36574@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36575 return 0;
36576 }
36577
36578-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36579+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36580 /*
36581 * Award BIOS on this AOpen makes thermal control almost worthless.
36582 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36583diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36584index cc79d3f..28adb33 100644
36585--- a/drivers/acpi/video.c
36586+++ b/drivers/acpi/video.c
36587@@ -431,7 +431,7 @@ static int __init video_enable_native_backlight(const struct dmi_system_id *d)
36588 return 0;
36589 }
36590
36591-static struct dmi_system_id video_dmi_table[] __initdata = {
36592+static const struct dmi_system_id video_dmi_table[] __initconst = {
36593 /*
36594 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36595 */
36596diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36597index 287c4ba..6a600bc 100644
36598--- a/drivers/ata/libahci.c
36599+++ b/drivers/ata/libahci.c
36600@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36601 }
36602 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36603
36604-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36605+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36606 struct ata_taskfile *tf, int is_cmd, u16 flags,
36607 unsigned long timeout_msec)
36608 {
36609diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36610index 41c99be..f058d4a 100644
36611--- a/drivers/ata/libata-core.c
36612+++ b/drivers/ata/libata-core.c
36613@@ -102,7 +102,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36614 static void ata_dev_xfermask(struct ata_device *dev);
36615 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36616
36617-atomic_t ata_print_id = ATOMIC_INIT(0);
36618+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36619
36620 struct ata_force_param {
36621 const char *name;
36622@@ -4816,7 +4816,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36623 struct ata_port *ap;
36624 unsigned int tag;
36625
36626- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36627+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36628 ap = qc->ap;
36629
36630 qc->flags = 0;
36631@@ -4833,7 +4833,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36632 struct ata_port *ap;
36633 struct ata_link *link;
36634
36635- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36636+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36637 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36638 ap = qc->ap;
36639 link = qc->dev->link;
36640@@ -5940,6 +5940,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36641 return;
36642
36643 spin_lock(&lock);
36644+ pax_open_kernel();
36645
36646 for (cur = ops->inherits; cur; cur = cur->inherits) {
36647 void **inherit = (void **)cur;
36648@@ -5953,8 +5954,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36649 if (IS_ERR(*pp))
36650 *pp = NULL;
36651
36652- ops->inherits = NULL;
36653+ *(struct ata_port_operations **)&ops->inherits = NULL;
36654
36655+ pax_close_kernel();
36656 spin_unlock(&lock);
36657 }
36658
36659@@ -6150,7 +6152,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36660
36661 /* give ports names and add SCSI hosts */
36662 for (i = 0; i < host->n_ports; i++) {
36663- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36664+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36665 host->ports[i]->local_port_no = i + 1;
36666 }
36667
36668diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36669index 641a61a..8309252 100644
36670--- a/drivers/ata/libata-scsi.c
36671+++ b/drivers/ata/libata-scsi.c
36672@@ -4210,7 +4210,7 @@ int ata_sas_port_init(struct ata_port *ap)
36673
36674 if (rc)
36675 return rc;
36676- ap->print_id = atomic_inc_return(&ata_print_id);
36677+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36678 return 0;
36679 }
36680 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36681diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36682index a998a17..8de4bf4 100644
36683--- a/drivers/ata/libata.h
36684+++ b/drivers/ata/libata.h
36685@@ -53,7 +53,7 @@ enum {
36686 ATA_DNXFER_QUIET = (1 << 31),
36687 };
36688
36689-extern atomic_t ata_print_id;
36690+extern atomic_unchecked_t ata_print_id;
36691 extern int atapi_passthru16;
36692 extern int libata_fua;
36693 extern int libata_noacpi;
36694diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36695index a9b0c82..207d97d 100644
36696--- a/drivers/ata/pata_arasan_cf.c
36697+++ b/drivers/ata/pata_arasan_cf.c
36698@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36699 /* Handle platform specific quirks */
36700 if (quirk) {
36701 if (quirk & CF_BROKEN_PIO) {
36702- ap->ops->set_piomode = NULL;
36703+ pax_open_kernel();
36704+ *(void **)&ap->ops->set_piomode = NULL;
36705+ pax_close_kernel();
36706 ap->pio_mask = 0;
36707 }
36708 if (quirk & CF_BROKEN_MWDMA)
36709diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36710index f9b983a..887b9d8 100644
36711--- a/drivers/atm/adummy.c
36712+++ b/drivers/atm/adummy.c
36713@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36714 vcc->pop(vcc, skb);
36715 else
36716 dev_kfree_skb_any(skb);
36717- atomic_inc(&vcc->stats->tx);
36718+ atomic_inc_unchecked(&vcc->stats->tx);
36719
36720 return 0;
36721 }
36722diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36723index f1a9198..f466a4a 100644
36724--- a/drivers/atm/ambassador.c
36725+++ b/drivers/atm/ambassador.c
36726@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36727 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36728
36729 // VC layer stats
36730- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36731+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36732
36733 // free the descriptor
36734 kfree (tx_descr);
36735@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36736 dump_skb ("<<<", vc, skb);
36737
36738 // VC layer stats
36739- atomic_inc(&atm_vcc->stats->rx);
36740+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36741 __net_timestamp(skb);
36742 // end of our responsibility
36743 atm_vcc->push (atm_vcc, skb);
36744@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36745 } else {
36746 PRINTK (KERN_INFO, "dropped over-size frame");
36747 // should we count this?
36748- atomic_inc(&atm_vcc->stats->rx_drop);
36749+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36750 }
36751
36752 } else {
36753@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36754 }
36755
36756 if (check_area (skb->data, skb->len)) {
36757- atomic_inc(&atm_vcc->stats->tx_err);
36758+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36759 return -ENOMEM; // ?
36760 }
36761
36762diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36763index 480fa6f..947067c 100644
36764--- a/drivers/atm/atmtcp.c
36765+++ b/drivers/atm/atmtcp.c
36766@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36767 if (vcc->pop) vcc->pop(vcc,skb);
36768 else dev_kfree_skb(skb);
36769 if (dev_data) return 0;
36770- atomic_inc(&vcc->stats->tx_err);
36771+ atomic_inc_unchecked(&vcc->stats->tx_err);
36772 return -ENOLINK;
36773 }
36774 size = skb->len+sizeof(struct atmtcp_hdr);
36775@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36776 if (!new_skb) {
36777 if (vcc->pop) vcc->pop(vcc,skb);
36778 else dev_kfree_skb(skb);
36779- atomic_inc(&vcc->stats->tx_err);
36780+ atomic_inc_unchecked(&vcc->stats->tx_err);
36781 return -ENOBUFS;
36782 }
36783 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36784@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36785 if (vcc->pop) vcc->pop(vcc,skb);
36786 else dev_kfree_skb(skb);
36787 out_vcc->push(out_vcc,new_skb);
36788- atomic_inc(&vcc->stats->tx);
36789- atomic_inc(&out_vcc->stats->rx);
36790+ atomic_inc_unchecked(&vcc->stats->tx);
36791+ atomic_inc_unchecked(&out_vcc->stats->rx);
36792 return 0;
36793 }
36794
36795@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36796 read_unlock(&vcc_sklist_lock);
36797 if (!out_vcc) {
36798 result = -EUNATCH;
36799- atomic_inc(&vcc->stats->tx_err);
36800+ atomic_inc_unchecked(&vcc->stats->tx_err);
36801 goto done;
36802 }
36803 skb_pull(skb,sizeof(struct atmtcp_hdr));
36804@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36805 __net_timestamp(new_skb);
36806 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36807 out_vcc->push(out_vcc,new_skb);
36808- atomic_inc(&vcc->stats->tx);
36809- atomic_inc(&out_vcc->stats->rx);
36810+ atomic_inc_unchecked(&vcc->stats->tx);
36811+ atomic_inc_unchecked(&out_vcc->stats->rx);
36812 done:
36813 if (vcc->pop) vcc->pop(vcc,skb);
36814 else dev_kfree_skb(skb);
36815diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36816index 6339efd..2b441d5 100644
36817--- a/drivers/atm/eni.c
36818+++ b/drivers/atm/eni.c
36819@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36820 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36821 vcc->dev->number);
36822 length = 0;
36823- atomic_inc(&vcc->stats->rx_err);
36824+ atomic_inc_unchecked(&vcc->stats->rx_err);
36825 }
36826 else {
36827 length = ATM_CELL_SIZE-1; /* no HEC */
36828@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36829 size);
36830 }
36831 eff = length = 0;
36832- atomic_inc(&vcc->stats->rx_err);
36833+ atomic_inc_unchecked(&vcc->stats->rx_err);
36834 }
36835 else {
36836 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36837@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36838 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36839 vcc->dev->number,vcc->vci,length,size << 2,descr);
36840 length = eff = 0;
36841- atomic_inc(&vcc->stats->rx_err);
36842+ atomic_inc_unchecked(&vcc->stats->rx_err);
36843 }
36844 }
36845 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36846@@ -770,7 +770,7 @@ rx_dequeued++;
36847 vcc->push(vcc,skb);
36848 pushed++;
36849 }
36850- atomic_inc(&vcc->stats->rx);
36851+ atomic_inc_unchecked(&vcc->stats->rx);
36852 }
36853 wake_up(&eni_dev->rx_wait);
36854 }
36855@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
36856 DMA_TO_DEVICE);
36857 if (vcc->pop) vcc->pop(vcc,skb);
36858 else dev_kfree_skb_irq(skb);
36859- atomic_inc(&vcc->stats->tx);
36860+ atomic_inc_unchecked(&vcc->stats->tx);
36861 wake_up(&eni_dev->tx_wait);
36862 dma_complete++;
36863 }
36864diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36865index 82f2ae0..f205c02 100644
36866--- a/drivers/atm/firestream.c
36867+++ b/drivers/atm/firestream.c
36868@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36869 }
36870 }
36871
36872- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36873+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36874
36875 fs_dprintk (FS_DEBUG_TXMEM, "i");
36876 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36877@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36878 #endif
36879 skb_put (skb, qe->p1 & 0xffff);
36880 ATM_SKB(skb)->vcc = atm_vcc;
36881- atomic_inc(&atm_vcc->stats->rx);
36882+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36883 __net_timestamp(skb);
36884 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36885 atm_vcc->push (atm_vcc, skb);
36886@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36887 kfree (pe);
36888 }
36889 if (atm_vcc)
36890- atomic_inc(&atm_vcc->stats->rx_drop);
36891+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36892 break;
36893 case 0x1f: /* Reassembly abort: no buffers. */
36894 /* Silently increment error counter. */
36895 if (atm_vcc)
36896- atomic_inc(&atm_vcc->stats->rx_drop);
36897+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36898 break;
36899 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36900 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36901diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36902index 75dde90..4309ead 100644
36903--- a/drivers/atm/fore200e.c
36904+++ b/drivers/atm/fore200e.c
36905@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36906 #endif
36907 /* check error condition */
36908 if (*entry->status & STATUS_ERROR)
36909- atomic_inc(&vcc->stats->tx_err);
36910+ atomic_inc_unchecked(&vcc->stats->tx_err);
36911 else
36912- atomic_inc(&vcc->stats->tx);
36913+ atomic_inc_unchecked(&vcc->stats->tx);
36914 }
36915 }
36916
36917@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36918 if (skb == NULL) {
36919 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36920
36921- atomic_inc(&vcc->stats->rx_drop);
36922+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36923 return -ENOMEM;
36924 }
36925
36926@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36927
36928 dev_kfree_skb_any(skb);
36929
36930- atomic_inc(&vcc->stats->rx_drop);
36931+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36932 return -ENOMEM;
36933 }
36934
36935 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36936
36937 vcc->push(vcc, skb);
36938- atomic_inc(&vcc->stats->rx);
36939+ atomic_inc_unchecked(&vcc->stats->rx);
36940
36941 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36942
36943@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36944 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36945 fore200e->atm_dev->number,
36946 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36947- atomic_inc(&vcc->stats->rx_err);
36948+ atomic_inc_unchecked(&vcc->stats->rx_err);
36949 }
36950 }
36951
36952@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36953 goto retry_here;
36954 }
36955
36956- atomic_inc(&vcc->stats->tx_err);
36957+ atomic_inc_unchecked(&vcc->stats->tx_err);
36958
36959 fore200e->tx_sat++;
36960 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36961diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36962index 93dca2e..c5daa69 100644
36963--- a/drivers/atm/he.c
36964+++ b/drivers/atm/he.c
36965@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36966
36967 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36968 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36969- atomic_inc(&vcc->stats->rx_drop);
36970+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36971 goto return_host_buffers;
36972 }
36973
36974@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36975 RBRQ_LEN_ERR(he_dev->rbrq_head)
36976 ? "LEN_ERR" : "",
36977 vcc->vpi, vcc->vci);
36978- atomic_inc(&vcc->stats->rx_err);
36979+ atomic_inc_unchecked(&vcc->stats->rx_err);
36980 goto return_host_buffers;
36981 }
36982
36983@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36984 vcc->push(vcc, skb);
36985 spin_lock(&he_dev->global_lock);
36986
36987- atomic_inc(&vcc->stats->rx);
36988+ atomic_inc_unchecked(&vcc->stats->rx);
36989
36990 return_host_buffers:
36991 ++pdus_assembled;
36992@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36993 tpd->vcc->pop(tpd->vcc, tpd->skb);
36994 else
36995 dev_kfree_skb_any(tpd->skb);
36996- atomic_inc(&tpd->vcc->stats->tx_err);
36997+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36998 }
36999 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37000 return;
37001@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37002 vcc->pop(vcc, skb);
37003 else
37004 dev_kfree_skb_any(skb);
37005- atomic_inc(&vcc->stats->tx_err);
37006+ atomic_inc_unchecked(&vcc->stats->tx_err);
37007 return -EINVAL;
37008 }
37009
37010@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37011 vcc->pop(vcc, skb);
37012 else
37013 dev_kfree_skb_any(skb);
37014- atomic_inc(&vcc->stats->tx_err);
37015+ atomic_inc_unchecked(&vcc->stats->tx_err);
37016 return -EINVAL;
37017 }
37018 #endif
37019@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37020 vcc->pop(vcc, skb);
37021 else
37022 dev_kfree_skb_any(skb);
37023- atomic_inc(&vcc->stats->tx_err);
37024+ atomic_inc_unchecked(&vcc->stats->tx_err);
37025 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37026 return -ENOMEM;
37027 }
37028@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37029 vcc->pop(vcc, skb);
37030 else
37031 dev_kfree_skb_any(skb);
37032- atomic_inc(&vcc->stats->tx_err);
37033+ atomic_inc_unchecked(&vcc->stats->tx_err);
37034 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37035 return -ENOMEM;
37036 }
37037@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37038 __enqueue_tpd(he_dev, tpd, cid);
37039 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37040
37041- atomic_inc(&vcc->stats->tx);
37042+ atomic_inc_unchecked(&vcc->stats->tx);
37043
37044 return 0;
37045 }
37046diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37047index 527bbd5..96570c8 100644
37048--- a/drivers/atm/horizon.c
37049+++ b/drivers/atm/horizon.c
37050@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37051 {
37052 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37053 // VC layer stats
37054- atomic_inc(&vcc->stats->rx);
37055+ atomic_inc_unchecked(&vcc->stats->rx);
37056 __net_timestamp(skb);
37057 // end of our responsibility
37058 vcc->push (vcc, skb);
37059@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37060 dev->tx_iovec = NULL;
37061
37062 // VC layer stats
37063- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37064+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37065
37066 // free the skb
37067 hrz_kfree_skb (skb);
37068diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37069index 074616b..d6b3d5f 100644
37070--- a/drivers/atm/idt77252.c
37071+++ b/drivers/atm/idt77252.c
37072@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37073 else
37074 dev_kfree_skb(skb);
37075
37076- atomic_inc(&vcc->stats->tx);
37077+ atomic_inc_unchecked(&vcc->stats->tx);
37078 }
37079
37080 atomic_dec(&scq->used);
37081@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37082 if ((sb = dev_alloc_skb(64)) == NULL) {
37083 printk("%s: Can't allocate buffers for aal0.\n",
37084 card->name);
37085- atomic_add(i, &vcc->stats->rx_drop);
37086+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37087 break;
37088 }
37089 if (!atm_charge(vcc, sb->truesize)) {
37090 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37091 card->name);
37092- atomic_add(i - 1, &vcc->stats->rx_drop);
37093+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37094 dev_kfree_skb(sb);
37095 break;
37096 }
37097@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37098 ATM_SKB(sb)->vcc = vcc;
37099 __net_timestamp(sb);
37100 vcc->push(vcc, sb);
37101- atomic_inc(&vcc->stats->rx);
37102+ atomic_inc_unchecked(&vcc->stats->rx);
37103
37104 cell += ATM_CELL_PAYLOAD;
37105 }
37106@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37107 "(CDC: %08x)\n",
37108 card->name, len, rpp->len, readl(SAR_REG_CDC));
37109 recycle_rx_pool_skb(card, rpp);
37110- atomic_inc(&vcc->stats->rx_err);
37111+ atomic_inc_unchecked(&vcc->stats->rx_err);
37112 return;
37113 }
37114 if (stat & SAR_RSQE_CRC) {
37115 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37116 recycle_rx_pool_skb(card, rpp);
37117- atomic_inc(&vcc->stats->rx_err);
37118+ atomic_inc_unchecked(&vcc->stats->rx_err);
37119 return;
37120 }
37121 if (skb_queue_len(&rpp->queue) > 1) {
37122@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37123 RXPRINTK("%s: Can't alloc RX skb.\n",
37124 card->name);
37125 recycle_rx_pool_skb(card, rpp);
37126- atomic_inc(&vcc->stats->rx_err);
37127+ atomic_inc_unchecked(&vcc->stats->rx_err);
37128 return;
37129 }
37130 if (!atm_charge(vcc, skb->truesize)) {
37131@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37132 __net_timestamp(skb);
37133
37134 vcc->push(vcc, skb);
37135- atomic_inc(&vcc->stats->rx);
37136+ atomic_inc_unchecked(&vcc->stats->rx);
37137
37138 return;
37139 }
37140@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37141 __net_timestamp(skb);
37142
37143 vcc->push(vcc, skb);
37144- atomic_inc(&vcc->stats->rx);
37145+ atomic_inc_unchecked(&vcc->stats->rx);
37146
37147 if (skb->truesize > SAR_FB_SIZE_3)
37148 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37149@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37150 if (vcc->qos.aal != ATM_AAL0) {
37151 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37152 card->name, vpi, vci);
37153- atomic_inc(&vcc->stats->rx_drop);
37154+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37155 goto drop;
37156 }
37157
37158 if ((sb = dev_alloc_skb(64)) == NULL) {
37159 printk("%s: Can't allocate buffers for AAL0.\n",
37160 card->name);
37161- atomic_inc(&vcc->stats->rx_err);
37162+ atomic_inc_unchecked(&vcc->stats->rx_err);
37163 goto drop;
37164 }
37165
37166@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37167 ATM_SKB(sb)->vcc = vcc;
37168 __net_timestamp(sb);
37169 vcc->push(vcc, sb);
37170- atomic_inc(&vcc->stats->rx);
37171+ atomic_inc_unchecked(&vcc->stats->rx);
37172
37173 drop:
37174 skb_pull(queue, 64);
37175@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37176
37177 if (vc == NULL) {
37178 printk("%s: NULL connection in send().\n", card->name);
37179- atomic_inc(&vcc->stats->tx_err);
37180+ atomic_inc_unchecked(&vcc->stats->tx_err);
37181 dev_kfree_skb(skb);
37182 return -EINVAL;
37183 }
37184 if (!test_bit(VCF_TX, &vc->flags)) {
37185 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37186- atomic_inc(&vcc->stats->tx_err);
37187+ atomic_inc_unchecked(&vcc->stats->tx_err);
37188 dev_kfree_skb(skb);
37189 return -EINVAL;
37190 }
37191@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37192 break;
37193 default:
37194 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37195- atomic_inc(&vcc->stats->tx_err);
37196+ atomic_inc_unchecked(&vcc->stats->tx_err);
37197 dev_kfree_skb(skb);
37198 return -EINVAL;
37199 }
37200
37201 if (skb_shinfo(skb)->nr_frags != 0) {
37202 printk("%s: No scatter-gather yet.\n", card->name);
37203- atomic_inc(&vcc->stats->tx_err);
37204+ atomic_inc_unchecked(&vcc->stats->tx_err);
37205 dev_kfree_skb(skb);
37206 return -EINVAL;
37207 }
37208@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37209
37210 err = queue_skb(card, vc, skb, oam);
37211 if (err) {
37212- atomic_inc(&vcc->stats->tx_err);
37213+ atomic_inc_unchecked(&vcc->stats->tx_err);
37214 dev_kfree_skb(skb);
37215 return err;
37216 }
37217@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37218 skb = dev_alloc_skb(64);
37219 if (!skb) {
37220 printk("%s: Out of memory in send_oam().\n", card->name);
37221- atomic_inc(&vcc->stats->tx_err);
37222+ atomic_inc_unchecked(&vcc->stats->tx_err);
37223 return -ENOMEM;
37224 }
37225 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37226diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37227index 924f8e2..3375a3e 100644
37228--- a/drivers/atm/iphase.c
37229+++ b/drivers/atm/iphase.c
37230@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37231 status = (u_short) (buf_desc_ptr->desc_mode);
37232 if (status & (RX_CER | RX_PTE | RX_OFL))
37233 {
37234- atomic_inc(&vcc->stats->rx_err);
37235+ atomic_inc_unchecked(&vcc->stats->rx_err);
37236 IF_ERR(printk("IA: bad packet, dropping it");)
37237 if (status & RX_CER) {
37238 IF_ERR(printk(" cause: packet CRC error\n");)
37239@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37240 len = dma_addr - buf_addr;
37241 if (len > iadev->rx_buf_sz) {
37242 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37243- atomic_inc(&vcc->stats->rx_err);
37244+ atomic_inc_unchecked(&vcc->stats->rx_err);
37245 goto out_free_desc;
37246 }
37247
37248@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37249 ia_vcc = INPH_IA_VCC(vcc);
37250 if (ia_vcc == NULL)
37251 {
37252- atomic_inc(&vcc->stats->rx_err);
37253+ atomic_inc_unchecked(&vcc->stats->rx_err);
37254 atm_return(vcc, skb->truesize);
37255 dev_kfree_skb_any(skb);
37256 goto INCR_DLE;
37257@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37258 if ((length > iadev->rx_buf_sz) || (length >
37259 (skb->len - sizeof(struct cpcs_trailer))))
37260 {
37261- atomic_inc(&vcc->stats->rx_err);
37262+ atomic_inc_unchecked(&vcc->stats->rx_err);
37263 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37264 length, skb->len);)
37265 atm_return(vcc, skb->truesize);
37266@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37267
37268 IF_RX(printk("rx_dle_intr: skb push");)
37269 vcc->push(vcc,skb);
37270- atomic_inc(&vcc->stats->rx);
37271+ atomic_inc_unchecked(&vcc->stats->rx);
37272 iadev->rx_pkt_cnt++;
37273 }
37274 INCR_DLE:
37275@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37276 {
37277 struct k_sonet_stats *stats;
37278 stats = &PRIV(_ia_dev[board])->sonet_stats;
37279- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37280- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37281- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37282- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37283- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37284- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37285- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37286- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37287- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37288+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37289+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37290+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37291+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37292+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37293+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37294+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37295+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37296+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37297 }
37298 ia_cmds.status = 0;
37299 break;
37300@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37301 if ((desc == 0) || (desc > iadev->num_tx_desc))
37302 {
37303 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37304- atomic_inc(&vcc->stats->tx);
37305+ atomic_inc_unchecked(&vcc->stats->tx);
37306 if (vcc->pop)
37307 vcc->pop(vcc, skb);
37308 else
37309@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37310 ATM_DESC(skb) = vcc->vci;
37311 skb_queue_tail(&iadev->tx_dma_q, skb);
37312
37313- atomic_inc(&vcc->stats->tx);
37314+ atomic_inc_unchecked(&vcc->stats->tx);
37315 iadev->tx_pkt_cnt++;
37316 /* Increment transaction counter */
37317 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37318
37319 #if 0
37320 /* add flow control logic */
37321- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37322+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37323 if (iavcc->vc_desc_cnt > 10) {
37324 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37325 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37326diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37327index ce43ae3..969de38 100644
37328--- a/drivers/atm/lanai.c
37329+++ b/drivers/atm/lanai.c
37330@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37331 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37332 lanai_endtx(lanai, lvcc);
37333 lanai_free_skb(lvcc->tx.atmvcc, skb);
37334- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37335+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37336 }
37337
37338 /* Try to fill the buffer - don't call unless there is backlog */
37339@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37340 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37341 __net_timestamp(skb);
37342 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37343- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37344+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37345 out:
37346 lvcc->rx.buf.ptr = end;
37347 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37348@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37349 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37350 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37351 lanai->stats.service_rxnotaal5++;
37352- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37353+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37354 return 0;
37355 }
37356 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37357@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37358 int bytes;
37359 read_unlock(&vcc_sklist_lock);
37360 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37361- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37362+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37363 lvcc->stats.x.aal5.service_trash++;
37364 bytes = (SERVICE_GET_END(s) * 16) -
37365 (((unsigned long) lvcc->rx.buf.ptr) -
37366@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37367 }
37368 if (s & SERVICE_STREAM) {
37369 read_unlock(&vcc_sklist_lock);
37370- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37371+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37372 lvcc->stats.x.aal5.service_stream++;
37373 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37374 "PDU on VCI %d!\n", lanai->number, vci);
37375@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37376 return 0;
37377 }
37378 DPRINTK("got rx crc error on vci %d\n", vci);
37379- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37380+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37381 lvcc->stats.x.aal5.service_rxcrc++;
37382 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37383 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37384diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37385index ddc4ceb..36e29aa 100644
37386--- a/drivers/atm/nicstar.c
37387+++ b/drivers/atm/nicstar.c
37388@@ -1632,7 +1632,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37389 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37390 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37391 card->index);
37392- atomic_inc(&vcc->stats->tx_err);
37393+ atomic_inc_unchecked(&vcc->stats->tx_err);
37394 dev_kfree_skb_any(skb);
37395 return -EINVAL;
37396 }
37397@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37398 if (!vc->tx) {
37399 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37400 card->index);
37401- atomic_inc(&vcc->stats->tx_err);
37402+ atomic_inc_unchecked(&vcc->stats->tx_err);
37403 dev_kfree_skb_any(skb);
37404 return -EINVAL;
37405 }
37406@@ -1648,14 +1648,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37407 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37408 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37409 card->index);
37410- atomic_inc(&vcc->stats->tx_err);
37411+ atomic_inc_unchecked(&vcc->stats->tx_err);
37412 dev_kfree_skb_any(skb);
37413 return -EINVAL;
37414 }
37415
37416 if (skb_shinfo(skb)->nr_frags != 0) {
37417 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37418- atomic_inc(&vcc->stats->tx_err);
37419+ atomic_inc_unchecked(&vcc->stats->tx_err);
37420 dev_kfree_skb_any(skb);
37421 return -EINVAL;
37422 }
37423@@ -1703,11 +1703,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37424 }
37425
37426 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37427- atomic_inc(&vcc->stats->tx_err);
37428+ atomic_inc_unchecked(&vcc->stats->tx_err);
37429 dev_kfree_skb_any(skb);
37430 return -EIO;
37431 }
37432- atomic_inc(&vcc->stats->tx);
37433+ atomic_inc_unchecked(&vcc->stats->tx);
37434
37435 return 0;
37436 }
37437@@ -2024,14 +2024,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37438 printk
37439 ("nicstar%d: Can't allocate buffers for aal0.\n",
37440 card->index);
37441- atomic_add(i, &vcc->stats->rx_drop);
37442+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37443 break;
37444 }
37445 if (!atm_charge(vcc, sb->truesize)) {
37446 RXPRINTK
37447 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37448 card->index);
37449- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37450+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37451 dev_kfree_skb_any(sb);
37452 break;
37453 }
37454@@ -2046,7 +2046,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37455 ATM_SKB(sb)->vcc = vcc;
37456 __net_timestamp(sb);
37457 vcc->push(vcc, sb);
37458- atomic_inc(&vcc->stats->rx);
37459+ atomic_inc_unchecked(&vcc->stats->rx);
37460 cell += ATM_CELL_PAYLOAD;
37461 }
37462
37463@@ -2063,7 +2063,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37464 if (iovb == NULL) {
37465 printk("nicstar%d: Out of iovec buffers.\n",
37466 card->index);
37467- atomic_inc(&vcc->stats->rx_drop);
37468+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37469 recycle_rx_buf(card, skb);
37470 return;
37471 }
37472@@ -2087,7 +2087,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37473 small or large buffer itself. */
37474 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37475 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37476- atomic_inc(&vcc->stats->rx_err);
37477+ atomic_inc_unchecked(&vcc->stats->rx_err);
37478 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37479 NS_MAX_IOVECS);
37480 NS_PRV_IOVCNT(iovb) = 0;
37481@@ -2107,7 +2107,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37482 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37483 card->index);
37484 which_list(card, skb);
37485- atomic_inc(&vcc->stats->rx_err);
37486+ atomic_inc_unchecked(&vcc->stats->rx_err);
37487 recycle_rx_buf(card, skb);
37488 vc->rx_iov = NULL;
37489 recycle_iov_buf(card, iovb);
37490@@ -2120,7 +2120,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37491 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37492 card->index);
37493 which_list(card, skb);
37494- atomic_inc(&vcc->stats->rx_err);
37495+ atomic_inc_unchecked(&vcc->stats->rx_err);
37496 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37497 NS_PRV_IOVCNT(iovb));
37498 vc->rx_iov = NULL;
37499@@ -2143,7 +2143,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37500 printk(" - PDU size mismatch.\n");
37501 else
37502 printk(".\n");
37503- atomic_inc(&vcc->stats->rx_err);
37504+ atomic_inc_unchecked(&vcc->stats->rx_err);
37505 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37506 NS_PRV_IOVCNT(iovb));
37507 vc->rx_iov = NULL;
37508@@ -2157,14 +2157,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37509 /* skb points to a small buffer */
37510 if (!atm_charge(vcc, skb->truesize)) {
37511 push_rxbufs(card, skb);
37512- atomic_inc(&vcc->stats->rx_drop);
37513+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37514 } else {
37515 skb_put(skb, len);
37516 dequeue_sm_buf(card, skb);
37517 ATM_SKB(skb)->vcc = vcc;
37518 __net_timestamp(skb);
37519 vcc->push(vcc, skb);
37520- atomic_inc(&vcc->stats->rx);
37521+ atomic_inc_unchecked(&vcc->stats->rx);
37522 }
37523 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37524 struct sk_buff *sb;
37525@@ -2175,14 +2175,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37526 if (len <= NS_SMBUFSIZE) {
37527 if (!atm_charge(vcc, sb->truesize)) {
37528 push_rxbufs(card, sb);
37529- atomic_inc(&vcc->stats->rx_drop);
37530+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37531 } else {
37532 skb_put(sb, len);
37533 dequeue_sm_buf(card, sb);
37534 ATM_SKB(sb)->vcc = vcc;
37535 __net_timestamp(sb);
37536 vcc->push(vcc, sb);
37537- atomic_inc(&vcc->stats->rx);
37538+ atomic_inc_unchecked(&vcc->stats->rx);
37539 }
37540
37541 push_rxbufs(card, skb);
37542@@ -2191,7 +2191,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37543
37544 if (!atm_charge(vcc, skb->truesize)) {
37545 push_rxbufs(card, skb);
37546- atomic_inc(&vcc->stats->rx_drop);
37547+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37548 } else {
37549 dequeue_lg_buf(card, skb);
37550 skb_push(skb, NS_SMBUFSIZE);
37551@@ -2201,7 +2201,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37552 ATM_SKB(skb)->vcc = vcc;
37553 __net_timestamp(skb);
37554 vcc->push(vcc, skb);
37555- atomic_inc(&vcc->stats->rx);
37556+ atomic_inc_unchecked(&vcc->stats->rx);
37557 }
37558
37559 push_rxbufs(card, sb);
37560@@ -2222,7 +2222,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37561 printk
37562 ("nicstar%d: Out of huge buffers.\n",
37563 card->index);
37564- atomic_inc(&vcc->stats->rx_drop);
37565+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37566 recycle_iovec_rx_bufs(card,
37567 (struct iovec *)
37568 iovb->data,
37569@@ -2273,7 +2273,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37570 card->hbpool.count++;
37571 } else
37572 dev_kfree_skb_any(hb);
37573- atomic_inc(&vcc->stats->rx_drop);
37574+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37575 } else {
37576 /* Copy the small buffer to the huge buffer */
37577 sb = (struct sk_buff *)iov->iov_base;
37578@@ -2307,7 +2307,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37579 ATM_SKB(hb)->vcc = vcc;
37580 __net_timestamp(hb);
37581 vcc->push(vcc, hb);
37582- atomic_inc(&vcc->stats->rx);
37583+ atomic_inc_unchecked(&vcc->stats->rx);
37584 }
37585 }
37586
37587diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37588index 74e18b0..f16afa0 100644
37589--- a/drivers/atm/solos-pci.c
37590+++ b/drivers/atm/solos-pci.c
37591@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37592 }
37593 atm_charge(vcc, skb->truesize);
37594 vcc->push(vcc, skb);
37595- atomic_inc(&vcc->stats->rx);
37596+ atomic_inc_unchecked(&vcc->stats->rx);
37597 break;
37598
37599 case PKT_STATUS:
37600@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37601 vcc = SKB_CB(oldskb)->vcc;
37602
37603 if (vcc) {
37604- atomic_inc(&vcc->stats->tx);
37605+ atomic_inc_unchecked(&vcc->stats->tx);
37606 solos_pop(vcc, oldskb);
37607 } else {
37608 dev_kfree_skb_irq(oldskb);
37609diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37610index 0215934..ce9f5b1 100644
37611--- a/drivers/atm/suni.c
37612+++ b/drivers/atm/suni.c
37613@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37614
37615
37616 #define ADD_LIMITED(s,v) \
37617- atomic_add((v),&stats->s); \
37618- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37619+ atomic_add_unchecked((v),&stats->s); \
37620+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37621
37622
37623 static void suni_hz(unsigned long from_timer)
37624diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37625index 5120a96..e2572bd 100644
37626--- a/drivers/atm/uPD98402.c
37627+++ b/drivers/atm/uPD98402.c
37628@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37629 struct sonet_stats tmp;
37630 int error = 0;
37631
37632- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37633+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37634 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37635 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37636 if (zero && !error) {
37637@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37638
37639
37640 #define ADD_LIMITED(s,v) \
37641- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37642- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37643- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37644+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37645+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37646+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37647
37648
37649 static void stat_event(struct atm_dev *dev)
37650@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37651 if (reason & uPD98402_INT_PFM) stat_event(dev);
37652 if (reason & uPD98402_INT_PCO) {
37653 (void) GET(PCOCR); /* clear interrupt cause */
37654- atomic_add(GET(HECCT),
37655+ atomic_add_unchecked(GET(HECCT),
37656 &PRIV(dev)->sonet_stats.uncorr_hcs);
37657 }
37658 if ((reason & uPD98402_INT_RFO) &&
37659@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37660 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37661 uPD98402_INT_LOS),PIMR); /* enable them */
37662 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37663- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37664- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37665- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37666+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37667+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37668+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37669 return 0;
37670 }
37671
37672diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37673index cecfb94..87009ec 100644
37674--- a/drivers/atm/zatm.c
37675+++ b/drivers/atm/zatm.c
37676@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37677 }
37678 if (!size) {
37679 dev_kfree_skb_irq(skb);
37680- if (vcc) atomic_inc(&vcc->stats->rx_err);
37681+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37682 continue;
37683 }
37684 if (!atm_charge(vcc,skb->truesize)) {
37685@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37686 skb->len = size;
37687 ATM_SKB(skb)->vcc = vcc;
37688 vcc->push(vcc,skb);
37689- atomic_inc(&vcc->stats->rx);
37690+ atomic_inc_unchecked(&vcc->stats->rx);
37691 }
37692 zout(pos & 0xffff,MTA(mbx));
37693 #if 0 /* probably a stupid idea */
37694@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37695 skb_queue_head(&zatm_vcc->backlog,skb);
37696 break;
37697 }
37698- atomic_inc(&vcc->stats->tx);
37699+ atomic_inc_unchecked(&vcc->stats->tx);
37700 wake_up(&zatm_vcc->tx_wait);
37701 }
37702
37703diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37704index 79bc203..fa3945b 100644
37705--- a/drivers/base/bus.c
37706+++ b/drivers/base/bus.c
37707@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37708 return -EINVAL;
37709
37710 mutex_lock(&subsys->p->mutex);
37711- list_add_tail(&sif->node, &subsys->p->interfaces);
37712+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37713 if (sif->add_dev) {
37714 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37715 while ((dev = subsys_dev_iter_next(&iter)))
37716@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37717 subsys = sif->subsys;
37718
37719 mutex_lock(&subsys->p->mutex);
37720- list_del_init(&sif->node);
37721+ pax_list_del_init((struct list_head *)&sif->node);
37722 if (sif->remove_dev) {
37723 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37724 while ((dev = subsys_dev_iter_next(&iter)))
37725diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37726index 68f0314..ca2a609 100644
37727--- a/drivers/base/devtmpfs.c
37728+++ b/drivers/base/devtmpfs.c
37729@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37730 if (!thread)
37731 return 0;
37732
37733- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37734+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37735 if (err)
37736 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37737 else
37738@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37739 *err = sys_unshare(CLONE_NEWNS);
37740 if (*err)
37741 goto out;
37742- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37743+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37744 if (*err)
37745 goto out;
37746- sys_chdir("/.."); /* will traverse into overmounted root */
37747- sys_chroot(".");
37748+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37749+ sys_chroot((char __force_user *)".");
37750 complete(&setup_done);
37751 while (1) {
37752 spin_lock(&req_lock);
37753diff --git a/drivers/base/node.c b/drivers/base/node.c
37754index a2aa65b..8831326 100644
37755--- a/drivers/base/node.c
37756+++ b/drivers/base/node.c
37757@@ -613,7 +613,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37758 struct node_attr {
37759 struct device_attribute attr;
37760 enum node_states state;
37761-};
37762+} __do_const;
37763
37764 static ssize_t show_node_state(struct device *dev,
37765 struct device_attribute *attr, char *buf)
37766diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37767index 2327613..211d7f5 100644
37768--- a/drivers/base/power/domain.c
37769+++ b/drivers/base/power/domain.c
37770@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37771 {
37772 struct cpuidle_driver *cpuidle_drv;
37773 struct gpd_cpuidle_data *cpuidle_data;
37774- struct cpuidle_state *idle_state;
37775+ cpuidle_state_no_const *idle_state;
37776 int ret = 0;
37777
37778 if (IS_ERR_OR_NULL(genpd) || state < 0)
37779@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37780 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37781 {
37782 struct gpd_cpuidle_data *cpuidle_data;
37783- struct cpuidle_state *idle_state;
37784+ cpuidle_state_no_const *idle_state;
37785 int ret = 0;
37786
37787 if (IS_ERR_OR_NULL(genpd))
37788@@ -2222,8 +2222,11 @@ int genpd_dev_pm_attach(struct device *dev)
37789 return ret;
37790 }
37791
37792- dev->pm_domain->detach = genpd_dev_pm_detach;
37793- dev->pm_domain->sync = genpd_dev_pm_sync;
37794+ pax_open_kernel();
37795+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37796+ *(void **)&dev->pm_domain->sync = genpd_dev_pm_sync;
37797+ pax_close_kernel();
37798+
37799 pm_genpd_poweron(pd);
37800
37801 return 0;
37802diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37803index d2be3f9..0a3167a 100644
37804--- a/drivers/base/power/sysfs.c
37805+++ b/drivers/base/power/sysfs.c
37806@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37807 return -EIO;
37808 }
37809 }
37810- return sprintf(buf, p);
37811+ return sprintf(buf, "%s", p);
37812 }
37813
37814 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37815diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37816index 7726200..a417da7 100644
37817--- a/drivers/base/power/wakeup.c
37818+++ b/drivers/base/power/wakeup.c
37819@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37820 * They need to be modified together atomically, so it's better to use one
37821 * atomic variable to hold them both.
37822 */
37823-static atomic_t combined_event_count = ATOMIC_INIT(0);
37824+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37825
37826 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37827 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37828
37829 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37830 {
37831- unsigned int comb = atomic_read(&combined_event_count);
37832+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37833
37834 *cnt = (comb >> IN_PROGRESS_BITS);
37835 *inpr = comb & MAX_IN_PROGRESS;
37836@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37837 ws->start_prevent_time = ws->last_time;
37838
37839 /* Increment the counter of events in progress. */
37840- cec = atomic_inc_return(&combined_event_count);
37841+ cec = atomic_inc_return_unchecked(&combined_event_count);
37842
37843 trace_wakeup_source_activate(ws->name, cec);
37844 }
37845@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37846 * Increment the counter of registered wakeup events and decrement the
37847 * couter of wakeup events in progress simultaneously.
37848 */
37849- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37850+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37851 trace_wakeup_source_deactivate(ws->name, cec);
37852
37853 split_counters(&cnt, &inpr);
37854diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37855index 8d98a32..61d3165 100644
37856--- a/drivers/base/syscore.c
37857+++ b/drivers/base/syscore.c
37858@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37859 void register_syscore_ops(struct syscore_ops *ops)
37860 {
37861 mutex_lock(&syscore_ops_lock);
37862- list_add_tail(&ops->node, &syscore_ops_list);
37863+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37864 mutex_unlock(&syscore_ops_lock);
37865 }
37866 EXPORT_SYMBOL_GPL(register_syscore_ops);
37867@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37868 void unregister_syscore_ops(struct syscore_ops *ops)
37869 {
37870 mutex_lock(&syscore_ops_lock);
37871- list_del(&ops->node);
37872+ pax_list_del((struct list_head *)&ops->node);
37873 mutex_unlock(&syscore_ops_lock);
37874 }
37875 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37876diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37877index ff20f19..018f1da 100644
37878--- a/drivers/block/cciss.c
37879+++ b/drivers/block/cciss.c
37880@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37881 while (!list_empty(&h->reqQ)) {
37882 c = list_entry(h->reqQ.next, CommandList_struct, list);
37883 /* can't do anything if fifo is full */
37884- if ((h->access.fifo_full(h))) {
37885+ if ((h->access->fifo_full(h))) {
37886 dev_warn(&h->pdev->dev, "fifo full\n");
37887 break;
37888 }
37889@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37890 h->Qdepth--;
37891
37892 /* Tell the controller execute command */
37893- h->access.submit_command(h, c);
37894+ h->access->submit_command(h, c);
37895
37896 /* Put job onto the completed Q */
37897 addQ(&h->cmpQ, c);
37898@@ -3444,17 +3444,17 @@ startio:
37899
37900 static inline unsigned long get_next_completion(ctlr_info_t *h)
37901 {
37902- return h->access.command_completed(h);
37903+ return h->access->command_completed(h);
37904 }
37905
37906 static inline int interrupt_pending(ctlr_info_t *h)
37907 {
37908- return h->access.intr_pending(h);
37909+ return h->access->intr_pending(h);
37910 }
37911
37912 static inline long interrupt_not_for_us(ctlr_info_t *h)
37913 {
37914- return ((h->access.intr_pending(h) == 0) ||
37915+ return ((h->access->intr_pending(h) == 0) ||
37916 (h->interrupts_enabled == 0));
37917 }
37918
37919@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37920 u32 a;
37921
37922 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37923- return h->access.command_completed(h);
37924+ return h->access->command_completed(h);
37925
37926 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37927 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37928@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37929 trans_support & CFGTBL_Trans_use_short_tags);
37930
37931 /* Change the access methods to the performant access methods */
37932- h->access = SA5_performant_access;
37933+ h->access = &SA5_performant_access;
37934 h->transMethod = CFGTBL_Trans_Performant;
37935
37936 return;
37937@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37938 if (prod_index < 0)
37939 return -ENODEV;
37940 h->product_name = products[prod_index].product_name;
37941- h->access = *(products[prod_index].access);
37942+ h->access = products[prod_index].access;
37943
37944 if (cciss_board_disabled(h)) {
37945 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37946@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37947 }
37948
37949 /* make sure the board interrupts are off */
37950- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37951+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37952 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37953 if (rc)
37954 goto clean2;
37955@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
37956 * fake ones to scoop up any residual completions.
37957 */
37958 spin_lock_irqsave(&h->lock, flags);
37959- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37960+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37961 spin_unlock_irqrestore(&h->lock, flags);
37962 free_irq(h->intr[h->intr_mode], h);
37963 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37964@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
37965 dev_info(&h->pdev->dev, "Board READY.\n");
37966 dev_info(&h->pdev->dev,
37967 "Waiting for stale completions to drain.\n");
37968- h->access.set_intr_mask(h, CCISS_INTR_ON);
37969+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37970 msleep(10000);
37971- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37972+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37973
37974 rc = controller_reset_failed(h->cfgtable);
37975 if (rc)
37976@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
37977 cciss_scsi_setup(h);
37978
37979 /* Turn the interrupts on so we can service requests */
37980- h->access.set_intr_mask(h, CCISS_INTR_ON);
37981+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37982
37983 /* Get the firmware version */
37984 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37985@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37986 kfree(flush_buf);
37987 if (return_code != IO_OK)
37988 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37989- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37990+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37991 free_irq(h->intr[h->intr_mode], h);
37992 }
37993
37994diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37995index 7fda30e..2f27946 100644
37996--- a/drivers/block/cciss.h
37997+++ b/drivers/block/cciss.h
37998@@ -101,7 +101,7 @@ struct ctlr_info
37999 /* information about each logical volume */
38000 drive_info_struct *drv[CISS_MAX_LUN];
38001
38002- struct access_method access;
38003+ struct access_method *access;
38004
38005 /* queue and queue Info */
38006 struct list_head reqQ;
38007@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38008 }
38009
38010 static struct access_method SA5_access = {
38011- SA5_submit_command,
38012- SA5_intr_mask,
38013- SA5_fifo_full,
38014- SA5_intr_pending,
38015- SA5_completed,
38016+ .submit_command = SA5_submit_command,
38017+ .set_intr_mask = SA5_intr_mask,
38018+ .fifo_full = SA5_fifo_full,
38019+ .intr_pending = SA5_intr_pending,
38020+ .command_completed = SA5_completed,
38021 };
38022
38023 static struct access_method SA5B_access = {
38024- SA5_submit_command,
38025- SA5B_intr_mask,
38026- SA5_fifo_full,
38027- SA5B_intr_pending,
38028- SA5_completed,
38029+ .submit_command = SA5_submit_command,
38030+ .set_intr_mask = SA5B_intr_mask,
38031+ .fifo_full = SA5_fifo_full,
38032+ .intr_pending = SA5B_intr_pending,
38033+ .command_completed = SA5_completed,
38034 };
38035
38036 static struct access_method SA5_performant_access = {
38037- SA5_submit_command,
38038- SA5_performant_intr_mask,
38039- SA5_fifo_full,
38040- SA5_performant_intr_pending,
38041- SA5_performant_completed,
38042+ .submit_command = SA5_submit_command,
38043+ .set_intr_mask = SA5_performant_intr_mask,
38044+ .fifo_full = SA5_fifo_full,
38045+ .intr_pending = SA5_performant_intr_pending,
38046+ .command_completed = SA5_performant_completed,
38047 };
38048
38049 struct board_type {
38050diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38051index f749df9..5f8b9c4 100644
38052--- a/drivers/block/cpqarray.c
38053+++ b/drivers/block/cpqarray.c
38054@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38055 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38056 goto Enomem4;
38057 }
38058- hba[i]->access.set_intr_mask(hba[i], 0);
38059+ hba[i]->access->set_intr_mask(hba[i], 0);
38060 if (request_irq(hba[i]->intr, do_ida_intr, IRQF_SHARED,
38061 hba[i]->devname, hba[i]))
38062 {
38063@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38064 add_timer(&hba[i]->timer);
38065
38066 /* Enable IRQ now that spinlock and rate limit timer are set up */
38067- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38068+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38069
38070 for(j=0; j<NWD; j++) {
38071 struct gendisk *disk = ida_gendisk[i][j];
38072@@ -694,7 +694,7 @@ DBGINFO(
38073 for(i=0; i<NR_PRODUCTS; i++) {
38074 if (board_id == products[i].board_id) {
38075 c->product_name = products[i].product_name;
38076- c->access = *(products[i].access);
38077+ c->access = products[i].access;
38078 break;
38079 }
38080 }
38081@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38082 hba[ctlr]->intr = intr;
38083 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38084 hba[ctlr]->product_name = products[j].product_name;
38085- hba[ctlr]->access = *(products[j].access);
38086+ hba[ctlr]->access = products[j].access;
38087 hba[ctlr]->ctlr = ctlr;
38088 hba[ctlr]->board_id = board_id;
38089 hba[ctlr]->pci_dev = NULL; /* not PCI */
38090@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38091
38092 while((c = h->reqQ) != NULL) {
38093 /* Can't do anything if we're busy */
38094- if (h->access.fifo_full(h) == 0)
38095+ if (h->access->fifo_full(h) == 0)
38096 return;
38097
38098 /* Get the first entry from the request Q */
38099@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38100 h->Qdepth--;
38101
38102 /* Tell the controller to do our bidding */
38103- h->access.submit_command(h, c);
38104+ h->access->submit_command(h, c);
38105
38106 /* Get onto the completion Q */
38107 addQ(&h->cmpQ, c);
38108@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38109 unsigned long flags;
38110 __u32 a,a1;
38111
38112- istat = h->access.intr_pending(h);
38113+ istat = h->access->intr_pending(h);
38114 /* Is this interrupt for us? */
38115 if (istat == 0)
38116 return IRQ_NONE;
38117@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38118 */
38119 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38120 if (istat & FIFO_NOT_EMPTY) {
38121- while((a = h->access.command_completed(h))) {
38122+ while((a = h->access->command_completed(h))) {
38123 a1 = a; a &= ~3;
38124 if ((c = h->cmpQ) == NULL)
38125 {
38126@@ -1448,11 +1448,11 @@ static int sendcmd(
38127 /*
38128 * Disable interrupt
38129 */
38130- info_p->access.set_intr_mask(info_p, 0);
38131+ info_p->access->set_intr_mask(info_p, 0);
38132 /* Make sure there is room in the command FIFO */
38133 /* Actually it should be completely empty at this time. */
38134 for (i = 200000; i > 0; i--) {
38135- temp = info_p->access.fifo_full(info_p);
38136+ temp = info_p->access->fifo_full(info_p);
38137 if (temp != 0) {
38138 break;
38139 }
38140@@ -1465,7 +1465,7 @@ DBG(
38141 /*
38142 * Send the cmd
38143 */
38144- info_p->access.submit_command(info_p, c);
38145+ info_p->access->submit_command(info_p, c);
38146 complete = pollcomplete(ctlr);
38147
38148 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38149@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38150 * we check the new geometry. Then turn interrupts back on when
38151 * we're done.
38152 */
38153- host->access.set_intr_mask(host, 0);
38154+ host->access->set_intr_mask(host, 0);
38155 getgeometry(ctlr);
38156- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38157+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38158
38159 for(i=0; i<NWD; i++) {
38160 struct gendisk *disk = ida_gendisk[ctlr][i];
38161@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38162 /* Wait (up to 2 seconds) for a command to complete */
38163
38164 for (i = 200000; i > 0; i--) {
38165- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38166+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38167 if (done == 0) {
38168 udelay(10); /* a short fixed delay */
38169 } else
38170diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38171index be73e9d..7fbf140 100644
38172--- a/drivers/block/cpqarray.h
38173+++ b/drivers/block/cpqarray.h
38174@@ -99,7 +99,7 @@ struct ctlr_info {
38175 drv_info_t drv[NWD];
38176 struct proc_dir_entry *proc;
38177
38178- struct access_method access;
38179+ struct access_method *access;
38180
38181 cmdlist_t *reqQ;
38182 cmdlist_t *cmpQ;
38183diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38184index 434c77d..6d3219a 100644
38185--- a/drivers/block/drbd/drbd_bitmap.c
38186+++ b/drivers/block/drbd/drbd_bitmap.c
38187@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38188 submit_bio(rw, bio);
38189 /* this should not count as user activity and cause the
38190 * resync to throttle -- see drbd_rs_should_slow_down(). */
38191- atomic_add(len >> 9, &device->rs_sect_ev);
38192+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38193 }
38194 }
38195
38196diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38197index b905e98..0812ed8 100644
38198--- a/drivers/block/drbd/drbd_int.h
38199+++ b/drivers/block/drbd/drbd_int.h
38200@@ -385,7 +385,7 @@ struct drbd_epoch {
38201 struct drbd_connection *connection;
38202 struct list_head list;
38203 unsigned int barrier_nr;
38204- atomic_t epoch_size; /* increased on every request added. */
38205+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38206 atomic_t active; /* increased on every req. added, and dec on every finished. */
38207 unsigned long flags;
38208 };
38209@@ -946,7 +946,7 @@ struct drbd_device {
38210 unsigned int al_tr_number;
38211 int al_tr_cycle;
38212 wait_queue_head_t seq_wait;
38213- atomic_t packet_seq;
38214+ atomic_unchecked_t packet_seq;
38215 unsigned int peer_seq;
38216 spinlock_t peer_seq_lock;
38217 unsigned long comm_bm_set; /* communicated number of set bits. */
38218@@ -955,8 +955,8 @@ struct drbd_device {
38219 struct mutex own_state_mutex;
38220 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38221 char congestion_reason; /* Why we where congested... */
38222- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38223- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38224+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38225+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38226 int rs_last_sect_ev; /* counter to compare with */
38227 int rs_last_events; /* counter of read or write "events" (unit sectors)
38228 * on the lower level device when we last looked. */
38229diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38230index 81fde9e..9948c05 100644
38231--- a/drivers/block/drbd/drbd_main.c
38232+++ b/drivers/block/drbd/drbd_main.c
38233@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38234 p->sector = sector;
38235 p->block_id = block_id;
38236 p->blksize = blksize;
38237- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38238+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38239 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38240 }
38241
38242@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38243 return -EIO;
38244 p->sector = cpu_to_be64(req->i.sector);
38245 p->block_id = (unsigned long)req;
38246- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38247+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38248 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38249 if (device->state.conn >= C_SYNC_SOURCE &&
38250 device->state.conn <= C_PAUSED_SYNC_T)
38251@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38252 atomic_set(&device->unacked_cnt, 0);
38253 atomic_set(&device->local_cnt, 0);
38254 atomic_set(&device->pp_in_use_by_net, 0);
38255- atomic_set(&device->rs_sect_in, 0);
38256- atomic_set(&device->rs_sect_ev, 0);
38257+ atomic_set_unchecked(&device->rs_sect_in, 0);
38258+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38259 atomic_set(&device->ap_in_flight, 0);
38260 atomic_set(&device->md_io.in_use, 0);
38261
38262@@ -2683,8 +2683,8 @@ void drbd_destroy_connection(struct kref *kref)
38263 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38264 struct drbd_resource *resource = connection->resource;
38265
38266- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38267- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38268+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38269+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38270 kfree(connection->current_epoch);
38271
38272 idr_destroy(&connection->peer_devices);
38273diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38274index 74df8cf..e41fc24 100644
38275--- a/drivers/block/drbd/drbd_nl.c
38276+++ b/drivers/block/drbd/drbd_nl.c
38277@@ -3637,13 +3637,13 @@ finish:
38278
38279 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38280 {
38281- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38282+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38283 struct sk_buff *msg;
38284 struct drbd_genlmsghdr *d_out;
38285 unsigned seq;
38286 int err = -ENOMEM;
38287
38288- seq = atomic_inc_return(&drbd_genl_seq);
38289+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38290 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38291 if (!msg)
38292 goto failed;
38293diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38294index cee2035..22f66bd 100644
38295--- a/drivers/block/drbd/drbd_receiver.c
38296+++ b/drivers/block/drbd/drbd_receiver.c
38297@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38298 struct drbd_device *device = peer_device->device;
38299 int err;
38300
38301- atomic_set(&device->packet_seq, 0);
38302+ atomic_set_unchecked(&device->packet_seq, 0);
38303 device->peer_seq = 0;
38304
38305 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38306@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38307 do {
38308 next_epoch = NULL;
38309
38310- epoch_size = atomic_read(&epoch->epoch_size);
38311+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38312
38313 switch (ev & ~EV_CLEANUP) {
38314 case EV_PUT:
38315@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38316 rv = FE_DESTROYED;
38317 } else {
38318 epoch->flags = 0;
38319- atomic_set(&epoch->epoch_size, 0);
38320+ atomic_set_unchecked(&epoch->epoch_size, 0);
38321 /* atomic_set(&epoch->active, 0); is already zero */
38322 if (rv == FE_STILL_LIVE)
38323 rv = FE_RECYCLED;
38324@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38325 conn_wait_active_ee_empty(connection);
38326 drbd_flush(connection);
38327
38328- if (atomic_read(&connection->current_epoch->epoch_size)) {
38329+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38330 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38331 if (epoch)
38332 break;
38333@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38334 }
38335
38336 epoch->flags = 0;
38337- atomic_set(&epoch->epoch_size, 0);
38338+ atomic_set_unchecked(&epoch->epoch_size, 0);
38339 atomic_set(&epoch->active, 0);
38340
38341 spin_lock(&connection->epoch_lock);
38342- if (atomic_read(&connection->current_epoch->epoch_size)) {
38343+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38344 list_add(&epoch->list, &connection->current_epoch->list);
38345 connection->current_epoch = epoch;
38346 connection->epochs++;
38347@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38348 list_add_tail(&peer_req->w.list, &device->sync_ee);
38349 spin_unlock_irq(&device->resource->req_lock);
38350
38351- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38352+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38353 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38354 return 0;
38355
38356@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38357 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38358 }
38359
38360- atomic_add(pi->size >> 9, &device->rs_sect_in);
38361+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38362
38363 return err;
38364 }
38365@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38366
38367 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38368 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38369- atomic_inc(&connection->current_epoch->epoch_size);
38370+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38371 err2 = drbd_drain_block(peer_device, pi->size);
38372 if (!err)
38373 err = err2;
38374@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38375
38376 spin_lock(&connection->epoch_lock);
38377 peer_req->epoch = connection->current_epoch;
38378- atomic_inc(&peer_req->epoch->epoch_size);
38379+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38380 atomic_inc(&peer_req->epoch->active);
38381 spin_unlock(&connection->epoch_lock);
38382
38383@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38384
38385 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38386 (int)part_stat_read(&disk->part0, sectors[1]) -
38387- atomic_read(&device->rs_sect_ev);
38388+ atomic_read_unchecked(&device->rs_sect_ev);
38389
38390 if (atomic_read(&device->ap_actlog_cnt)
38391 || curr_events - device->rs_last_events > 64) {
38392@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38393 device->use_csums = true;
38394 } else if (pi->cmd == P_OV_REPLY) {
38395 /* track progress, we may need to throttle */
38396- atomic_add(size >> 9, &device->rs_sect_in);
38397+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38398 peer_req->w.cb = w_e_end_ov_reply;
38399 dec_rs_pending(device);
38400 /* drbd_rs_begin_io done when we sent this request,
38401@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38402 goto out_free_e;
38403
38404 submit_for_resync:
38405- atomic_add(size >> 9, &device->rs_sect_ev);
38406+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38407
38408 submit:
38409 update_receiver_timing_details(connection, drbd_submit_peer_request);
38410@@ -4564,7 +4564,7 @@ struct data_cmd {
38411 int expect_payload;
38412 size_t pkt_size;
38413 int (*fn)(struct drbd_connection *, struct packet_info *);
38414-};
38415+} __do_const;
38416
38417 static struct data_cmd drbd_cmd_handler[] = {
38418 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38419@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38420 if (!list_empty(&connection->current_epoch->list))
38421 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38422 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38423- atomic_set(&connection->current_epoch->epoch_size, 0);
38424+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38425 connection->send.seen_any_write_yet = false;
38426
38427 drbd_info(connection, "Connection closed\n");
38428@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38429 put_ldev(device);
38430 }
38431 dec_rs_pending(device);
38432- atomic_add(blksize >> 9, &device->rs_sect_in);
38433+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38434
38435 return 0;
38436 }
38437@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38438 struct asender_cmd {
38439 size_t pkt_size;
38440 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38441-};
38442+} __do_const;
38443
38444 static struct asender_cmd asender_tbl[] = {
38445 [P_PING] = { 0, got_Ping },
38446diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38447index d0fae55..4469096 100644
38448--- a/drivers/block/drbd/drbd_worker.c
38449+++ b/drivers/block/drbd/drbd_worker.c
38450@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38451 list_add_tail(&peer_req->w.list, &device->read_ee);
38452 spin_unlock_irq(&device->resource->req_lock);
38453
38454- atomic_add(size >> 9, &device->rs_sect_ev);
38455+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38456 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38457 return 0;
38458
38459@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38460 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38461 int number, mxb;
38462
38463- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38464+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38465 device->rs_in_flight -= sect_in;
38466
38467 rcu_read_lock();
38468@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38469 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38470 struct fifo_buffer *plan;
38471
38472- atomic_set(&device->rs_sect_in, 0);
38473- atomic_set(&device->rs_sect_ev, 0);
38474+ atomic_set_unchecked(&device->rs_sect_in, 0);
38475+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38476 device->rs_in_flight = 0;
38477 device->rs_last_events =
38478 (int)part_stat_read(&disk->part0, sectors[0]) +
38479diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38480index 09e628da..7607aaa 100644
38481--- a/drivers/block/pktcdvd.c
38482+++ b/drivers/block/pktcdvd.c
38483@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38484
38485 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38486 {
38487- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38488+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38489 }
38490
38491 /*
38492@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38493 return -EROFS;
38494 }
38495 pd->settings.fp = ti.fp;
38496- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38497+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38498
38499 if (ti.nwa_v) {
38500 pd->nwa = be32_to_cpu(ti.next_writable);
38501diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38502index 010ce0b..7c0049e 100644
38503--- a/drivers/block/rbd.c
38504+++ b/drivers/block/rbd.c
38505@@ -64,7 +64,7 @@
38506 * If the counter is already at its maximum value returns
38507 * -EINVAL without updating it.
38508 */
38509-static int atomic_inc_return_safe(atomic_t *v)
38510+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38511 {
38512 unsigned int counter;
38513
38514diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38515index e5565fb..71be10b4 100644
38516--- a/drivers/block/smart1,2.h
38517+++ b/drivers/block/smart1,2.h
38518@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38519 }
38520
38521 static struct access_method smart4_access = {
38522- smart4_submit_command,
38523- smart4_intr_mask,
38524- smart4_fifo_full,
38525- smart4_intr_pending,
38526- smart4_completed,
38527+ .submit_command = smart4_submit_command,
38528+ .set_intr_mask = smart4_intr_mask,
38529+ .fifo_full = smart4_fifo_full,
38530+ .intr_pending = smart4_intr_pending,
38531+ .command_completed = smart4_completed,
38532 };
38533
38534 /*
38535@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38536 }
38537
38538 static struct access_method smart2_access = {
38539- smart2_submit_command,
38540- smart2_intr_mask,
38541- smart2_fifo_full,
38542- smart2_intr_pending,
38543- smart2_completed,
38544+ .submit_command = smart2_submit_command,
38545+ .set_intr_mask = smart2_intr_mask,
38546+ .fifo_full = smart2_fifo_full,
38547+ .intr_pending = smart2_intr_pending,
38548+ .command_completed = smart2_completed,
38549 };
38550
38551 /*
38552@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38553 }
38554
38555 static struct access_method smart2e_access = {
38556- smart2e_submit_command,
38557- smart2e_intr_mask,
38558- smart2e_fifo_full,
38559- smart2e_intr_pending,
38560- smart2e_completed,
38561+ .submit_command = smart2e_submit_command,
38562+ .set_intr_mask = smart2e_intr_mask,
38563+ .fifo_full = smart2e_fifo_full,
38564+ .intr_pending = smart2e_intr_pending,
38565+ .command_completed = smart2e_completed,
38566 };
38567
38568 /*
38569@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38570 }
38571
38572 static struct access_method smart1_access = {
38573- smart1_submit_command,
38574- smart1_intr_mask,
38575- smart1_fifo_full,
38576- smart1_intr_pending,
38577- smart1_completed,
38578+ .submit_command = smart1_submit_command,
38579+ .set_intr_mask = smart1_intr_mask,
38580+ .fifo_full = smart1_fifo_full,
38581+ .intr_pending = smart1_intr_pending,
38582+ .command_completed = smart1_completed,
38583 };
38584diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38585index 55c135b..9f8d60c 100644
38586--- a/drivers/bluetooth/btwilink.c
38587+++ b/drivers/bluetooth/btwilink.c
38588@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38589
38590 static int bt_ti_probe(struct platform_device *pdev)
38591 {
38592- static struct ti_st *hst;
38593+ struct ti_st *hst;
38594 struct hci_dev *hdev;
38595 int err;
38596
38597diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38598index 5d28a45..a538f90 100644
38599--- a/drivers/cdrom/cdrom.c
38600+++ b/drivers/cdrom/cdrom.c
38601@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38602 ENSURE(reset, CDC_RESET);
38603 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38604 cdi->mc_flags = 0;
38605- cdo->n_minors = 0;
38606 cdi->options = CDO_USE_FFLAGS;
38607
38608 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38609@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38610 else
38611 cdi->cdda_method = CDDA_OLD;
38612
38613- if (!cdo->generic_packet)
38614- cdo->generic_packet = cdrom_dummy_generic_packet;
38615+ if (!cdo->generic_packet) {
38616+ pax_open_kernel();
38617+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38618+ pax_close_kernel();
38619+ }
38620
38621 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38622 mutex_lock(&cdrom_mutex);
38623@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38624 if (cdi->exit)
38625 cdi->exit(cdi);
38626
38627- cdi->ops->n_minors--;
38628 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38629 }
38630
38631@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38632 */
38633 nr = nframes;
38634 do {
38635- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38636+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38637 if (cgc.buffer)
38638 break;
38639
38640@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38641 struct cdrom_device_info *cdi;
38642 int ret;
38643
38644- ret = scnprintf(info + *pos, max_size - *pos, header);
38645+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38646 if (!ret)
38647 return 1;
38648
38649diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38650index 584bc31..e64a12c 100644
38651--- a/drivers/cdrom/gdrom.c
38652+++ b/drivers/cdrom/gdrom.c
38653@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38654 .audio_ioctl = gdrom_audio_ioctl,
38655 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38656 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38657- .n_minors = 1,
38658 };
38659
38660 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38661diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38662index a4af822..ed58cd1 100644
38663--- a/drivers/char/Kconfig
38664+++ b/drivers/char/Kconfig
38665@@ -17,7 +17,8 @@ config DEVMEM
38666
38667 config DEVKMEM
38668 bool "/dev/kmem virtual device support"
38669- default y
38670+ default n
38671+ depends on !GRKERNSEC_KMEM
38672 help
38673 Say Y here if you want to support the /dev/kmem device. The
38674 /dev/kmem device is rarely used, but can be used for certain
38675@@ -586,6 +587,7 @@ config DEVPORT
38676 bool
38677 depends on !M68K
38678 depends on ISA || PCI
38679+ depends on !GRKERNSEC_KMEM
38680 default y
38681
38682 source "drivers/s390/char/Kconfig"
38683diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38684index a48e05b..6bac831 100644
38685--- a/drivers/char/agp/compat_ioctl.c
38686+++ b/drivers/char/agp/compat_ioctl.c
38687@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38688 return -ENOMEM;
38689 }
38690
38691- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38692+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38693 sizeof(*usegment) * ureserve.seg_count)) {
38694 kfree(usegment);
38695 kfree(ksegment);
38696diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38697index 09f17eb..8531d2f 100644
38698--- a/drivers/char/agp/frontend.c
38699+++ b/drivers/char/agp/frontend.c
38700@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38701 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38702 return -EFAULT;
38703
38704- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38705+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38706 return -EFAULT;
38707
38708 client = agp_find_client_by_pid(reserve.pid);
38709@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38710 if (segment == NULL)
38711 return -ENOMEM;
38712
38713- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38714+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38715 sizeof(struct agp_segment) * reserve.seg_count)) {
38716 kfree(segment);
38717 return -EFAULT;
38718diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38719index 4f94375..413694e 100644
38720--- a/drivers/char/genrtc.c
38721+++ b/drivers/char/genrtc.c
38722@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38723 switch (cmd) {
38724
38725 case RTC_PLL_GET:
38726+ memset(&pll, 0, sizeof(pll));
38727 if (get_rtc_pll(&pll))
38728 return -EINVAL;
38729 else
38730diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38731index 5c0baa9..44011b1 100644
38732--- a/drivers/char/hpet.c
38733+++ b/drivers/char/hpet.c
38734@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38735 }
38736
38737 static int
38738-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38739+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38740 struct hpet_info *info)
38741 {
38742 struct hpet_timer __iomem *timer;
38743diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38744index 3c1a123..a33c99f 100644
38745--- a/drivers/char/i8k.c
38746+++ b/drivers/char/i8k.c
38747@@ -790,7 +790,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38748 },
38749 };
38750
38751-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38752+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38753 {
38754 .ident = "Dell Inspiron",
38755 .matches = {
38756diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38757index bf75f63..359fa10 100644
38758--- a/drivers/char/ipmi/ipmi_msghandler.c
38759+++ b/drivers/char/ipmi/ipmi_msghandler.c
38760@@ -436,7 +436,7 @@ struct ipmi_smi {
38761 struct proc_dir_entry *proc_dir;
38762 char proc_dir_name[10];
38763
38764- atomic_t stats[IPMI_NUM_STATS];
38765+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38766
38767 /*
38768 * run_to_completion duplicate of smb_info, smi_info
38769@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38770 static DEFINE_MUTEX(smi_watchers_mutex);
38771
38772 #define ipmi_inc_stat(intf, stat) \
38773- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38774+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38775 #define ipmi_get_stat(intf, stat) \
38776- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38777+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38778
38779 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
38780 "ACPI", "SMBIOS", "PCI",
38781@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38782 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38783 init_waitqueue_head(&intf->waitq);
38784 for (i = 0; i < IPMI_NUM_STATS; i++)
38785- atomic_set(&intf->stats[i], 0);
38786+ atomic_set_unchecked(&intf->stats[i], 0);
38787
38788 intf->proc_dir = NULL;
38789
38790diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38791index 8a45e92..e41b1c7 100644
38792--- a/drivers/char/ipmi/ipmi_si_intf.c
38793+++ b/drivers/char/ipmi/ipmi_si_intf.c
38794@@ -289,7 +289,7 @@ struct smi_info {
38795 unsigned char slave_addr;
38796
38797 /* Counters and things for the proc filesystem. */
38798- atomic_t stats[SI_NUM_STATS];
38799+ atomic_unchecked_t stats[SI_NUM_STATS];
38800
38801 struct task_struct *thread;
38802
38803@@ -298,9 +298,9 @@ struct smi_info {
38804 };
38805
38806 #define smi_inc_stat(smi, stat) \
38807- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38808+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38809 #define smi_get_stat(smi, stat) \
38810- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38811+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38812
38813 #define SI_MAX_PARMS 4
38814
38815@@ -3500,7 +3500,7 @@ static int try_smi_init(struct smi_info *new_smi)
38816 atomic_set(&new_smi->req_events, 0);
38817 new_smi->run_to_completion = false;
38818 for (i = 0; i < SI_NUM_STATS; i++)
38819- atomic_set(&new_smi->stats[i], 0);
38820+ atomic_set_unchecked(&new_smi->stats[i], 0);
38821
38822 new_smi->interrupt_disabled = true;
38823 atomic_set(&new_smi->need_watch, 0);
38824diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38825index 6b1721f..fda9398 100644
38826--- a/drivers/char/mem.c
38827+++ b/drivers/char/mem.c
38828@@ -18,6 +18,7 @@
38829 #include <linux/raw.h>
38830 #include <linux/tty.h>
38831 #include <linux/capability.h>
38832+#include <linux/security.h>
38833 #include <linux/ptrace.h>
38834 #include <linux/device.h>
38835 #include <linux/highmem.h>
38836@@ -36,6 +37,10 @@
38837
38838 #define DEVPORT_MINOR 4
38839
38840+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38841+extern const struct file_operations grsec_fops;
38842+#endif
38843+
38844 static inline unsigned long size_inside_page(unsigned long start,
38845 unsigned long size)
38846 {
38847@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38848
38849 while (cursor < to) {
38850 if (!devmem_is_allowed(pfn)) {
38851+#ifdef CONFIG_GRKERNSEC_KMEM
38852+ gr_handle_mem_readwrite(from, to);
38853+#else
38854 printk(KERN_INFO
38855 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38856 current->comm, from, to);
38857+#endif
38858 return 0;
38859 }
38860 cursor += PAGE_SIZE;
38861@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38862 }
38863 return 1;
38864 }
38865+#elif defined(CONFIG_GRKERNSEC_KMEM)
38866+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38867+{
38868+ return 0;
38869+}
38870 #else
38871 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38872 {
38873@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38874 #endif
38875
38876 while (count > 0) {
38877- unsigned long remaining;
38878+ unsigned long remaining = 0;
38879+ char *temp;
38880
38881 sz = size_inside_page(p, count);
38882
38883@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38884 if (!ptr)
38885 return -EFAULT;
38886
38887- remaining = copy_to_user(buf, ptr, sz);
38888+#ifdef CONFIG_PAX_USERCOPY
38889+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38890+ if (!temp) {
38891+ unxlate_dev_mem_ptr(p, ptr);
38892+ return -ENOMEM;
38893+ }
38894+ remaining = probe_kernel_read(temp, ptr, sz);
38895+#else
38896+ temp = ptr;
38897+#endif
38898+
38899+ if (!remaining)
38900+ remaining = copy_to_user(buf, temp, sz);
38901+
38902+#ifdef CONFIG_PAX_USERCOPY
38903+ kfree(temp);
38904+#endif
38905+
38906 unxlate_dev_mem_ptr(p, ptr);
38907 if (remaining)
38908 return -EFAULT;
38909@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38910 size_t count, loff_t *ppos)
38911 {
38912 unsigned long p = *ppos;
38913- ssize_t low_count, read, sz;
38914+ ssize_t low_count, read, sz, err = 0;
38915 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38916- int err = 0;
38917
38918 read = 0;
38919 if (p < (unsigned long) high_memory) {
38920@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38921 }
38922 #endif
38923 while (low_count > 0) {
38924+ char *temp;
38925+
38926 sz = size_inside_page(p, low_count);
38927
38928 /*
38929@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38930 */
38931 kbuf = xlate_dev_kmem_ptr((void *)p);
38932
38933- if (copy_to_user(buf, kbuf, sz))
38934+#ifdef CONFIG_PAX_USERCOPY
38935+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38936+ if (!temp)
38937+ return -ENOMEM;
38938+ err = probe_kernel_read(temp, kbuf, sz);
38939+#else
38940+ temp = kbuf;
38941+#endif
38942+
38943+ if (!err)
38944+ err = copy_to_user(buf, temp, sz);
38945+
38946+#ifdef CONFIG_PAX_USERCOPY
38947+ kfree(temp);
38948+#endif
38949+
38950+ if (err)
38951 return -EFAULT;
38952 buf += sz;
38953 p += sz;
38954@@ -802,6 +851,9 @@ static const struct memdev {
38955 #ifdef CONFIG_PRINTK
38956 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
38957 #endif
38958+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38959+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
38960+#endif
38961 };
38962
38963 static int memory_open(struct inode *inode, struct file *filp)
38964@@ -863,7 +915,7 @@ static int __init chr_dev_init(void)
38965 continue;
38966
38967 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38968- NULL, devlist[minor].name);
38969+ NULL, "%s", devlist[minor].name);
38970 }
38971
38972 return tty_init();
38973diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38974index 9df78e2..01ba9ae 100644
38975--- a/drivers/char/nvram.c
38976+++ b/drivers/char/nvram.c
38977@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38978
38979 spin_unlock_irq(&rtc_lock);
38980
38981- if (copy_to_user(buf, contents, tmp - contents))
38982+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38983 return -EFAULT;
38984
38985 *ppos = i;
38986diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38987index 0ea9986..e7b07e4 100644
38988--- a/drivers/char/pcmcia/synclink_cs.c
38989+++ b/drivers/char/pcmcia/synclink_cs.c
38990@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38991
38992 if (debug_level >= DEBUG_LEVEL_INFO)
38993 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38994- __FILE__, __LINE__, info->device_name, port->count);
38995+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38996
38997 if (tty_port_close_start(port, tty, filp) == 0)
38998 goto cleanup;
38999@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39000 cleanup:
39001 if (debug_level >= DEBUG_LEVEL_INFO)
39002 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39003- tty->driver->name, port->count);
39004+ tty->driver->name, atomic_read(&port->count));
39005 }
39006
39007 /* Wait until the transmitter is empty.
39008@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39009
39010 if (debug_level >= DEBUG_LEVEL_INFO)
39011 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39012- __FILE__, __LINE__, tty->driver->name, port->count);
39013+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39014
39015 /* If port is closing, signal caller to try again */
39016 if (port->flags & ASYNC_CLOSING){
39017@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39018 goto cleanup;
39019 }
39020 spin_lock(&port->lock);
39021- port->count++;
39022+ atomic_inc(&port->count);
39023 spin_unlock(&port->lock);
39024 spin_unlock_irqrestore(&info->netlock, flags);
39025
39026- if (port->count == 1) {
39027+ if (atomic_read(&port->count) == 1) {
39028 /* 1st open on this device, init hardware */
39029 retval = startup(info, tty);
39030 if (retval < 0)
39031@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39032 unsigned short new_crctype;
39033
39034 /* return error if TTY interface open */
39035- if (info->port.count)
39036+ if (atomic_read(&info->port.count))
39037 return -EBUSY;
39038
39039 switch (encoding)
39040@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39041
39042 /* arbitrate between network and tty opens */
39043 spin_lock_irqsave(&info->netlock, flags);
39044- if (info->port.count != 0 || info->netcount != 0) {
39045+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39046 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39047 spin_unlock_irqrestore(&info->netlock, flags);
39048 return -EBUSY;
39049@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39050 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39051
39052 /* return error if TTY interface open */
39053- if (info->port.count)
39054+ if (atomic_read(&info->port.count))
39055 return -EBUSY;
39056
39057 if (cmd != SIOCWANDEV)
39058diff --git a/drivers/char/random.c b/drivers/char/random.c
39059index 9cd6968..6416f00 100644
39060--- a/drivers/char/random.c
39061+++ b/drivers/char/random.c
39062@@ -289,9 +289,6 @@
39063 /*
39064 * To allow fractional bits to be tracked, the entropy_count field is
39065 * denominated in units of 1/8th bits.
39066- *
39067- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39068- * credit_entropy_bits() needs to be 64 bits wide.
39069 */
39070 #define ENTROPY_SHIFT 3
39071 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39072@@ -439,9 +436,9 @@ struct entropy_store {
39073 };
39074
39075 static void push_to_pool(struct work_struct *work);
39076-static __u32 input_pool_data[INPUT_POOL_WORDS];
39077-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39078-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39079+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39080+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39081+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39082
39083 static struct entropy_store input_pool = {
39084 .poolinfo = &poolinfo_table[0],
39085@@ -635,7 +632,7 @@ retry:
39086 /* The +2 corresponds to the /4 in the denominator */
39087
39088 do {
39089- unsigned int anfrac = min(pnfrac, pool_size/2);
39090+ u64 anfrac = min(pnfrac, pool_size/2);
39091 unsigned int add =
39092 ((pool_size - entropy_count)*anfrac*3) >> s;
39093
39094@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39095
39096 extract_buf(r, tmp);
39097 i = min_t(int, nbytes, EXTRACT_SIZE);
39098- if (copy_to_user(buf, tmp, i)) {
39099+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39100 ret = -EFAULT;
39101 break;
39102 }
39103@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39104 static int proc_do_uuid(struct ctl_table *table, int write,
39105 void __user *buffer, size_t *lenp, loff_t *ppos)
39106 {
39107- struct ctl_table fake_table;
39108+ ctl_table_no_const fake_table;
39109 unsigned char buf[64], tmp_uuid[16], *uuid;
39110
39111 uuid = table->data;
39112@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39113 static int proc_do_entropy(struct ctl_table *table, int write,
39114 void __user *buffer, size_t *lenp, loff_t *ppos)
39115 {
39116- struct ctl_table fake_table;
39117+ ctl_table_no_const fake_table;
39118 int entropy_count;
39119
39120 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39121diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39122index e496dae..3db53b6 100644
39123--- a/drivers/char/sonypi.c
39124+++ b/drivers/char/sonypi.c
39125@@ -54,6 +54,7 @@
39126
39127 #include <asm/uaccess.h>
39128 #include <asm/io.h>
39129+#include <asm/local.h>
39130
39131 #include <linux/sonypi.h>
39132
39133@@ -490,7 +491,7 @@ static struct sonypi_device {
39134 spinlock_t fifo_lock;
39135 wait_queue_head_t fifo_proc_list;
39136 struct fasync_struct *fifo_async;
39137- int open_count;
39138+ local_t open_count;
39139 int model;
39140 struct input_dev *input_jog_dev;
39141 struct input_dev *input_key_dev;
39142@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39143 static int sonypi_misc_release(struct inode *inode, struct file *file)
39144 {
39145 mutex_lock(&sonypi_device.lock);
39146- sonypi_device.open_count--;
39147+ local_dec(&sonypi_device.open_count);
39148 mutex_unlock(&sonypi_device.lock);
39149 return 0;
39150 }
39151@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39152 {
39153 mutex_lock(&sonypi_device.lock);
39154 /* Flush input queue on first open */
39155- if (!sonypi_device.open_count)
39156+ if (!local_read(&sonypi_device.open_count))
39157 kfifo_reset(&sonypi_device.fifo);
39158- sonypi_device.open_count++;
39159+ local_inc(&sonypi_device.open_count);
39160 mutex_unlock(&sonypi_device.lock);
39161
39162 return 0;
39163@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39164
39165 static struct platform_device *sonypi_platform_device;
39166
39167-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39168+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39169 {
39170 .ident = "Sony Vaio",
39171 .matches = {
39172diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39173index 565a947..dcdc06e 100644
39174--- a/drivers/char/tpm/tpm_acpi.c
39175+++ b/drivers/char/tpm/tpm_acpi.c
39176@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39177 virt = acpi_os_map_iomem(start, len);
39178 if (!virt) {
39179 kfree(log->bios_event_log);
39180+ log->bios_event_log = NULL;
39181 printk("%s: ERROR - Unable to map memory\n", __func__);
39182 return -EIO;
39183 }
39184
39185- memcpy_fromio(log->bios_event_log, virt, len);
39186+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39187
39188 acpi_os_unmap_iomem(virt, len);
39189 return 0;
39190diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39191index 3a56a13..f8cbd25 100644
39192--- a/drivers/char/tpm/tpm_eventlog.c
39193+++ b/drivers/char/tpm/tpm_eventlog.c
39194@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39195 event = addr;
39196
39197 if ((event->event_type == 0 && event->event_size == 0) ||
39198- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39199+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39200 return NULL;
39201
39202 return addr;
39203@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39204 return NULL;
39205
39206 if ((event->event_type == 0 && event->event_size == 0) ||
39207- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39208+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39209 return NULL;
39210
39211 (*pos)++;
39212@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39213 int i;
39214
39215 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39216- seq_putc(m, data[i]);
39217+ if (!seq_putc(m, data[i]))
39218+ return -EFAULT;
39219
39220 return 0;
39221 }
39222diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39223index 50754d20..9561cdc 100644
39224--- a/drivers/char/virtio_console.c
39225+++ b/drivers/char/virtio_console.c
39226@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39227 if (to_user) {
39228 ssize_t ret;
39229
39230- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39231+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39232 if (ret)
39233 return -EFAULT;
39234 } else {
39235@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39236 if (!port_has_data(port) && !port->host_connected)
39237 return 0;
39238
39239- return fill_readbuf(port, ubuf, count, true);
39240+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39241 }
39242
39243 static int wait_port_writable(struct port *port, bool nonblock)
39244diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39245index 956b7e5..b655045 100644
39246--- a/drivers/clk/clk-composite.c
39247+++ b/drivers/clk/clk-composite.c
39248@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39249 struct clk *clk;
39250 struct clk_init_data init;
39251 struct clk_composite *composite;
39252- struct clk_ops *clk_composite_ops;
39253+ clk_ops_no_const *clk_composite_ops;
39254
39255 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39256 if (!composite) {
39257diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
39258index 69a094c..1fa2a8d 100644
39259--- a/drivers/clk/clk-mux.c
39260+++ b/drivers/clk/clk-mux.c
39261@@ -114,7 +114,7 @@ const struct clk_ops clk_mux_ro_ops = {
39262 EXPORT_SYMBOL_GPL(clk_mux_ro_ops);
39263
39264 struct clk *clk_register_mux_table(struct device *dev, const char *name,
39265- const char **parent_names, u8 num_parents, unsigned long flags,
39266+ const char * const *parent_names, u8 num_parents, unsigned long flags,
39267 void __iomem *reg, u8 shift, u32 mask,
39268 u8 clk_mux_flags, u32 *table, spinlock_t *lock)
39269 {
39270@@ -166,7 +166,7 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name,
39271 EXPORT_SYMBOL_GPL(clk_register_mux_table);
39272
39273 struct clk *clk_register_mux(struct device *dev, const char *name,
39274- const char **parent_names, u8 num_parents, unsigned long flags,
39275+ const char * const *parent_names, u8 num_parents, unsigned long flags,
39276 void __iomem *reg, u8 shift, u8 width,
39277 u8 clk_mux_flags, spinlock_t *lock)
39278 {
39279diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39280index e4c7538..9d5c18a 100644
39281--- a/drivers/clk/samsung/clk.h
39282+++ b/drivers/clk/samsung/clk.h
39283@@ -121,7 +121,7 @@ struct samsung_mux_clock {
39284 unsigned int id;
39285 const char *dev_name;
39286 const char *name;
39287- const char **parent_names;
39288+ const char * const *parent_names;
39289 u8 num_parents;
39290 unsigned long flags;
39291 unsigned long offset;
39292@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39293 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39294 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39295
39296-#define PNAME(x) static const char *x[] __initdata
39297+#define PNAME(x) static const char * const x[] __initconst
39298
39299 /**
39300 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39301diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39302index dd3a78c..386d49c 100644
39303--- a/drivers/clk/socfpga/clk-gate.c
39304+++ b/drivers/clk/socfpga/clk-gate.c
39305@@ -22,6 +22,7 @@
39306 #include <linux/mfd/syscon.h>
39307 #include <linux/of.h>
39308 #include <linux/regmap.h>
39309+#include <asm/pgtable.h>
39310
39311 #include "clk.h"
39312
39313@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39314 return 0;
39315 }
39316
39317-static struct clk_ops gateclk_ops = {
39318+static clk_ops_no_const gateclk_ops __read_only = {
39319 .prepare = socfpga_clk_prepare,
39320 .recalc_rate = socfpga_clk_recalc_rate,
39321 .get_parent = socfpga_clk_get_parent,
39322@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39323 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39324 socfpga_clk->hw.bit_idx = clk_gate[1];
39325
39326- gateclk_ops.enable = clk_gate_ops.enable;
39327- gateclk_ops.disable = clk_gate_ops.disable;
39328+ pax_open_kernel();
39329+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39330+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39331+ pax_close_kernel();
39332 }
39333
39334 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39335diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39336index de6da95..c98278b 100644
39337--- a/drivers/clk/socfpga/clk-pll.c
39338+++ b/drivers/clk/socfpga/clk-pll.c
39339@@ -21,6 +21,7 @@
39340 #include <linux/io.h>
39341 #include <linux/of.h>
39342 #include <linux/of_address.h>
39343+#include <asm/pgtable.h>
39344
39345 #include "clk.h"
39346
39347@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39348 CLK_MGR_PLL_CLK_SRC_MASK;
39349 }
39350
39351-static struct clk_ops clk_pll_ops = {
39352+static clk_ops_no_const clk_pll_ops __read_only = {
39353 .recalc_rate = clk_pll_recalc_rate,
39354 .get_parent = clk_pll_get_parent,
39355 };
39356@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39357 pll_clk->hw.hw.init = &init;
39358
39359 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39360- clk_pll_ops.enable = clk_gate_ops.enable;
39361- clk_pll_ops.disable = clk_gate_ops.disable;
39362+ pax_open_kernel();
39363+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39364+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39365+ pax_close_kernel();
39366
39367 clk = clk_register(NULL, &pll_clk->hw.hw);
39368 if (WARN_ON(IS_ERR(clk))) {
39369diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39370index b0c18ed..1713a80 100644
39371--- a/drivers/cpufreq/acpi-cpufreq.c
39372+++ b/drivers/cpufreq/acpi-cpufreq.c
39373@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39374 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39375 per_cpu(acfreq_data, cpu) = data;
39376
39377- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39378- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39379+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39380+ pax_open_kernel();
39381+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39382+ pax_close_kernel();
39383+ }
39384
39385 result = acpi_processor_register_performance(data->acpi_data, cpu);
39386 if (result)
39387@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39388 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39389 break;
39390 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39391- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39392+ pax_open_kernel();
39393+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39394+ pax_close_kernel();
39395 break;
39396 default:
39397 break;
39398@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39399 if (!msrs)
39400 return;
39401
39402- acpi_cpufreq_driver.boost_supported = true;
39403- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39404+ pax_open_kernel();
39405+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39406+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39407+ pax_close_kernel();
39408
39409 cpu_notifier_register_begin();
39410
39411diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39412index bab67db..91af7e3 100644
39413--- a/drivers/cpufreq/cpufreq-dt.c
39414+++ b/drivers/cpufreq/cpufreq-dt.c
39415@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39416 if (!IS_ERR(cpu_reg))
39417 regulator_put(cpu_reg);
39418
39419- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39420+ pax_open_kernel();
39421+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39422+ pax_close_kernel();
39423
39424 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39425 if (ret)
39426diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39427index 8ae655c..3141442 100644
39428--- a/drivers/cpufreq/cpufreq.c
39429+++ b/drivers/cpufreq/cpufreq.c
39430@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39431 }
39432
39433 mutex_lock(&cpufreq_governor_mutex);
39434- list_del(&governor->governor_list);
39435+ pax_list_del(&governor->governor_list);
39436 mutex_unlock(&cpufreq_governor_mutex);
39437 return;
39438 }
39439@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39440 return NOTIFY_OK;
39441 }
39442
39443-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39444+static struct notifier_block cpufreq_cpu_notifier = {
39445 .notifier_call = cpufreq_cpu_callback,
39446 };
39447
39448@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39449 return 0;
39450
39451 write_lock_irqsave(&cpufreq_driver_lock, flags);
39452- cpufreq_driver->boost_enabled = state;
39453+ pax_open_kernel();
39454+ *(bool *)&cpufreq_driver->boost_enabled = state;
39455+ pax_close_kernel();
39456 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39457
39458 ret = cpufreq_driver->set_boost(state);
39459 if (ret) {
39460 write_lock_irqsave(&cpufreq_driver_lock, flags);
39461- cpufreq_driver->boost_enabled = !state;
39462+ pax_open_kernel();
39463+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39464+ pax_close_kernel();
39465 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39466
39467 pr_err("%s: Cannot %s BOOST\n",
39468@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39469 cpufreq_driver = driver_data;
39470 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39471
39472- if (driver_data->setpolicy)
39473- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39474+ if (driver_data->setpolicy) {
39475+ pax_open_kernel();
39476+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39477+ pax_close_kernel();
39478+ }
39479
39480 if (cpufreq_boost_supported()) {
39481 /*
39482 * Check if driver provides function to enable boost -
39483 * if not, use cpufreq_boost_set_sw as default
39484 */
39485- if (!cpufreq_driver->set_boost)
39486- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39487+ if (!cpufreq_driver->set_boost) {
39488+ pax_open_kernel();
39489+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39490+ pax_close_kernel();
39491+ }
39492
39493 ret = cpufreq_sysfs_create_file(&boost.attr);
39494 if (ret) {
39495diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39496index 1b44496..b80ff5e 100644
39497--- a/drivers/cpufreq/cpufreq_governor.c
39498+++ b/drivers/cpufreq/cpufreq_governor.c
39499@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39500 struct dbs_data *dbs_data;
39501 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39502 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39503- struct od_ops *od_ops = NULL;
39504+ const struct od_ops *od_ops = NULL;
39505 struct od_dbs_tuners *od_tuners = NULL;
39506 struct cs_dbs_tuners *cs_tuners = NULL;
39507 struct cpu_dbs_common_info *cpu_cdbs;
39508@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39509
39510 if ((cdata->governor == GOV_CONSERVATIVE) &&
39511 (!policy->governor->initialized)) {
39512- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39513+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39514
39515 cpufreq_register_notifier(cs_ops->notifier_block,
39516 CPUFREQ_TRANSITION_NOTIFIER);
39517@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39518
39519 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39520 (policy->governor->initialized == 1)) {
39521- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39522+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39523
39524 cpufreq_unregister_notifier(cs_ops->notifier_block,
39525 CPUFREQ_TRANSITION_NOTIFIER);
39526diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39527index cc401d1..8197340 100644
39528--- a/drivers/cpufreq/cpufreq_governor.h
39529+++ b/drivers/cpufreq/cpufreq_governor.h
39530@@ -212,7 +212,7 @@ struct common_dbs_data {
39531 void (*exit)(struct dbs_data *dbs_data);
39532
39533 /* Governor specific ops, see below */
39534- void *gov_ops;
39535+ const void *gov_ops;
39536 };
39537
39538 /* Governor Per policy data */
39539@@ -232,7 +232,7 @@ struct od_ops {
39540 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39541 unsigned int freq_next, unsigned int relation);
39542 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39543-};
39544+} __no_const;
39545
39546 struct cs_ops {
39547 struct notifier_block *notifier_block;
39548diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39549index ad3f38f..8f086cd 100644
39550--- a/drivers/cpufreq/cpufreq_ondemand.c
39551+++ b/drivers/cpufreq/cpufreq_ondemand.c
39552@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39553
39554 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39555
39556-static struct od_ops od_ops = {
39557+static struct od_ops od_ops __read_only = {
39558 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39559 .powersave_bias_target = generic_powersave_bias_target,
39560 .freq_increase = dbs_freq_increase,
39561@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39562 (struct cpufreq_policy *, unsigned int, unsigned int),
39563 unsigned int powersave_bias)
39564 {
39565- od_ops.powersave_bias_target = f;
39566+ pax_open_kernel();
39567+ *(void **)&od_ops.powersave_bias_target = f;
39568+ pax_close_kernel();
39569 od_set_powersave_bias(powersave_bias);
39570 }
39571 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39572
39573 void od_unregister_powersave_bias_handler(void)
39574 {
39575- od_ops.powersave_bias_target = generic_powersave_bias_target;
39576+ pax_open_kernel();
39577+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39578+ pax_close_kernel();
39579 od_set_powersave_bias(0);
39580 }
39581 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39582diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39583index 6f9d27f..14385d1 100644
39584--- a/drivers/cpufreq/intel_pstate.c
39585+++ b/drivers/cpufreq/intel_pstate.c
39586@@ -134,10 +134,10 @@ struct pstate_funcs {
39587 struct cpu_defaults {
39588 struct pstate_adjust_policy pid_policy;
39589 struct pstate_funcs funcs;
39590-};
39591+} __do_const;
39592
39593 static struct pstate_adjust_policy pid_params;
39594-static struct pstate_funcs pstate_funcs;
39595+static struct pstate_funcs *pstate_funcs;
39596 static int hwp_active;
39597
39598 struct perf_limits {
39599@@ -722,18 +722,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39600
39601 cpu->pstate.current_pstate = pstate;
39602
39603- pstate_funcs.set(cpu, pstate);
39604+ pstate_funcs->set(cpu, pstate);
39605 }
39606
39607 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39608 {
39609- cpu->pstate.min_pstate = pstate_funcs.get_min();
39610- cpu->pstate.max_pstate = pstate_funcs.get_max();
39611- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39612- cpu->pstate.scaling = pstate_funcs.get_scaling();
39613+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39614+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39615+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39616+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39617
39618- if (pstate_funcs.get_vid)
39619- pstate_funcs.get_vid(cpu);
39620+ if (pstate_funcs->get_vid)
39621+ pstate_funcs->get_vid(cpu);
39622 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39623 }
39624
39625@@ -1057,15 +1057,15 @@ static unsigned int force_load;
39626
39627 static int intel_pstate_msrs_not_valid(void)
39628 {
39629- if (!pstate_funcs.get_max() ||
39630- !pstate_funcs.get_min() ||
39631- !pstate_funcs.get_turbo())
39632+ if (!pstate_funcs->get_max() ||
39633+ !pstate_funcs->get_min() ||
39634+ !pstate_funcs->get_turbo())
39635 return -ENODEV;
39636
39637 return 0;
39638 }
39639
39640-static void copy_pid_params(struct pstate_adjust_policy *policy)
39641+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39642 {
39643 pid_params.sample_rate_ms = policy->sample_rate_ms;
39644 pid_params.p_gain_pct = policy->p_gain_pct;
39645@@ -1077,12 +1077,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39646
39647 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39648 {
39649- pstate_funcs.get_max = funcs->get_max;
39650- pstate_funcs.get_min = funcs->get_min;
39651- pstate_funcs.get_turbo = funcs->get_turbo;
39652- pstate_funcs.get_scaling = funcs->get_scaling;
39653- pstate_funcs.set = funcs->set;
39654- pstate_funcs.get_vid = funcs->get_vid;
39655+ pstate_funcs = funcs;
39656 }
39657
39658 #if IS_ENABLED(CONFIG_ACPI)
39659diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39660index 529cfd9..0e28fff 100644
39661--- a/drivers/cpufreq/p4-clockmod.c
39662+++ b/drivers/cpufreq/p4-clockmod.c
39663@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39664 case 0x0F: /* Core Duo */
39665 case 0x16: /* Celeron Core */
39666 case 0x1C: /* Atom */
39667- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39668+ pax_open_kernel();
39669+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39670+ pax_close_kernel();
39671 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39672 case 0x0D: /* Pentium M (Dothan) */
39673- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39674+ pax_open_kernel();
39675+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39676+ pax_close_kernel();
39677 /* fall through */
39678 case 0x09: /* Pentium M (Banias) */
39679 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39680@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39681
39682 /* on P-4s, the TSC runs with constant frequency independent whether
39683 * throttling is active or not. */
39684- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39685+ pax_open_kernel();
39686+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39687+ pax_close_kernel();
39688
39689 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39690 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39691diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39692index 9bb42ba..b01b4a2 100644
39693--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39694+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39695@@ -18,14 +18,12 @@
39696 #include <asm/head.h>
39697 #include <asm/timer.h>
39698
39699-static struct cpufreq_driver *cpufreq_us3_driver;
39700-
39701 struct us3_freq_percpu_info {
39702 struct cpufreq_frequency_table table[4];
39703 };
39704
39705 /* Indexed by cpu number. */
39706-static struct us3_freq_percpu_info *us3_freq_table;
39707+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39708
39709 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39710 * in the Safari config register.
39711@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39712
39713 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39714 {
39715- if (cpufreq_us3_driver)
39716- us3_freq_target(policy, 0);
39717+ us3_freq_target(policy, 0);
39718
39719 return 0;
39720 }
39721
39722+static int __init us3_freq_init(void);
39723+static void __exit us3_freq_exit(void);
39724+
39725+static struct cpufreq_driver cpufreq_us3_driver = {
39726+ .init = us3_freq_cpu_init,
39727+ .verify = cpufreq_generic_frequency_table_verify,
39728+ .target_index = us3_freq_target,
39729+ .get = us3_freq_get,
39730+ .exit = us3_freq_cpu_exit,
39731+ .name = "UltraSPARC-III",
39732+
39733+};
39734+
39735 static int __init us3_freq_init(void)
39736 {
39737 unsigned long manuf, impl, ver;
39738- int ret;
39739
39740 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39741 return -ENODEV;
39742@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39743 (impl == CHEETAH_IMPL ||
39744 impl == CHEETAH_PLUS_IMPL ||
39745 impl == JAGUAR_IMPL ||
39746- impl == PANTHER_IMPL)) {
39747- struct cpufreq_driver *driver;
39748-
39749- ret = -ENOMEM;
39750- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39751- if (!driver)
39752- goto err_out;
39753-
39754- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39755- GFP_KERNEL);
39756- if (!us3_freq_table)
39757- goto err_out;
39758-
39759- driver->init = us3_freq_cpu_init;
39760- driver->verify = cpufreq_generic_frequency_table_verify;
39761- driver->target_index = us3_freq_target;
39762- driver->get = us3_freq_get;
39763- driver->exit = us3_freq_cpu_exit;
39764- strcpy(driver->name, "UltraSPARC-III");
39765-
39766- cpufreq_us3_driver = driver;
39767- ret = cpufreq_register_driver(driver);
39768- if (ret)
39769- goto err_out;
39770-
39771- return 0;
39772-
39773-err_out:
39774- if (driver) {
39775- kfree(driver);
39776- cpufreq_us3_driver = NULL;
39777- }
39778- kfree(us3_freq_table);
39779- us3_freq_table = NULL;
39780- return ret;
39781- }
39782+ impl == PANTHER_IMPL))
39783+ return cpufreq_register_driver(&cpufreq_us3_driver);
39784
39785 return -ENODEV;
39786 }
39787
39788 static void __exit us3_freq_exit(void)
39789 {
39790- if (cpufreq_us3_driver) {
39791- cpufreq_unregister_driver(cpufreq_us3_driver);
39792- kfree(cpufreq_us3_driver);
39793- cpufreq_us3_driver = NULL;
39794- kfree(us3_freq_table);
39795- us3_freq_table = NULL;
39796- }
39797+ cpufreq_unregister_driver(&cpufreq_us3_driver);
39798 }
39799
39800 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39801diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39802index 7d4a315..21bb886 100644
39803--- a/drivers/cpufreq/speedstep-centrino.c
39804+++ b/drivers/cpufreq/speedstep-centrino.c
39805@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39806 !cpu_has(cpu, X86_FEATURE_EST))
39807 return -ENODEV;
39808
39809- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39810- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39811+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39812+ pax_open_kernel();
39813+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39814+ pax_close_kernel();
39815+ }
39816
39817 if (policy->cpu != 0)
39818 return -ENODEV;
39819diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39820index 5db1478..e90e25e 100644
39821--- a/drivers/cpuidle/driver.c
39822+++ b/drivers/cpuidle/driver.c
39823@@ -193,7 +193,7 @@ static int poll_idle(struct cpuidle_device *dev,
39824
39825 static void poll_idle_init(struct cpuidle_driver *drv)
39826 {
39827- struct cpuidle_state *state = &drv->states[0];
39828+ cpuidle_state_no_const *state = &drv->states[0];
39829
39830 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39831 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39832diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39833index fb9f511..213e6cc 100644
39834--- a/drivers/cpuidle/governor.c
39835+++ b/drivers/cpuidle/governor.c
39836@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39837 mutex_lock(&cpuidle_lock);
39838 if (__cpuidle_find_governor(gov->name) == NULL) {
39839 ret = 0;
39840- list_add_tail(&gov->governor_list, &cpuidle_governors);
39841+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39842 if (!cpuidle_curr_governor ||
39843 cpuidle_curr_governor->rating < gov->rating)
39844 cpuidle_switch_governor(gov);
39845diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39846index 832a2c3..1794080 100644
39847--- a/drivers/cpuidle/sysfs.c
39848+++ b/drivers/cpuidle/sysfs.c
39849@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39850 NULL
39851 };
39852
39853-static struct attribute_group cpuidle_attr_group = {
39854+static attribute_group_no_const cpuidle_attr_group = {
39855 .attrs = cpuidle_default_attrs,
39856 .name = "cpuidle",
39857 };
39858diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39859index 8d2a772..33826c9 100644
39860--- a/drivers/crypto/hifn_795x.c
39861+++ b/drivers/crypto/hifn_795x.c
39862@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39863 MODULE_PARM_DESC(hifn_pll_ref,
39864 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39865
39866-static atomic_t hifn_dev_number;
39867+static atomic_unchecked_t hifn_dev_number;
39868
39869 #define ACRYPTO_OP_DECRYPT 0
39870 #define ACRYPTO_OP_ENCRYPT 1
39871@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39872 goto err_out_disable_pci_device;
39873
39874 snprintf(name, sizeof(name), "hifn%d",
39875- atomic_inc_return(&hifn_dev_number)-1);
39876+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
39877
39878 err = pci_request_regions(pdev, name);
39879 if (err)
39880diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39881index ca1b362..01cae6a 100644
39882--- a/drivers/devfreq/devfreq.c
39883+++ b/drivers/devfreq/devfreq.c
39884@@ -672,7 +672,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39885 goto err_out;
39886 }
39887
39888- list_add(&governor->node, &devfreq_governor_list);
39889+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39890
39891 list_for_each_entry(devfreq, &devfreq_list, node) {
39892 int ret = 0;
39893@@ -760,7 +760,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39894 }
39895 }
39896
39897- list_del(&governor->node);
39898+ pax_list_del((struct list_head *)&governor->node);
39899 err_out:
39900 mutex_unlock(&devfreq_list_lock);
39901
39902diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39903index 10fcaba..326f709 100644
39904--- a/drivers/dma/sh/shdma-base.c
39905+++ b/drivers/dma/sh/shdma-base.c
39906@@ -227,8 +227,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39907 schan->slave_id = -EINVAL;
39908 }
39909
39910- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39911- sdev->desc_size, GFP_KERNEL);
39912+ schan->desc = kcalloc(sdev->desc_size,
39913+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39914 if (!schan->desc) {
39915 ret = -ENOMEM;
39916 goto edescalloc;
39917diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39918index 11707df..2ea96f7 100644
39919--- a/drivers/dma/sh/shdmac.c
39920+++ b/drivers/dma/sh/shdmac.c
39921@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39922 return ret;
39923 }
39924
39925-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39926+static struct notifier_block sh_dmae_nmi_notifier = {
39927 .notifier_call = sh_dmae_nmi_handler,
39928
39929 /* Run before NMI debug handler and KGDB */
39930diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39931index 592af5f..bb1d583 100644
39932--- a/drivers/edac/edac_device.c
39933+++ b/drivers/edac/edac_device.c
39934@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39935 */
39936 int edac_device_alloc_index(void)
39937 {
39938- static atomic_t device_indexes = ATOMIC_INIT(0);
39939+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39940
39941- return atomic_inc_return(&device_indexes) - 1;
39942+ return atomic_inc_return_unchecked(&device_indexes) - 1;
39943 }
39944 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39945
39946diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39947index 112d63a..5443a61 100644
39948--- a/drivers/edac/edac_mc_sysfs.c
39949+++ b/drivers/edac/edac_mc_sysfs.c
39950@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39951 struct dev_ch_attribute {
39952 struct device_attribute attr;
39953 int channel;
39954-};
39955+} __do_const;
39956
39957 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39958 static struct dev_ch_attribute dev_attr_legacy_##_name = \
39959diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39960index 2cf44b4d..6dd2dc7 100644
39961--- a/drivers/edac/edac_pci.c
39962+++ b/drivers/edac/edac_pci.c
39963@@ -29,7 +29,7 @@
39964
39965 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39966 static LIST_HEAD(edac_pci_list);
39967-static atomic_t pci_indexes = ATOMIC_INIT(0);
39968+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39969
39970 /*
39971 * edac_pci_alloc_ctl_info
39972@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39973 */
39974 int edac_pci_alloc_index(void)
39975 {
39976- return atomic_inc_return(&pci_indexes) - 1;
39977+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
39978 }
39979 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39980
39981diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39982index 24d877f..4e30133 100644
39983--- a/drivers/edac/edac_pci_sysfs.c
39984+++ b/drivers/edac/edac_pci_sysfs.c
39985@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39986 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39987 static int edac_pci_poll_msec = 1000; /* one second workq period */
39988
39989-static atomic_t pci_parity_count = ATOMIC_INIT(0);
39990-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39991+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39992+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39993
39994 static struct kobject *edac_pci_top_main_kobj;
39995 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39996@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
39997 void *value;
39998 ssize_t(*show) (void *, char *);
39999 ssize_t(*store) (void *, const char *, size_t);
40000-};
40001+} __do_const;
40002
40003 /* Set of show/store abstract level functions for PCI Parity object */
40004 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40005@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40006 edac_printk(KERN_CRIT, EDAC_PCI,
40007 "Signaled System Error on %s\n",
40008 pci_name(dev));
40009- atomic_inc(&pci_nonparity_count);
40010+ atomic_inc_unchecked(&pci_nonparity_count);
40011 }
40012
40013 if (status & (PCI_STATUS_PARITY)) {
40014@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40015 "Master Data Parity Error on %s\n",
40016 pci_name(dev));
40017
40018- atomic_inc(&pci_parity_count);
40019+ atomic_inc_unchecked(&pci_parity_count);
40020 }
40021
40022 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40023@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40024 "Detected Parity Error on %s\n",
40025 pci_name(dev));
40026
40027- atomic_inc(&pci_parity_count);
40028+ atomic_inc_unchecked(&pci_parity_count);
40029 }
40030 }
40031
40032@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40033 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40034 "Signaled System Error on %s\n",
40035 pci_name(dev));
40036- atomic_inc(&pci_nonparity_count);
40037+ atomic_inc_unchecked(&pci_nonparity_count);
40038 }
40039
40040 if (status & (PCI_STATUS_PARITY)) {
40041@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40042 "Master Data Parity Error on "
40043 "%s\n", pci_name(dev));
40044
40045- atomic_inc(&pci_parity_count);
40046+ atomic_inc_unchecked(&pci_parity_count);
40047 }
40048
40049 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40050@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40051 "Detected Parity Error on %s\n",
40052 pci_name(dev));
40053
40054- atomic_inc(&pci_parity_count);
40055+ atomic_inc_unchecked(&pci_parity_count);
40056 }
40057 }
40058 }
40059@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40060 if (!check_pci_errors)
40061 return;
40062
40063- before_count = atomic_read(&pci_parity_count);
40064+ before_count = atomic_read_unchecked(&pci_parity_count);
40065
40066 /* scan all PCI devices looking for a Parity Error on devices and
40067 * bridges.
40068@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40069 /* Only if operator has selected panic on PCI Error */
40070 if (edac_pci_get_panic_on_pe()) {
40071 /* If the count is different 'after' from 'before' */
40072- if (before_count != atomic_read(&pci_parity_count))
40073+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40074 panic("EDAC: PCI Parity Error");
40075 }
40076 }
40077diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40078index c2359a1..8bd119d 100644
40079--- a/drivers/edac/mce_amd.h
40080+++ b/drivers/edac/mce_amd.h
40081@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40082 bool (*mc0_mce)(u16, u8);
40083 bool (*mc1_mce)(u16, u8);
40084 bool (*mc2_mce)(u16, u8);
40085-};
40086+} __no_const;
40087
40088 void amd_report_gart_errors(bool);
40089 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40090diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40091index 57ea7f4..af06b76 100644
40092--- a/drivers/firewire/core-card.c
40093+++ b/drivers/firewire/core-card.c
40094@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40095 const struct fw_card_driver *driver,
40096 struct device *device)
40097 {
40098- static atomic_t index = ATOMIC_INIT(-1);
40099+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40100
40101- card->index = atomic_inc_return(&index);
40102+ card->index = atomic_inc_return_unchecked(&index);
40103 card->driver = driver;
40104 card->device = device;
40105 card->current_tlabel = 0;
40106@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40107
40108 void fw_core_remove_card(struct fw_card *card)
40109 {
40110- struct fw_card_driver dummy_driver = dummy_driver_template;
40111+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40112
40113 card->driver->update_phy_reg(card, 4,
40114 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40115diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40116index f9e3aee..269dbdb 100644
40117--- a/drivers/firewire/core-device.c
40118+++ b/drivers/firewire/core-device.c
40119@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40120 struct config_rom_attribute {
40121 struct device_attribute attr;
40122 u32 key;
40123-};
40124+} __do_const;
40125
40126 static ssize_t show_immediate(struct device *dev,
40127 struct device_attribute *dattr, char *buf)
40128diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40129index d6a09b9..18e90dd 100644
40130--- a/drivers/firewire/core-transaction.c
40131+++ b/drivers/firewire/core-transaction.c
40132@@ -38,6 +38,7 @@
40133 #include <linux/timer.h>
40134 #include <linux/types.h>
40135 #include <linux/workqueue.h>
40136+#include <linux/sched.h>
40137
40138 #include <asm/byteorder.h>
40139
40140diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40141index e1480ff6..1a429bd 100644
40142--- a/drivers/firewire/core.h
40143+++ b/drivers/firewire/core.h
40144@@ -111,6 +111,7 @@ struct fw_card_driver {
40145
40146 int (*stop_iso)(struct fw_iso_context *ctx);
40147 };
40148+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40149
40150 void fw_card_initialize(struct fw_card *card,
40151 const struct fw_card_driver *driver, struct device *device);
40152diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40153index f51d376..b118e40 100644
40154--- a/drivers/firewire/ohci.c
40155+++ b/drivers/firewire/ohci.c
40156@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40157 be32_to_cpu(ohci->next_header));
40158 }
40159
40160+#ifndef CONFIG_GRKERNSEC
40161 if (param_remote_dma) {
40162 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40163 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40164 }
40165+#endif
40166
40167 spin_unlock_irq(&ohci->lock);
40168
40169@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40170 unsigned long flags;
40171 int n, ret = 0;
40172
40173+#ifndef CONFIG_GRKERNSEC
40174 if (param_remote_dma)
40175 return 0;
40176+#endif
40177
40178 /*
40179 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40180diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40181index 94a58a0..f5eba42 100644
40182--- a/drivers/firmware/dmi-id.c
40183+++ b/drivers/firmware/dmi-id.c
40184@@ -16,7 +16,7 @@
40185 struct dmi_device_attribute{
40186 struct device_attribute dev_attr;
40187 int field;
40188-};
40189+} __do_const;
40190 #define to_dmi_dev_attr(_dev_attr) \
40191 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40192
40193diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40194index d425374..1da1716 100644
40195--- a/drivers/firmware/efi/cper.c
40196+++ b/drivers/firmware/efi/cper.c
40197@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40198 */
40199 u64 cper_next_record_id(void)
40200 {
40201- static atomic64_t seq;
40202+ static atomic64_unchecked_t seq;
40203
40204- if (!atomic64_read(&seq))
40205- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40206+ if (!atomic64_read_unchecked(&seq))
40207+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40208
40209- return atomic64_inc_return(&seq);
40210+ return atomic64_inc_return_unchecked(&seq);
40211 }
40212 EXPORT_SYMBOL_GPL(cper_next_record_id);
40213
40214diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40215index 63226e9..302716e 100644
40216--- a/drivers/firmware/efi/efi.c
40217+++ b/drivers/firmware/efi/efi.c
40218@@ -164,14 +164,16 @@ static struct attribute_group efi_subsys_attr_group = {
40219 };
40220
40221 static struct efivars generic_efivars;
40222-static struct efivar_operations generic_ops;
40223+static efivar_operations_no_const generic_ops __read_only;
40224
40225 static int generic_ops_register(void)
40226 {
40227- generic_ops.get_variable = efi.get_variable;
40228- generic_ops.set_variable = efi.set_variable;
40229- generic_ops.get_next_variable = efi.get_next_variable;
40230- generic_ops.query_variable_store = efi_query_variable_store;
40231+ pax_open_kernel();
40232+ *(void **)&generic_ops.get_variable = efi.get_variable;
40233+ *(void **)&generic_ops.set_variable = efi.set_variable;
40234+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40235+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40236+ pax_close_kernel();
40237
40238 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40239 }
40240diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40241index 7b2e049..a253334 100644
40242--- a/drivers/firmware/efi/efivars.c
40243+++ b/drivers/firmware/efi/efivars.c
40244@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40245 static int
40246 create_efivars_bin_attributes(void)
40247 {
40248- struct bin_attribute *attr;
40249+ bin_attribute_no_const *attr;
40250 int error;
40251
40252 /* new_var */
40253diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40254index 5c55227..97f4978 100644
40255--- a/drivers/firmware/efi/runtime-map.c
40256+++ b/drivers/firmware/efi/runtime-map.c
40257@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40258 kfree(entry);
40259 }
40260
40261-static struct kobj_type __refdata map_ktype = {
40262+static const struct kobj_type __refconst map_ktype = {
40263 .sysfs_ops = &map_attr_ops,
40264 .default_attrs = def_attrs,
40265 .release = map_release,
40266diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40267index f1ab05e..ab51228 100644
40268--- a/drivers/firmware/google/gsmi.c
40269+++ b/drivers/firmware/google/gsmi.c
40270@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40271 return local_hash_64(input, 32);
40272 }
40273
40274-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40275+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40276 {
40277 .ident = "Google Board",
40278 .matches = {
40279diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40280index 2f569aa..26e4f39 100644
40281--- a/drivers/firmware/google/memconsole.c
40282+++ b/drivers/firmware/google/memconsole.c
40283@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40284 return false;
40285 }
40286
40287-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40288+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40289 {
40290 .ident = "Google Board",
40291 .matches = {
40292@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40293 if (!found_memconsole())
40294 return -ENODEV;
40295
40296- memconsole_bin_attr.size = memconsole_length;
40297+ pax_open_kernel();
40298+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40299+ pax_close_kernel();
40300+
40301 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40302 }
40303
40304diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40305index cc016c61..d35279e 100644
40306--- a/drivers/firmware/memmap.c
40307+++ b/drivers/firmware/memmap.c
40308@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40309 kfree(entry);
40310 }
40311
40312-static struct kobj_type __refdata memmap_ktype = {
40313+static const struct kobj_type __refconst memmap_ktype = {
40314 .release = release_firmware_map_entry,
40315 .sysfs_ops = &memmap_attr_ops,
40316 .default_attrs = def_attrs,
40317diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40318index 3cfcfc6..09d6f117 100644
40319--- a/drivers/gpio/gpio-em.c
40320+++ b/drivers/gpio/gpio-em.c
40321@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40322 struct em_gio_priv *p;
40323 struct resource *io[2], *irq[2];
40324 struct gpio_chip *gpio_chip;
40325- struct irq_chip *irq_chip;
40326+ irq_chip_no_const *irq_chip;
40327 const char *name = dev_name(&pdev->dev);
40328 int ret;
40329
40330diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40331index 4ba7ed5..1536b5d 100644
40332--- a/drivers/gpio/gpio-ich.c
40333+++ b/drivers/gpio/gpio-ich.c
40334@@ -94,7 +94,7 @@ struct ichx_desc {
40335 * this option allows driver caching written output values
40336 */
40337 bool use_outlvl_cache;
40338-};
40339+} __do_const;
40340
40341 static struct {
40342 spinlock_t lock;
40343diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40344index b232397..ce8c4dc 100644
40345--- a/drivers/gpio/gpio-omap.c
40346+++ b/drivers/gpio/gpio-omap.c
40347@@ -1054,7 +1054,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
40348 dev_err(bank->dev, "Could not get gpio dbck\n");
40349 }
40350
40351-static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
40352+static int omap_gpio_chip_init(struct gpio_bank *bank, irq_chip_no_const *irqc)
40353 {
40354 static int gpio;
40355 int irq_base = 0;
40356@@ -1137,7 +1137,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40357 const struct omap_gpio_platform_data *pdata;
40358 struct resource *res;
40359 struct gpio_bank *bank;
40360- struct irq_chip *irqc;
40361+ irq_chip_no_const *irqc;
40362 int ret;
40363
40364 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40365diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40366index 1e14a6c..0442450 100644
40367--- a/drivers/gpio/gpio-rcar.c
40368+++ b/drivers/gpio/gpio-rcar.c
40369@@ -379,7 +379,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40370 struct gpio_rcar_priv *p;
40371 struct resource *io, *irq;
40372 struct gpio_chip *gpio_chip;
40373- struct irq_chip *irq_chip;
40374+ irq_chip_no_const *irq_chip;
40375 struct device *dev = &pdev->dev;
40376 const char *name = dev_name(dev);
40377 int ret;
40378diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40379index c1caa45..f0f97d2 100644
40380--- a/drivers/gpio/gpio-vr41xx.c
40381+++ b/drivers/gpio/gpio-vr41xx.c
40382@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40383 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40384 maskl, pendl, maskh, pendh);
40385
40386- atomic_inc(&irq_err_count);
40387+ atomic_inc_unchecked(&irq_err_count);
40388
40389 return -EINVAL;
40390 }
40391diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40392index 6bc612b..3932464 100644
40393--- a/drivers/gpio/gpiolib.c
40394+++ b/drivers/gpio/gpiolib.c
40395@@ -558,8 +558,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40396 }
40397
40398 if (gpiochip->irqchip) {
40399- gpiochip->irqchip->irq_request_resources = NULL;
40400- gpiochip->irqchip->irq_release_resources = NULL;
40401+ pax_open_kernel();
40402+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40403+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40404+ pax_close_kernel();
40405 gpiochip->irqchip = NULL;
40406 }
40407 }
40408@@ -625,8 +627,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40409 gpiochip->irqchip = NULL;
40410 return -EINVAL;
40411 }
40412- irqchip->irq_request_resources = gpiochip_irq_reqres;
40413- irqchip->irq_release_resources = gpiochip_irq_relres;
40414+
40415+ pax_open_kernel();
40416+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40417+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40418+ pax_close_kernel();
40419
40420 /*
40421 * Prepare the mapping since the irqchip shall be orthogonal to
40422diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40423index 488f51d..301d462 100644
40424--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40425+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40426@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40427 enum cache_policy alternate_policy,
40428 void __user *alternate_aperture_base,
40429 uint64_t alternate_aperture_size);
40430-};
40431+} __no_const;
40432
40433 /**
40434 * struct device_queue_manager
40435diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40436index 5940531..a75b0e5 100644
40437--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40438+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40439@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40440
40441 void (*submit_packet)(struct kernel_queue *kq);
40442 void (*rollback_packet)(struct kernel_queue *kq);
40443-};
40444+} __no_const;
40445
40446 struct kernel_queue {
40447 struct kernel_queue_ops ops;
40448diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40449index 9b23525..65f4110 100644
40450--- a/drivers/gpu/drm/drm_context.c
40451+++ b/drivers/gpu/drm/drm_context.c
40452@@ -53,6 +53,9 @@ struct drm_ctx_list {
40453 */
40454 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40455 {
40456+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40457+ return;
40458+
40459 mutex_lock(&dev->struct_mutex);
40460 idr_remove(&dev->ctx_idr, ctx_handle);
40461 mutex_unlock(&dev->struct_mutex);
40462@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40463 */
40464 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40465 {
40466+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40467+ return -EINVAL;
40468+
40469 idr_init(&dev->ctx_idr);
40470 return 0;
40471 }
40472@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40473 */
40474 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40475 {
40476+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40477+ return;
40478+
40479 mutex_lock(&dev->struct_mutex);
40480 idr_destroy(&dev->ctx_idr);
40481 mutex_unlock(&dev->struct_mutex);
40482@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40483 {
40484 struct drm_ctx_list *pos, *tmp;
40485
40486+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40487+ return;
40488+
40489 mutex_lock(&dev->ctxlist_mutex);
40490
40491 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40492 if (pos->tag == file &&
40493- pos->handle != DRM_KERNEL_CONTEXT) {
40494+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40495 if (dev->driver->context_dtor)
40496 dev->driver->context_dtor(dev, pos->handle);
40497
40498@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40499 struct drm_local_map *map;
40500 struct drm_map_list *_entry;
40501
40502+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40503+ return -EINVAL;
40504+
40505 mutex_lock(&dev->struct_mutex);
40506
40507 map = idr_find(&dev->ctx_idr, request->ctx_id);
40508@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40509 struct drm_local_map *map = NULL;
40510 struct drm_map_list *r_list = NULL;
40511
40512+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40513+ return -EINVAL;
40514+
40515 mutex_lock(&dev->struct_mutex);
40516 list_for_each_entry(r_list, &dev->maplist, head) {
40517 if (r_list->map
40518@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40519 {
40520 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40521
40522- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40523+ if (file_priv->master->lock.hw_lock == NULL) {
40524+ DRM_ERROR(
40525+ "Device has been unregistered. Hard exit. Process %d\n",
40526+ task_pid_nr(current));
40527+ send_sig(SIGTERM, current, 0);
40528+ return -EPERM;
40529+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40530 DRM_ERROR("Lock isn't held after context switch\n");
40531 }
40532
40533@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40534 struct drm_ctx ctx;
40535 int i;
40536
40537+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40538+ return -EINVAL;
40539+
40540 if (res->count >= DRM_RESERVED_CONTEXTS) {
40541 memset(&ctx, 0, sizeof(ctx));
40542 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40543@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40544 struct drm_ctx_list *ctx_entry;
40545 struct drm_ctx *ctx = data;
40546
40547+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40548+ return -EINVAL;
40549+
40550 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40551- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40552+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40553 /* Skip kernel's context and get a new one. */
40554 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40555 }
40556@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40557 {
40558 struct drm_ctx *ctx = data;
40559
40560+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40561+ return -EINVAL;
40562+
40563 /* This is 0, because we don't handle any context flags */
40564 ctx->flags = 0;
40565
40566@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40567 {
40568 struct drm_ctx *ctx = data;
40569
40570+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40571+ return -EINVAL;
40572+
40573 DRM_DEBUG("%d\n", ctx->handle);
40574 return drm_context_switch(dev, dev->last_context, ctx->handle);
40575 }
40576@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
40577 {
40578 struct drm_ctx *ctx = data;
40579
40580+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40581+ return -EINVAL;
40582+
40583 DRM_DEBUG("%d\n", ctx->handle);
40584 drm_context_switch_complete(dev, file_priv, ctx->handle);
40585
40586@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
40587 {
40588 struct drm_ctx *ctx = data;
40589
40590+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40591+ return -EINVAL;
40592+
40593 DRM_DEBUG("%d\n", ctx->handle);
40594- if (ctx->handle != DRM_KERNEL_CONTEXT) {
40595+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
40596 if (dev->driver->context_dtor)
40597 dev->driver->context_dtor(dev, ctx->handle);
40598 drm_legacy_ctxbitmap_free(dev, ctx->handle);
40599diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40600index 800a025..c88f1a4 100644
40601--- a/drivers/gpu/drm/drm_crtc.c
40602+++ b/drivers/gpu/drm/drm_crtc.c
40603@@ -4179,7 +4179,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40604 goto done;
40605 }
40606
40607- if (copy_to_user(&enum_ptr[copied].name,
40608+ if (copy_to_user(enum_ptr[copied].name,
40609 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40610 ret = -EFAULT;
40611 goto done;
40612diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40613index 48f7359..8c3b594 100644
40614--- a/drivers/gpu/drm/drm_drv.c
40615+++ b/drivers/gpu/drm/drm_drv.c
40616@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40617
40618 drm_device_set_unplugged(dev);
40619
40620- if (dev->open_count == 0) {
40621+ if (local_read(&dev->open_count) == 0) {
40622 drm_put_dev(dev);
40623 }
40624 mutex_unlock(&drm_global_mutex);
40625@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
40626 if (drm_ht_create(&dev->map_hash, 12))
40627 goto err_minors;
40628
40629- ret = drm_legacy_ctxbitmap_init(dev);
40630- if (ret) {
40631- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
40632- goto err_ht;
40633+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
40634+ ret = drm_legacy_ctxbitmap_init(dev);
40635+ if (ret) {
40636+ DRM_ERROR(
40637+ "Cannot allocate memory for context bitmap.\n");
40638+ goto err_ht;
40639+ }
40640 }
40641
40642 if (drm_core_check_feature(dev, DRIVER_GEM)) {
40643diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40644index 076dd60..e4a4ba7 100644
40645--- a/drivers/gpu/drm/drm_fops.c
40646+++ b/drivers/gpu/drm/drm_fops.c
40647@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40648 return PTR_ERR(minor);
40649
40650 dev = minor->dev;
40651- if (!dev->open_count++)
40652+ if (local_inc_return(&dev->open_count) == 1)
40653 need_setup = 1;
40654
40655 /* share address_space across all char-devs of a single device */
40656@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40657 return 0;
40658
40659 err_undo:
40660- dev->open_count--;
40661+ local_dec(&dev->open_count);
40662 drm_minor_release(minor);
40663 return retcode;
40664 }
40665@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40666
40667 mutex_lock(&drm_global_mutex);
40668
40669- DRM_DEBUG("open_count = %d\n", dev->open_count);
40670+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40671
40672 mutex_lock(&dev->struct_mutex);
40673 list_del(&file_priv->lhead);
40674@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40675 * Begin inline drm_release
40676 */
40677
40678- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40679+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40680 task_pid_nr(current),
40681 (long)old_encode_dev(file_priv->minor->kdev->devt),
40682- dev->open_count);
40683+ local_read(&dev->open_count));
40684
40685 /* Release any auth tokens that might point to this file_priv,
40686 (do that under the drm_global_mutex) */
40687@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40688 * End inline drm_release
40689 */
40690
40691- if (!--dev->open_count) {
40692+ if (local_dec_and_test(&dev->open_count)) {
40693 retcode = drm_lastclose(dev);
40694 if (drm_device_is_unplugged(dev))
40695 drm_put_dev(dev);
40696diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40697index 3d2e91c..d31c4c9 100644
40698--- a/drivers/gpu/drm/drm_global.c
40699+++ b/drivers/gpu/drm/drm_global.c
40700@@ -36,7 +36,7 @@
40701 struct drm_global_item {
40702 struct mutex mutex;
40703 void *object;
40704- int refcount;
40705+ atomic_t refcount;
40706 };
40707
40708 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40709@@ -49,7 +49,7 @@ void drm_global_init(void)
40710 struct drm_global_item *item = &glob[i];
40711 mutex_init(&item->mutex);
40712 item->object = NULL;
40713- item->refcount = 0;
40714+ atomic_set(&item->refcount, 0);
40715 }
40716 }
40717
40718@@ -59,7 +59,7 @@ void drm_global_release(void)
40719 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40720 struct drm_global_item *item = &glob[i];
40721 BUG_ON(item->object != NULL);
40722- BUG_ON(item->refcount != 0);
40723+ BUG_ON(atomic_read(&item->refcount) != 0);
40724 }
40725 }
40726
40727@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40728 struct drm_global_item *item = &glob[ref->global_type];
40729
40730 mutex_lock(&item->mutex);
40731- if (item->refcount == 0) {
40732+ if (atomic_read(&item->refcount) == 0) {
40733 item->object = kzalloc(ref->size, GFP_KERNEL);
40734 if (unlikely(item->object == NULL)) {
40735 ret = -ENOMEM;
40736@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40737 goto out_err;
40738
40739 }
40740- ++item->refcount;
40741+ atomic_inc(&item->refcount);
40742 ref->object = item->object;
40743 mutex_unlock(&item->mutex);
40744 return 0;
40745@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40746 struct drm_global_item *item = &glob[ref->global_type];
40747
40748 mutex_lock(&item->mutex);
40749- BUG_ON(item->refcount == 0);
40750+ BUG_ON(atomic_read(&item->refcount) == 0);
40751 BUG_ON(ref->object != item->object);
40752- if (--item->refcount == 0) {
40753+ if (atomic_dec_and_test(&item->refcount)) {
40754 ref->release(ref);
40755 item->object = NULL;
40756 }
40757diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40758index cbb4fc0..5c756cb9 100644
40759--- a/drivers/gpu/drm/drm_info.c
40760+++ b/drivers/gpu/drm/drm_info.c
40761@@ -77,10 +77,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40762 struct drm_local_map *map;
40763 struct drm_map_list *r_list;
40764
40765- /* Hardcoded from _DRM_FRAME_BUFFER,
40766- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40767- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40768- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40769+ static const char * const types[] = {
40770+ [_DRM_FRAME_BUFFER] = "FB",
40771+ [_DRM_REGISTERS] = "REG",
40772+ [_DRM_SHM] = "SHM",
40773+ [_DRM_AGP] = "AGP",
40774+ [_DRM_SCATTER_GATHER] = "SG",
40775+ [_DRM_CONSISTENT] = "PCI"};
40776 const char *type;
40777 int i;
40778
40779@@ -91,7 +94,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40780 map = r_list->map;
40781 if (!map)
40782 continue;
40783- if (map->type < 0 || map->type > 5)
40784+ if (map->type >= ARRAY_SIZE(types))
40785 type = "??";
40786 else
40787 type = types[map->type];
40788diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40789index 9cfcd0a..7142a7f 100644
40790--- a/drivers/gpu/drm/drm_ioc32.c
40791+++ b/drivers/gpu/drm/drm_ioc32.c
40792@@ -459,7 +459,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40793 request = compat_alloc_user_space(nbytes);
40794 if (!access_ok(VERIFY_WRITE, request, nbytes))
40795 return -EFAULT;
40796- list = (struct drm_buf_desc *) (request + 1);
40797+ list = (struct drm_buf_desc __user *) (request + 1);
40798
40799 if (__put_user(count, &request->count)
40800 || __put_user(list, &request->list))
40801@@ -520,7 +520,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40802 request = compat_alloc_user_space(nbytes);
40803 if (!access_ok(VERIFY_WRITE, request, nbytes))
40804 return -EFAULT;
40805- list = (struct drm_buf_pub *) (request + 1);
40806+ list = (struct drm_buf_pub __user *) (request + 1);
40807
40808 if (__put_user(count, &request->count)
40809 || __put_user(list, &request->list))
40810@@ -1075,7 +1075,7 @@ static int compat_drm_mode_addfb2(struct file *file, unsigned int cmd,
40811 return 0;
40812 }
40813
40814-static drm_ioctl_compat_t *drm_compat_ioctls[] = {
40815+static drm_ioctl_compat_t drm_compat_ioctls[] = {
40816 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40817 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40818 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40819@@ -1122,7 +1122,6 @@ static drm_ioctl_compat_t *drm_compat_ioctls[] = {
40820 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40821 {
40822 unsigned int nr = DRM_IOCTL_NR(cmd);
40823- drm_ioctl_compat_t *fn;
40824 int ret;
40825
40826 /* Assume that ioctls without an explicit compat routine will just
40827@@ -1132,10 +1131,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40828 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40829 return drm_ioctl(filp, cmd, arg);
40830
40831- fn = drm_compat_ioctls[nr];
40832-
40833- if (fn != NULL)
40834- ret = (*fn) (filp, cmd, arg);
40835+ if (drm_compat_ioctls[nr] != NULL)
40836+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40837 else
40838 ret = drm_ioctl(filp, cmd, arg);
40839
40840diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40841index 266dcd6..d0194d9 100644
40842--- a/drivers/gpu/drm/drm_ioctl.c
40843+++ b/drivers/gpu/drm/drm_ioctl.c
40844@@ -663,7 +663,7 @@ long drm_ioctl(struct file *filp,
40845 struct drm_file *file_priv = filp->private_data;
40846 struct drm_device *dev;
40847 const struct drm_ioctl_desc *ioctl = NULL;
40848- drm_ioctl_t *func;
40849+ drm_ioctl_no_const_t func;
40850 unsigned int nr = DRM_IOCTL_NR(cmd);
40851 int retcode = -EINVAL;
40852 char stack_kdata[128];
40853diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
40854index f861361..b61d4c7 100644
40855--- a/drivers/gpu/drm/drm_lock.c
40856+++ b/drivers/gpu/drm/drm_lock.c
40857@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
40858 struct drm_master *master = file_priv->master;
40859 int ret = 0;
40860
40861+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40862+ return -EINVAL;
40863+
40864 ++file_priv->lock_count;
40865
40866- if (lock->context == DRM_KERNEL_CONTEXT) {
40867+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
40868 DRM_ERROR("Process %d using kernel context %d\n",
40869 task_pid_nr(current), lock->context);
40870 return -EINVAL;
40871@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
40872 struct drm_lock *lock = data;
40873 struct drm_master *master = file_priv->master;
40874
40875- if (lock->context == DRM_KERNEL_CONTEXT) {
40876+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40877+ return -EINVAL;
40878+
40879+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
40880 DRM_ERROR("Process %d using kernel context %d\n",
40881 task_pid_nr(current), lock->context);
40882 return -EINVAL;
40883 }
40884
40885+ if (!master->lock.hw_lock) {
40886+ DRM_ERROR(
40887+ "Device has been unregistered. Hard exit. Process %d\n",
40888+ task_pid_nr(current));
40889+ send_sig(SIGTERM, current, 0);
40890+ return -EPERM;
40891+ }
40892+
40893 if (drm_legacy_lock_free(&master->lock, lock->context)) {
40894 /* FIXME: Should really bail out here. */
40895 }
40896diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40897index d4813e0..6c1ab4d 100644
40898--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40899+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40900@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
40901 u32 pipeconf_reg = PIPEACONF;
40902 u32 dspcntr_reg = DSPACNTR;
40903
40904- u32 pipeconf = dev_priv->pipeconf[pipe];
40905- u32 dspcntr = dev_priv->dspcntr[pipe];
40906+ u32 pipeconf;
40907+ u32 dspcntr;
40908 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
40909
40910+ if (pipe == -1)
40911+ return;
40912+
40913+ pipeconf = dev_priv->pipeconf[pipe];
40914+ dspcntr = dev_priv->dspcntr[pipe];
40915+
40916 if (pipe) {
40917 pipeconf_reg = PIPECCONF;
40918 dspcntr_reg = DSPCCNTR;
40919diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40920index 93ec5dc..82acbaf 100644
40921--- a/drivers/gpu/drm/i810/i810_drv.h
40922+++ b/drivers/gpu/drm/i810/i810_drv.h
40923@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40924 int page_flipping;
40925
40926 wait_queue_head_t irq_queue;
40927- atomic_t irq_received;
40928- atomic_t irq_emitted;
40929+ atomic_unchecked_t irq_received;
40930+ atomic_unchecked_t irq_emitted;
40931
40932 int front_offset;
40933 } drm_i810_private_t;
40934diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40935index 68e0c85..3303192 100644
40936--- a/drivers/gpu/drm/i915/i915_dma.c
40937+++ b/drivers/gpu/drm/i915/i915_dma.c
40938@@ -162,6 +162,8 @@ static int i915_getparam(struct drm_device *dev, void *data,
40939 value = INTEL_INFO(dev)->eu_total;
40940 if (!value)
40941 return -ENODEV;
40942+ case I915_PARAM_HAS_LEGACY_CONTEXT:
40943+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
40944 break;
40945 default:
40946 DRM_DEBUG("Unknown parameter %d\n", param->param);
40947@@ -376,7 +378,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40948 * locking inversion with the driver load path. And the access here is
40949 * completely racy anyway. So don't bother with locking for now.
40950 */
40951- return dev->open_count == 0;
40952+ return local_read(&dev->open_count) == 0;
40953 }
40954
40955 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40956diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40957index a3190e79..86b06cb 100644
40958--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40959+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40960@@ -936,12 +936,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40961 static int
40962 validate_exec_list(struct drm_device *dev,
40963 struct drm_i915_gem_exec_object2 *exec,
40964- int count)
40965+ unsigned int count)
40966 {
40967 unsigned relocs_total = 0;
40968 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40969 unsigned invalid_flags;
40970- int i;
40971+ unsigned int i;
40972
40973 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40974 if (USES_FULL_PPGTT(dev))
40975diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40976index 23aa04c..1d25960 100644
40977--- a/drivers/gpu/drm/i915/i915_ioc32.c
40978+++ b/drivers/gpu/drm/i915/i915_ioc32.c
40979@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
40980 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
40981 || __put_user(batchbuffer32.num_cliprects,
40982 &batchbuffer->num_cliprects)
40983- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
40984+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
40985 &batchbuffer->cliprects))
40986 return -EFAULT;
40987
40988@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
40989
40990 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
40991 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
40992- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
40993+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
40994 &cmdbuffer->buf)
40995 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
40996 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
40997 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
40998 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
40999- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
41000+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
41001 &cmdbuffer->cliprects))
41002 return -EFAULT;
41003
41004@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
41005 (unsigned long)request);
41006 }
41007
41008-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41009+static drm_ioctl_compat_t i915_compat_ioctls[] = {
41010 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
41011 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
41012 [DRM_I915_GETPARAM] = compat_i915_getparam,
41013@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41014 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41015 {
41016 unsigned int nr = DRM_IOCTL_NR(cmd);
41017- drm_ioctl_compat_t *fn = NULL;
41018 int ret;
41019
41020 if (nr < DRM_COMMAND_BASE || nr >= DRM_COMMAND_END)
41021 return drm_compat_ioctl(filp, cmd, arg);
41022
41023- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
41024- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
41025-
41026- if (fn != NULL)
41027- ret = (*fn) (filp, cmd, arg);
41028+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
41029+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
41030 else
41031 ret = drm_ioctl(filp, cmd, arg);
41032
41033diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
41034index 57c8878..8ef38a7 100644
41035--- a/drivers/gpu/drm/i915/intel_display.c
41036+++ b/drivers/gpu/drm/i915/intel_display.c
41037@@ -13617,13 +13617,13 @@ struct intel_quirk {
41038 int subsystem_vendor;
41039 int subsystem_device;
41040 void (*hook)(struct drm_device *dev);
41041-};
41042+} __do_const;
41043
41044 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
41045 struct intel_dmi_quirk {
41046 void (*hook)(struct drm_device *dev);
41047 const struct dmi_system_id (*dmi_id_list)[];
41048-};
41049+} __do_const;
41050
41051 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41052 {
41053@@ -13631,18 +13631,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41054 return 1;
41055 }
41056
41057-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41058+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41059 {
41060- .dmi_id_list = &(const struct dmi_system_id[]) {
41061- {
41062- .callback = intel_dmi_reverse_brightness,
41063- .ident = "NCR Corporation",
41064- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41065- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41066- },
41067- },
41068- { } /* terminating entry */
41069+ .callback = intel_dmi_reverse_brightness,
41070+ .ident = "NCR Corporation",
41071+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41072+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41073 },
41074+ },
41075+ { } /* terminating entry */
41076+};
41077+
41078+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41079+ {
41080+ .dmi_id_list = &intel_dmi_quirks_table,
41081 .hook = quirk_invert_brightness,
41082 },
41083 };
41084diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41085index 74f505b..21f6914 100644
41086--- a/drivers/gpu/drm/imx/imx-drm-core.c
41087+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41088@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41089 if (imxdrm->pipes >= MAX_CRTC)
41090 return -EINVAL;
41091
41092- if (imxdrm->drm->open_count)
41093+ if (local_read(&imxdrm->drm->open_count))
41094 return -EBUSY;
41095
41096 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41097diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41098index b4a20149..219ab78 100644
41099--- a/drivers/gpu/drm/mga/mga_drv.h
41100+++ b/drivers/gpu/drm/mga/mga_drv.h
41101@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41102 u32 clear_cmd;
41103 u32 maccess;
41104
41105- atomic_t vbl_received; /**< Number of vblanks received. */
41106+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41107 wait_queue_head_t fence_queue;
41108- atomic_t last_fence_retired;
41109+ atomic_unchecked_t last_fence_retired;
41110 u32 next_fence_to_post;
41111
41112 unsigned int fb_cpp;
41113diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41114index 729bfd5..14bae78 100644
41115--- a/drivers/gpu/drm/mga/mga_ioc32.c
41116+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41117@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41118 return 0;
41119 }
41120
41121-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41122+drm_ioctl_compat_t mga_compat_ioctls[] = {
41123 [DRM_MGA_INIT] = compat_mga_init,
41124 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41125 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41126@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41127 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41128 {
41129 unsigned int nr = DRM_IOCTL_NR(cmd);
41130- drm_ioctl_compat_t *fn = NULL;
41131 int ret;
41132
41133 if (nr < DRM_COMMAND_BASE)
41134 return drm_compat_ioctl(filp, cmd, arg);
41135
41136- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41137- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41138-
41139- if (fn != NULL)
41140- ret = (*fn) (filp, cmd, arg);
41141+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41142+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41143 else
41144 ret = drm_ioctl(filp, cmd, arg);
41145
41146diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41147index 1b071b8..de8601a 100644
41148--- a/drivers/gpu/drm/mga/mga_irq.c
41149+++ b/drivers/gpu/drm/mga/mga_irq.c
41150@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41151 if (crtc != 0)
41152 return 0;
41153
41154- return atomic_read(&dev_priv->vbl_received);
41155+ return atomic_read_unchecked(&dev_priv->vbl_received);
41156 }
41157
41158
41159@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41160 /* VBLANK interrupt */
41161 if (status & MGA_VLINEPEN) {
41162 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41163- atomic_inc(&dev_priv->vbl_received);
41164+ atomic_inc_unchecked(&dev_priv->vbl_received);
41165 drm_handle_vblank(dev, 0);
41166 handled = 1;
41167 }
41168@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41169 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41170 MGA_WRITE(MGA_PRIMEND, prim_end);
41171
41172- atomic_inc(&dev_priv->last_fence_retired);
41173+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41174 wake_up(&dev_priv->fence_queue);
41175 handled = 1;
41176 }
41177@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41178 * using fences.
41179 */
41180 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41181- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41182+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41183 - *sequence) <= (1 << 23)));
41184
41185 *sequence = cur_fence;
41186diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41187index 0190b69..60c3eaf 100644
41188--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41189+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41190@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41191 struct bit_table {
41192 const char id;
41193 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41194-};
41195+} __no_const;
41196
41197 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41198
41199diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41200index cd6dae0..f25eb48 100644
41201--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41202+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41203@@ -943,7 +943,8 @@ static struct drm_driver
41204 driver_stub = {
41205 .driver_features =
41206 DRIVER_USE_AGP |
41207- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41208+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41209+ DRIVER_KMS_LEGACY_CONTEXT,
41210
41211 .load = nouveau_drm_load,
41212 .unload = nouveau_drm_unload,
41213diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41214index dd72652..1fd2368 100644
41215--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41216+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41217@@ -123,7 +123,6 @@ struct nouveau_drm {
41218 struct drm_global_reference mem_global_ref;
41219 struct ttm_bo_global_ref bo_global_ref;
41220 struct ttm_bo_device bdev;
41221- atomic_t validate_sequence;
41222 int (*move)(struct nouveau_channel *,
41223 struct ttm_buffer_object *,
41224 struct ttm_mem_reg *, struct ttm_mem_reg *);
41225diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41226index 462679a..88e32a7 100644
41227--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41228+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41229@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41230 unsigned long arg)
41231 {
41232 unsigned int nr = DRM_IOCTL_NR(cmd);
41233- drm_ioctl_compat_t *fn = NULL;
41234+ drm_ioctl_compat_t fn = NULL;
41235 int ret;
41236
41237 if (nr < DRM_COMMAND_BASE)
41238diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41239index 18f4497..10f6025 100644
41240--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41241+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41242@@ -130,11 +130,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41243 }
41244
41245 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41246- nouveau_vram_manager_init,
41247- nouveau_vram_manager_fini,
41248- nouveau_vram_manager_new,
41249- nouveau_vram_manager_del,
41250- nouveau_vram_manager_debug
41251+ .init = nouveau_vram_manager_init,
41252+ .takedown = nouveau_vram_manager_fini,
41253+ .get_node = nouveau_vram_manager_new,
41254+ .put_node = nouveau_vram_manager_del,
41255+ .debug = nouveau_vram_manager_debug
41256 };
41257
41258 static int
41259@@ -198,11 +198,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41260 }
41261
41262 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41263- nouveau_gart_manager_init,
41264- nouveau_gart_manager_fini,
41265- nouveau_gart_manager_new,
41266- nouveau_gart_manager_del,
41267- nouveau_gart_manager_debug
41268+ .init = nouveau_gart_manager_init,
41269+ .takedown = nouveau_gart_manager_fini,
41270+ .get_node = nouveau_gart_manager_new,
41271+ .put_node = nouveau_gart_manager_del,
41272+ .debug = nouveau_gart_manager_debug
41273 };
41274
41275 /*XXX*/
41276@@ -271,11 +271,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41277 }
41278
41279 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41280- nv04_gart_manager_init,
41281- nv04_gart_manager_fini,
41282- nv04_gart_manager_new,
41283- nv04_gart_manager_del,
41284- nv04_gart_manager_debug
41285+ .init = nv04_gart_manager_init,
41286+ .takedown = nv04_gart_manager_fini,
41287+ .get_node = nv04_gart_manager_new,
41288+ .put_node = nv04_gart_manager_del,
41289+ .debug = nv04_gart_manager_debug
41290 };
41291
41292 int
41293diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41294index c7592ec..dd45ebc 100644
41295--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41296+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41297@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41298 * locking inversion with the driver load path. And the access here is
41299 * completely racy anyway. So don't bother with locking for now.
41300 */
41301- return dev->open_count == 0;
41302+ return local_read(&dev->open_count) == 0;
41303 }
41304
41305 static const struct vga_switcheroo_client_ops
41306diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41307index f33251d..22f6cb1 100644
41308--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41309+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41310@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41311 int ret;
41312
41313 mutex_lock(&qdev->async_io_mutex);
41314- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41315+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41316 if (qdev->last_sent_io_cmd > irq_num) {
41317 if (intr)
41318 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41319- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41320+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41321 else
41322 ret = wait_event_timeout(qdev->io_cmd_event,
41323- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41324+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41325 /* 0 is timeout, just bail the "hw" has gone away */
41326 if (ret <= 0)
41327 goto out;
41328- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41329+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41330 }
41331 outb(val, addr);
41332 qdev->last_sent_io_cmd = irq_num + 1;
41333 if (intr)
41334 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41335- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41336+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41337 else
41338 ret = wait_event_timeout(qdev->io_cmd_event,
41339- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41340+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41341 out:
41342 if (ret > 0)
41343 ret = 0;
41344diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41345index 6911b8c..89d6867 100644
41346--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41347+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41348@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41349 struct drm_info_node *node = (struct drm_info_node *) m->private;
41350 struct qxl_device *qdev = node->minor->dev->dev_private;
41351
41352- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41353- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41354- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41355- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41356+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41357+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41358+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41359+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41360 seq_printf(m, "%d\n", qdev->irq_received_error);
41361 return 0;
41362 }
41363diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41364index 7c6cafe..460f542 100644
41365--- a/drivers/gpu/drm/qxl/qxl_drv.h
41366+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41367@@ -290,10 +290,10 @@ struct qxl_device {
41368 unsigned int last_sent_io_cmd;
41369
41370 /* interrupt handling */
41371- atomic_t irq_received;
41372- atomic_t irq_received_display;
41373- atomic_t irq_received_cursor;
41374- atomic_t irq_received_io_cmd;
41375+ atomic_unchecked_t irq_received;
41376+ atomic_unchecked_t irq_received_display;
41377+ atomic_unchecked_t irq_received_cursor;
41378+ atomic_unchecked_t irq_received_io_cmd;
41379 unsigned irq_received_error;
41380 wait_queue_head_t display_event;
41381 wait_queue_head_t cursor_event;
41382diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41383index 7354a4c..f37d7f9 100644
41384--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41385+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41386@@ -183,7 +183,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41387
41388 /* TODO copy slow path code from i915 */
41389 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41390- 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);
41391+ 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);
41392
41393 {
41394 struct qxl_drawable *draw = fb_cmd;
41395@@ -203,7 +203,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41396 struct drm_qxl_reloc reloc;
41397
41398 if (copy_from_user(&reloc,
41399- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41400+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41401 sizeof(reloc))) {
41402 ret = -EFAULT;
41403 goto out_free_bos;
41404@@ -296,10 +296,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41405
41406 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41407
41408- struct drm_qxl_command *commands =
41409- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41410+ struct drm_qxl_command __user *commands =
41411+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41412
41413- if (copy_from_user(&user_cmd, &commands[cmd_num],
41414+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41415 sizeof(user_cmd)))
41416 return -EFAULT;
41417
41418diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41419index 0bf1e20..42a7310 100644
41420--- a/drivers/gpu/drm/qxl/qxl_irq.c
41421+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41422@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41423 if (!pending)
41424 return IRQ_NONE;
41425
41426- atomic_inc(&qdev->irq_received);
41427+ atomic_inc_unchecked(&qdev->irq_received);
41428
41429 if (pending & QXL_INTERRUPT_DISPLAY) {
41430- atomic_inc(&qdev->irq_received_display);
41431+ atomic_inc_unchecked(&qdev->irq_received_display);
41432 wake_up_all(&qdev->display_event);
41433 qxl_queue_garbage_collect(qdev, false);
41434 }
41435 if (pending & QXL_INTERRUPT_CURSOR) {
41436- atomic_inc(&qdev->irq_received_cursor);
41437+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41438 wake_up_all(&qdev->cursor_event);
41439 }
41440 if (pending & QXL_INTERRUPT_IO_CMD) {
41441- atomic_inc(&qdev->irq_received_io_cmd);
41442+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41443 wake_up_all(&qdev->io_cmd_event);
41444 }
41445 if (pending & QXL_INTERRUPT_ERROR) {
41446@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41447 init_waitqueue_head(&qdev->io_cmd_event);
41448 INIT_WORK(&qdev->client_monitors_config_work,
41449 qxl_client_monitors_config_work_func);
41450- atomic_set(&qdev->irq_received, 0);
41451- atomic_set(&qdev->irq_received_display, 0);
41452- atomic_set(&qdev->irq_received_cursor, 0);
41453- atomic_set(&qdev->irq_received_io_cmd, 0);
41454+ atomic_set_unchecked(&qdev->irq_received, 0);
41455+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41456+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41457+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41458 qdev->irq_received_error = 0;
41459 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41460 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41461diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41462index 0cbc4c9..0e46686 100644
41463--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41464+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41465@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41466 }
41467 }
41468
41469-static struct vm_operations_struct qxl_ttm_vm_ops;
41470+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41471 static const struct vm_operations_struct *ttm_vm_ops;
41472
41473 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41474@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41475 return r;
41476 if (unlikely(ttm_vm_ops == NULL)) {
41477 ttm_vm_ops = vma->vm_ops;
41478+ pax_open_kernel();
41479 qxl_ttm_vm_ops = *ttm_vm_ops;
41480 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41481+ pax_close_kernel();
41482 }
41483 vma->vm_ops = &qxl_ttm_vm_ops;
41484 return 0;
41485@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41486 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41487 {
41488 #if defined(CONFIG_DEBUG_FS)
41489- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41490- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41491- unsigned i;
41492+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41493+ {
41494+ .name = "qxl_mem_mm",
41495+ .show = &qxl_mm_dump_table,
41496+ },
41497+ {
41498+ .name = "qxl_surf_mm",
41499+ .show = &qxl_mm_dump_table,
41500+ }
41501+ };
41502
41503- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41504- if (i == 0)
41505- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41506- else
41507- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41508- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41509- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41510- qxl_mem_types_list[i].driver_features = 0;
41511- if (i == 0)
41512- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41513- else
41514- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41515+ pax_open_kernel();
41516+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41517+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41518+ pax_close_kernel();
41519
41520- }
41521- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41522+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41523 #else
41524 return 0;
41525 #endif
41526diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41527index 2c45ac9..5d740f8 100644
41528--- a/drivers/gpu/drm/r128/r128_cce.c
41529+++ b/drivers/gpu/drm/r128/r128_cce.c
41530@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41531
41532 /* GH: Simple idle check.
41533 */
41534- atomic_set(&dev_priv->idle_count, 0);
41535+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41536
41537 /* We don't support anything other than bus-mastering ring mode,
41538 * but the ring can be in either AGP or PCI space for the ring
41539diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41540index 723e5d6..102dbaf 100644
41541--- a/drivers/gpu/drm/r128/r128_drv.h
41542+++ b/drivers/gpu/drm/r128/r128_drv.h
41543@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41544 int is_pci;
41545 unsigned long cce_buffers_offset;
41546
41547- atomic_t idle_count;
41548+ atomic_unchecked_t idle_count;
41549
41550 int page_flipping;
41551 int current_page;
41552 u32 crtc_offset;
41553 u32 crtc_offset_cntl;
41554
41555- atomic_t vbl_received;
41556+ atomic_unchecked_t vbl_received;
41557
41558 u32 color_fmt;
41559 unsigned int front_offset;
41560diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41561index 663f38c..ec159a1 100644
41562--- a/drivers/gpu/drm/r128/r128_ioc32.c
41563+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41564@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41565 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41566 }
41567
41568-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41569+drm_ioctl_compat_t r128_compat_ioctls[] = {
41570 [DRM_R128_INIT] = compat_r128_init,
41571 [DRM_R128_DEPTH] = compat_r128_depth,
41572 [DRM_R128_STIPPLE] = compat_r128_stipple,
41573@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41574 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41575 {
41576 unsigned int nr = DRM_IOCTL_NR(cmd);
41577- drm_ioctl_compat_t *fn = NULL;
41578 int ret;
41579
41580 if (nr < DRM_COMMAND_BASE)
41581 return drm_compat_ioctl(filp, cmd, arg);
41582
41583- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41584- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41585-
41586- if (fn != NULL)
41587- ret = (*fn) (filp, cmd, arg);
41588+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41589+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41590 else
41591 ret = drm_ioctl(filp, cmd, arg);
41592
41593diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41594index c2ae496..30b5993 100644
41595--- a/drivers/gpu/drm/r128/r128_irq.c
41596+++ b/drivers/gpu/drm/r128/r128_irq.c
41597@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41598 if (crtc != 0)
41599 return 0;
41600
41601- return atomic_read(&dev_priv->vbl_received);
41602+ return atomic_read_unchecked(&dev_priv->vbl_received);
41603 }
41604
41605 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41606@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41607 /* VBLANK interrupt */
41608 if (status & R128_CRTC_VBLANK_INT) {
41609 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41610- atomic_inc(&dev_priv->vbl_received);
41611+ atomic_inc_unchecked(&dev_priv->vbl_received);
41612 drm_handle_vblank(dev, 0);
41613 return IRQ_HANDLED;
41614 }
41615diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41616index 8fd2d9f..18c9660 100644
41617--- a/drivers/gpu/drm/r128/r128_state.c
41618+++ b/drivers/gpu/drm/r128/r128_state.c
41619@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41620
41621 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41622 {
41623- if (atomic_read(&dev_priv->idle_count) == 0)
41624+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41625 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41626 else
41627- atomic_set(&dev_priv->idle_count, 0);
41628+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41629 }
41630
41631 #endif
41632diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41633index b928c17..e5d9400 100644
41634--- a/drivers/gpu/drm/radeon/mkregtable.c
41635+++ b/drivers/gpu/drm/radeon/mkregtable.c
41636@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41637 regex_t mask_rex;
41638 regmatch_t match[4];
41639 char buf[1024];
41640- size_t end;
41641+ long end;
41642 int len;
41643 int done = 0;
41644 int r;
41645 unsigned o;
41646 struct offset *offset;
41647 char last_reg_s[10];
41648- int last_reg;
41649+ unsigned long last_reg;
41650
41651 if (regcomp
41652 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41653diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41654index 604c44d..6eb6c4b 100644
41655--- a/drivers/gpu/drm/radeon/radeon_device.c
41656+++ b/drivers/gpu/drm/radeon/radeon_device.c
41657@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41658 * locking inversion with the driver load path. And the access here is
41659 * completely racy anyway. So don't bother with locking for now.
41660 */
41661- return dev->open_count == 0;
41662+ return local_read(&dev->open_count) == 0;
41663 }
41664
41665 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41666diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41667index 46bd393..6ae4719 100644
41668--- a/drivers/gpu/drm/radeon/radeon_drv.h
41669+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41670@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41671
41672 /* SW interrupt */
41673 wait_queue_head_t swi_queue;
41674- atomic_t swi_emitted;
41675+ atomic_unchecked_t swi_emitted;
41676 int vblank_crtc;
41677 uint32_t irq_enable_reg;
41678 uint32_t r500_disp_irq_reg;
41679diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41680index 0b98ea1..a3c770f 100644
41681--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41682+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41683@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41684 request = compat_alloc_user_space(sizeof(*request));
41685 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41686 || __put_user(req32.param, &request->param)
41687- || __put_user((void __user *)(unsigned long)req32.value,
41688+ || __put_user((unsigned long)req32.value,
41689 &request->value))
41690 return -EFAULT;
41691
41692@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41693 #define compat_radeon_cp_setparam NULL
41694 #endif /* X86_64 || IA64 */
41695
41696-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41697+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41698 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41699 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41700 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41701@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41702 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41703 {
41704 unsigned int nr = DRM_IOCTL_NR(cmd);
41705- drm_ioctl_compat_t *fn = NULL;
41706 int ret;
41707
41708 if (nr < DRM_COMMAND_BASE)
41709 return drm_compat_ioctl(filp, cmd, arg);
41710
41711- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41712- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41713-
41714- if (fn != NULL)
41715- ret = (*fn) (filp, cmd, arg);
41716+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
41717+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41718 else
41719 ret = drm_ioctl(filp, cmd, arg);
41720
41721diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41722index 244b19b..c19226d 100644
41723--- a/drivers/gpu/drm/radeon/radeon_irq.c
41724+++ b/drivers/gpu/drm/radeon/radeon_irq.c
41725@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41726 unsigned int ret;
41727 RING_LOCALS;
41728
41729- atomic_inc(&dev_priv->swi_emitted);
41730- ret = atomic_read(&dev_priv->swi_emitted);
41731+ atomic_inc_unchecked(&dev_priv->swi_emitted);
41732+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41733
41734 BEGIN_RING(4);
41735 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41736@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41737 drm_radeon_private_t *dev_priv =
41738 (drm_radeon_private_t *) dev->dev_private;
41739
41740- atomic_set(&dev_priv->swi_emitted, 0);
41741+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41742 init_waitqueue_head(&dev_priv->swi_queue);
41743
41744 dev->max_vblank_count = 0x001fffff;
41745diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41746index 15aee72..cda326e 100644
41747--- a/drivers/gpu/drm/radeon/radeon_state.c
41748+++ b/drivers/gpu/drm/radeon/radeon_state.c
41749@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41750 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41751 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41752
41753- if (copy_from_user(&depth_boxes, clear->depth_boxes,
41754+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41755 sarea_priv->nbox * sizeof(depth_boxes[0])))
41756 return -EFAULT;
41757
41758@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41759 {
41760 drm_radeon_private_t *dev_priv = dev->dev_private;
41761 drm_radeon_getparam_t *param = data;
41762- int value;
41763+ int value = 0;
41764
41765 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41766
41767diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41768index edafd3c..3af7c9c 100644
41769--- a/drivers/gpu/drm/radeon/radeon_ttm.c
41770+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41771@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41772 man->size = size >> PAGE_SHIFT;
41773 }
41774
41775-static struct vm_operations_struct radeon_ttm_vm_ops;
41776+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41777 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41778
41779 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41780@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41781 }
41782 if (unlikely(ttm_vm_ops == NULL)) {
41783 ttm_vm_ops = vma->vm_ops;
41784+ pax_open_kernel();
41785 radeon_ttm_vm_ops = *ttm_vm_ops;
41786 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41787+ pax_close_kernel();
41788 }
41789 vma->vm_ops = &radeon_ttm_vm_ops;
41790 return 0;
41791diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41792index a287e4f..df1d5dd 100644
41793--- a/drivers/gpu/drm/tegra/dc.c
41794+++ b/drivers/gpu/drm/tegra/dc.c
41795@@ -1594,7 +1594,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41796 }
41797
41798 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41799- dc->debugfs_files[i].data = dc;
41800+ *(void **)&dc->debugfs_files[i].data = dc;
41801
41802 err = drm_debugfs_create_files(dc->debugfs_files,
41803 ARRAY_SIZE(debugfs_files),
41804diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41805index ed970f6..4eeea42 100644
41806--- a/drivers/gpu/drm/tegra/dsi.c
41807+++ b/drivers/gpu/drm/tegra/dsi.c
41808@@ -62,7 +62,7 @@ struct tegra_dsi {
41809 struct clk *clk_lp;
41810 struct clk *clk;
41811
41812- struct drm_info_list *debugfs_files;
41813+ drm_info_list_no_const *debugfs_files;
41814 struct drm_minor *minor;
41815 struct dentry *debugfs;
41816
41817diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41818index 06ab178..b5324e4 100644
41819--- a/drivers/gpu/drm/tegra/hdmi.c
41820+++ b/drivers/gpu/drm/tegra/hdmi.c
41821@@ -64,7 +64,7 @@ struct tegra_hdmi {
41822 bool stereo;
41823 bool dvi;
41824
41825- struct drm_info_list *debugfs_files;
41826+ drm_info_list_no_const *debugfs_files;
41827 struct drm_minor *minor;
41828 struct dentry *debugfs;
41829 };
41830diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
41831index 7591d89..463e2b6 100644
41832--- a/drivers/gpu/drm/tegra/sor.c
41833+++ b/drivers/gpu/drm/tegra/sor.c
41834@@ -826,8 +826,11 @@ static int tegra_sor_debugfs_init(struct tegra_sor *sor,
41835 goto remove;
41836 }
41837
41838- for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41839- sor->debugfs_files[i].data = sor;
41840+ for (i = 0; i < ARRAY_SIZE(debugfs_files); i++) {
41841+ pax_open_kernel();
41842+ *(void **)&sor->debugfs_files[i].data = sor;
41843+ pax_close_kernel();
41844+ }
41845
41846 err = drm_debugfs_create_files(sor->debugfs_files,
41847 ARRAY_SIZE(debugfs_files),
41848diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41849index aa0bd054..aea6a01 100644
41850--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41851+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41852@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41853 }
41854
41855 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41856- ttm_bo_man_init,
41857- ttm_bo_man_takedown,
41858- ttm_bo_man_get_node,
41859- ttm_bo_man_put_node,
41860- ttm_bo_man_debug
41861+ .init = ttm_bo_man_init,
41862+ .takedown = ttm_bo_man_takedown,
41863+ .get_node = ttm_bo_man_get_node,
41864+ .put_node = ttm_bo_man_put_node,
41865+ .debug = ttm_bo_man_debug
41866 };
41867 EXPORT_SYMBOL(ttm_bo_manager_func);
41868diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41869index a1803fb..c53f6b0 100644
41870--- a/drivers/gpu/drm/ttm/ttm_memory.c
41871+++ b/drivers/gpu/drm/ttm/ttm_memory.c
41872@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41873 zone->glob = glob;
41874 glob->zone_kernel = zone;
41875 ret = kobject_init_and_add(
41876- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41877+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41878 if (unlikely(ret != 0)) {
41879 kobject_put(&zone->kobj);
41880 return ret;
41881@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41882 zone->glob = glob;
41883 glob->zone_dma32 = zone;
41884 ret = kobject_init_and_add(
41885- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41886+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41887 if (unlikely(ret != 0)) {
41888 kobject_put(&zone->kobj);
41889 return ret;
41890diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41891index 025c429..314062f 100644
41892--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41893+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41894@@ -54,7 +54,7 @@
41895
41896 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41897 #define SMALL_ALLOCATION 16
41898-#define FREE_ALL_PAGES (~0U)
41899+#define FREE_ALL_PAGES (~0UL)
41900 /* times are in msecs */
41901 #define PAGE_FREE_INTERVAL 1000
41902
41903@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41904 * @free_all: If set to true will free all pages in pool
41905 * @use_static: Safe to use static buffer
41906 **/
41907-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41908+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41909 bool use_static)
41910 {
41911 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41912 unsigned long irq_flags;
41913 struct page *p;
41914 struct page **pages_to_free;
41915- unsigned freed_pages = 0,
41916- npages_to_free = nr_free;
41917+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41918
41919 if (NUM_PAGES_TO_ALLOC < nr_free)
41920 npages_to_free = NUM_PAGES_TO_ALLOC;
41921@@ -371,7 +370,8 @@ restart:
41922 __list_del(&p->lru, &pool->list);
41923
41924 ttm_pool_update_free_locked(pool, freed_pages);
41925- nr_free -= freed_pages;
41926+ if (likely(nr_free != FREE_ALL_PAGES))
41927+ nr_free -= freed_pages;
41928 }
41929
41930 spin_unlock_irqrestore(&pool->lock, irq_flags);
41931@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41932 unsigned i;
41933 unsigned pool_offset;
41934 struct ttm_page_pool *pool;
41935- int shrink_pages = sc->nr_to_scan;
41936+ unsigned long shrink_pages = sc->nr_to_scan;
41937 unsigned long freed = 0;
41938
41939 if (!mutex_trylock(&lock))
41940@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41941 pool_offset = ++start_pool % NUM_POOLS;
41942 /* select start pool in round robin fashion */
41943 for (i = 0; i < NUM_POOLS; ++i) {
41944- unsigned nr_free = shrink_pages;
41945+ unsigned long nr_free = shrink_pages;
41946 if (shrink_pages == 0)
41947 break;
41948 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41949@@ -673,7 +673,7 @@ out:
41950 }
41951
41952 /* Put all pages in pages list to correct pool to wait for reuse */
41953-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41954+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41955 enum ttm_caching_state cstate)
41956 {
41957 unsigned long irq_flags;
41958@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41959 struct list_head plist;
41960 struct page *p = NULL;
41961 gfp_t gfp_flags = GFP_USER;
41962- unsigned count;
41963+ unsigned long count;
41964 int r;
41965
41966 /* set zero flag for page allocation if required */
41967diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41968index 01e1d27..aaa018a 100644
41969--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41970+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41971@@ -56,7 +56,7 @@
41972
41973 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41974 #define SMALL_ALLOCATION 4
41975-#define FREE_ALL_PAGES (~0U)
41976+#define FREE_ALL_PAGES (~0UL)
41977 /* times are in msecs */
41978 #define IS_UNDEFINED (0)
41979 #define IS_WC (1<<1)
41980@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41981 * @nr_free: If set to true will free all pages in pool
41982 * @use_static: Safe to use static buffer
41983 **/
41984-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41985+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41986 bool use_static)
41987 {
41988 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41989@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41990 struct dma_page *dma_p, *tmp;
41991 struct page **pages_to_free;
41992 struct list_head d_pages;
41993- unsigned freed_pages = 0,
41994- npages_to_free = nr_free;
41995+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41996
41997 if (NUM_PAGES_TO_ALLOC < nr_free)
41998 npages_to_free = NUM_PAGES_TO_ALLOC;
41999@@ -499,7 +498,8 @@ restart:
42000 /* remove range of pages from the pool */
42001 if (freed_pages) {
42002 ttm_pool_update_free_locked(pool, freed_pages);
42003- nr_free -= freed_pages;
42004+ if (likely(nr_free != FREE_ALL_PAGES))
42005+ nr_free -= freed_pages;
42006 }
42007
42008 spin_unlock_irqrestore(&pool->lock, irq_flags);
42009@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
42010 struct dma_page *d_page, *next;
42011 enum pool_type type;
42012 bool is_cached = false;
42013- unsigned count = 0, i, npages = 0;
42014+ unsigned long count = 0, i, npages = 0;
42015 unsigned long irq_flags;
42016
42017 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
42018@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42019 static unsigned start_pool;
42020 unsigned idx = 0;
42021 unsigned pool_offset;
42022- unsigned shrink_pages = sc->nr_to_scan;
42023+ unsigned long shrink_pages = sc->nr_to_scan;
42024 struct device_pools *p;
42025 unsigned long freed = 0;
42026
42027@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42028 goto out;
42029 pool_offset = ++start_pool % _manager->npools;
42030 list_for_each_entry(p, &_manager->pools, pools) {
42031- unsigned nr_free;
42032+ unsigned long nr_free;
42033
42034 if (!p->dev)
42035 continue;
42036@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42037 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
42038 freed += nr_free - shrink_pages;
42039
42040- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
42041+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
42042 p->pool->dev_name, p->pool->name, current->pid,
42043 nr_free, shrink_pages);
42044 }
42045diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
42046index 5fc16ce..1bd84ec 100644
42047--- a/drivers/gpu/drm/udl/udl_fb.c
42048+++ b/drivers/gpu/drm/udl/udl_fb.c
42049@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
42050 fb_deferred_io_cleanup(info);
42051 kfree(info->fbdefio);
42052 info->fbdefio = NULL;
42053- info->fbops->fb_mmap = udl_fb_mmap;
42054 }
42055
42056 pr_warn("released /dev/fb%d user=%d count=%d\n",
42057diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42058index ef8c500..01030c8 100644
42059--- a/drivers/gpu/drm/via/via_drv.h
42060+++ b/drivers/gpu/drm/via/via_drv.h
42061@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42062 typedef uint32_t maskarray_t[5];
42063
42064 typedef struct drm_via_irq {
42065- atomic_t irq_received;
42066+ atomic_unchecked_t irq_received;
42067 uint32_t pending_mask;
42068 uint32_t enable_mask;
42069 wait_queue_head_t irq_queue;
42070@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42071 struct timeval last_vblank;
42072 int last_vblank_valid;
42073 unsigned usec_per_vblank;
42074- atomic_t vbl_received;
42075+ atomic_unchecked_t vbl_received;
42076 drm_via_state_t hc_state;
42077 char pci_buf[VIA_PCI_BUF_SIZE];
42078 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42079diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42080index 1319433..a993b0c 100644
42081--- a/drivers/gpu/drm/via/via_irq.c
42082+++ b/drivers/gpu/drm/via/via_irq.c
42083@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42084 if (crtc != 0)
42085 return 0;
42086
42087- return atomic_read(&dev_priv->vbl_received);
42088+ return atomic_read_unchecked(&dev_priv->vbl_received);
42089 }
42090
42091 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42092@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42093
42094 status = VIA_READ(VIA_REG_INTERRUPT);
42095 if (status & VIA_IRQ_VBLANK_PENDING) {
42096- atomic_inc(&dev_priv->vbl_received);
42097- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42098+ atomic_inc_unchecked(&dev_priv->vbl_received);
42099+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42100 do_gettimeofday(&cur_vblank);
42101 if (dev_priv->last_vblank_valid) {
42102 dev_priv->usec_per_vblank =
42103@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42104 dev_priv->last_vblank = cur_vblank;
42105 dev_priv->last_vblank_valid = 1;
42106 }
42107- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42108+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42109 DRM_DEBUG("US per vblank is: %u\n",
42110 dev_priv->usec_per_vblank);
42111 }
42112@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42113
42114 for (i = 0; i < dev_priv->num_irqs; ++i) {
42115 if (status & cur_irq->pending_mask) {
42116- atomic_inc(&cur_irq->irq_received);
42117+ atomic_inc_unchecked(&cur_irq->irq_received);
42118 wake_up(&cur_irq->irq_queue);
42119 handled = 1;
42120 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42121@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42122 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42123 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42124 masks[irq][4]));
42125- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42126+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42127 } else {
42128 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42129 (((cur_irq_sequence =
42130- atomic_read(&cur_irq->irq_received)) -
42131+ atomic_read_unchecked(&cur_irq->irq_received)) -
42132 *sequence) <= (1 << 23)));
42133 }
42134 *sequence = cur_irq_sequence;
42135@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42136 }
42137
42138 for (i = 0; i < dev_priv->num_irqs; ++i) {
42139- atomic_set(&cur_irq->irq_received, 0);
42140+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42141 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42142 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42143 init_waitqueue_head(&cur_irq->irq_queue);
42144@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42145 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42146 case VIA_IRQ_RELATIVE:
42147 irqwait->request.sequence +=
42148- atomic_read(&cur_irq->irq_received);
42149+ atomic_read_unchecked(&cur_irq->irq_received);
42150 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42151 case VIA_IRQ_ABSOLUTE:
42152 break;
42153diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42154index d26a6da..5fa41ed 100644
42155--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42156+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42157@@ -447,7 +447,7 @@ struct vmw_private {
42158 * Fencing and IRQs.
42159 */
42160
42161- atomic_t marker_seq;
42162+ atomic_unchecked_t marker_seq;
42163 wait_queue_head_t fence_queue;
42164 wait_queue_head_t fifo_queue;
42165 spinlock_t waiter_lock;
42166diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42167index 39f2b03..d1b0a64 100644
42168--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42169+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42170@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42171 (unsigned int) min,
42172 (unsigned int) fifo->capabilities);
42173
42174- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42175+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42176 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42177 vmw_marker_queue_init(&fifo->marker_queue);
42178 return vmw_fifo_send_fence(dev_priv, &dummy);
42179@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42180 if (reserveable)
42181 iowrite32(bytes, fifo_mem +
42182 SVGA_FIFO_RESERVED);
42183- return fifo_mem + (next_cmd >> 2);
42184+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42185 } else {
42186 need_bounce = true;
42187 }
42188@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42189
42190 fm = vmw_fifo_reserve(dev_priv, bytes);
42191 if (unlikely(fm == NULL)) {
42192- *seqno = atomic_read(&dev_priv->marker_seq);
42193+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42194 ret = -ENOMEM;
42195 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42196 false, 3*HZ);
42197@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42198 }
42199
42200 do {
42201- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42202+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42203 } while (*seqno == 0);
42204
42205 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42206diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42207index 170b61b..fec7348 100644
42208--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42209+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42210@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42211 }
42212
42213 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42214- vmw_gmrid_man_init,
42215- vmw_gmrid_man_takedown,
42216- vmw_gmrid_man_get_node,
42217- vmw_gmrid_man_put_node,
42218- vmw_gmrid_man_debug
42219+ .init = vmw_gmrid_man_init,
42220+ .takedown = vmw_gmrid_man_takedown,
42221+ .get_node = vmw_gmrid_man_get_node,
42222+ .put_node = vmw_gmrid_man_put_node,
42223+ .debug = vmw_gmrid_man_debug
42224 };
42225diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42226index 69c8ce2..cacb0ab 100644
42227--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42228+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42229@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42230 int ret;
42231
42232 num_clips = arg->num_clips;
42233- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42234+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42235
42236 if (unlikely(num_clips == 0))
42237 return 0;
42238@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42239 int ret;
42240
42241 num_clips = arg->num_clips;
42242- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42243+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42244
42245 if (unlikely(num_clips == 0))
42246 return 0;
42247diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42248index 9fe9827..0aa2fc0 100644
42249--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42250+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42251@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42252 * emitted. Then the fence is stale and signaled.
42253 */
42254
42255- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42256+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42257 > VMW_FENCE_WRAP);
42258
42259 return ret;
42260@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42261
42262 if (fifo_idle)
42263 down_read(&fifo_state->rwsem);
42264- signal_seq = atomic_read(&dev_priv->marker_seq);
42265+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42266 ret = 0;
42267
42268 for (;;) {
42269diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42270index efd1ffd..0ae13ca 100644
42271--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42272+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42273@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42274 while (!vmw_lag_lt(queue, us)) {
42275 spin_lock(&queue->lock);
42276 if (list_empty(&queue->head))
42277- seqno = atomic_read(&dev_priv->marker_seq);
42278+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42279 else {
42280 marker = list_first_entry(&queue->head,
42281 struct vmw_marker, head);
42282diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42283index 37ac7b5..d52a5c9 100644
42284--- a/drivers/gpu/vga/vga_switcheroo.c
42285+++ b/drivers/gpu/vga/vga_switcheroo.c
42286@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42287
42288 /* this version is for the case where the power switch is separate
42289 to the device being powered down. */
42290-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42291+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42292 {
42293 /* copy over all the bus versions */
42294 if (dev->bus && dev->bus->pm) {
42295@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42296 return ret;
42297 }
42298
42299-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42300+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42301 {
42302 /* copy over all the bus versions */
42303 if (dev->bus && dev->bus->pm) {
42304diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42305index 722a925..594c312 100644
42306--- a/drivers/hid/hid-core.c
42307+++ b/drivers/hid/hid-core.c
42308@@ -2552,7 +2552,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42309
42310 int hid_add_device(struct hid_device *hdev)
42311 {
42312- static atomic_t id = ATOMIC_INIT(0);
42313+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42314 int ret;
42315
42316 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42317@@ -2595,7 +2595,7 @@ int hid_add_device(struct hid_device *hdev)
42318 /* XXX hack, any other cleaner solution after the driver core
42319 * is converted to allow more than 20 bytes as the device name? */
42320 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42321- hdev->vendor, hdev->product, atomic_inc_return(&id));
42322+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42323
42324 hid_debug_register(hdev, dev_name(&hdev->dev));
42325 ret = device_add(&hdev->dev);
42326diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
42327index 008e89b..32d52d2 100644
42328--- a/drivers/hid/hid-input.c
42329+++ b/drivers/hid/hid-input.c
42330@@ -462,12 +462,15 @@ out:
42331
42332 static void hidinput_cleanup_battery(struct hid_device *dev)
42333 {
42334+ const struct power_supply_desc *psy_desc;
42335+
42336 if (!dev->battery)
42337 return;
42338
42339+ psy_desc = dev->battery->desc;
42340 power_supply_unregister(dev->battery);
42341- kfree(dev->battery->desc->name);
42342- kfree(dev->battery->desc);
42343+ kfree(psy_desc->name);
42344+ kfree(psy_desc);
42345 dev->battery = NULL;
42346 }
42347 #else /* !CONFIG_HID_BATTERY_STRENGTH */
42348diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
42349index 5614fee..8301fbf 100644
42350--- a/drivers/hid/hid-sensor-custom.c
42351+++ b/drivers/hid/hid-sensor-custom.c
42352@@ -34,7 +34,7 @@ struct hid_sensor_custom_field {
42353 int report_id;
42354 char group_name[HID_CUSTOM_NAME_LENGTH];
42355 struct hid_sensor_hub_attribute_info attribute;
42356- struct device_attribute sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42357+ device_attribute_no_const sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42358 char attr_name[HID_CUSTOM_TOTAL_ATTRS][HID_CUSTOM_NAME_LENGTH];
42359 struct attribute *attrs[HID_CUSTOM_TOTAL_ATTRS];
42360 struct attribute_group hid_custom_attribute_group;
42361@@ -590,7 +590,7 @@ static int hid_sensor_custom_add_attributes(struct hid_sensor_custom
42362 j = 0;
42363 while (j < HID_CUSTOM_TOTAL_ATTRS &&
42364 hid_custom_attrs[j].name) {
42365- struct device_attribute *device_attr;
42366+ device_attribute_no_const *device_attr;
42367
42368 device_attr = &sensor_inst->fields[i].sd_attrs[j];
42369
42370diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42371index c13fb5b..55a3802 100644
42372--- a/drivers/hid/hid-wiimote-debug.c
42373+++ b/drivers/hid/hid-wiimote-debug.c
42374@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42375 else if (size == 0)
42376 return -EIO;
42377
42378- if (copy_to_user(u, buf, size))
42379+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42380 return -EFAULT;
42381
42382 *off += size;
42383diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42384index 54da66d..aa3a3d7 100644
42385--- a/drivers/hv/channel.c
42386+++ b/drivers/hv/channel.c
42387@@ -373,7 +373,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42388 int ret = 0;
42389
42390 next_gpadl_handle =
42391- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42392+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42393
42394 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42395 if (ret)
42396diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42397index d3943bc..3de28a9 100644
42398--- a/drivers/hv/hv.c
42399+++ b/drivers/hv/hv.c
42400@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42401 u64 output_address = (output) ? virt_to_phys(output) : 0;
42402 u32 output_address_hi = output_address >> 32;
42403 u32 output_address_lo = output_address & 0xFFFFFFFF;
42404- void *hypercall_page = hv_context.hypercall_page;
42405+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42406
42407 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42408 "=a"(hv_status_lo) : "d" (control_hi),
42409@@ -164,7 +164,7 @@ int hv_init(void)
42410 /* See if the hypercall page is already set */
42411 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42412
42413- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42414+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42415
42416 if (!virtaddr)
42417 goto cleanup;
42418diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42419index cb5b7dc..6052f22 100644
42420--- a/drivers/hv/hv_balloon.c
42421+++ b/drivers/hv/hv_balloon.c
42422@@ -469,7 +469,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42423
42424 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42425 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42426-static atomic_t trans_id = ATOMIC_INIT(0);
42427+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42428
42429 static int dm_ring_size = (5 * PAGE_SIZE);
42430
42431@@ -941,7 +941,7 @@ static void hot_add_req(struct work_struct *dummy)
42432 pr_info("Memory hot add failed\n");
42433
42434 dm->state = DM_INITIALIZED;
42435- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42436+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42437 vmbus_sendpacket(dm->dev->channel, &resp,
42438 sizeof(struct dm_hot_add_response),
42439 (unsigned long)NULL,
42440@@ -1022,7 +1022,7 @@ static void post_status(struct hv_dynmem_device *dm)
42441 memset(&status, 0, sizeof(struct dm_status));
42442 status.hdr.type = DM_STATUS_REPORT;
42443 status.hdr.size = sizeof(struct dm_status);
42444- status.hdr.trans_id = atomic_inc_return(&trans_id);
42445+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42446
42447 /*
42448 * The host expects the guest to report free and committed memory.
42449@@ -1046,7 +1046,7 @@ static void post_status(struct hv_dynmem_device *dm)
42450 * send the status. This can happen if we were interrupted
42451 * after we picked our transaction ID.
42452 */
42453- if (status.hdr.trans_id != atomic_read(&trans_id))
42454+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42455 return;
42456
42457 /*
42458@@ -1191,7 +1191,7 @@ static void balloon_up(struct work_struct *dummy)
42459 */
42460
42461 do {
42462- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42463+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42464 ret = vmbus_sendpacket(dm_device.dev->channel,
42465 bl_resp,
42466 bl_resp->hdr.size,
42467@@ -1237,7 +1237,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42468
42469 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42470 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42471- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42472+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42473 resp.hdr.size = sizeof(struct dm_unballoon_response);
42474
42475 vmbus_sendpacket(dm_device.dev->channel, &resp,
42476@@ -1298,7 +1298,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42477 memset(&version_req, 0, sizeof(struct dm_version_request));
42478 version_req.hdr.type = DM_VERSION_REQUEST;
42479 version_req.hdr.size = sizeof(struct dm_version_request);
42480- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42481+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42482 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42483 version_req.is_last_attempt = 1;
42484
42485@@ -1471,7 +1471,7 @@ static int balloon_probe(struct hv_device *dev,
42486 memset(&version_req, 0, sizeof(struct dm_version_request));
42487 version_req.hdr.type = DM_VERSION_REQUEST;
42488 version_req.hdr.size = sizeof(struct dm_version_request);
42489- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42490+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42491 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42492 version_req.is_last_attempt = 0;
42493
42494@@ -1502,7 +1502,7 @@ static int balloon_probe(struct hv_device *dev,
42495 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42496 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42497 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42498- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42499+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42500
42501 cap_msg.caps.cap_bits.balloon = 1;
42502 cap_msg.caps.cap_bits.hot_add = 1;
42503diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42504index 887287a..238a626 100644
42505--- a/drivers/hv/hyperv_vmbus.h
42506+++ b/drivers/hv/hyperv_vmbus.h
42507@@ -645,7 +645,7 @@ enum vmbus_connect_state {
42508 struct vmbus_connection {
42509 enum vmbus_connect_state conn_state;
42510
42511- atomic_t next_gpadl_handle;
42512+ atomic_unchecked_t next_gpadl_handle;
42513
42514 /*
42515 * Represents channel interrupts. Each bit position represents a
42516diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42517index 579bdf9..0dac21d5 100644
42518--- a/drivers/hwmon/acpi_power_meter.c
42519+++ b/drivers/hwmon/acpi_power_meter.c
42520@@ -116,7 +116,7 @@ struct sensor_template {
42521 struct device_attribute *devattr,
42522 const char *buf, size_t count);
42523 int index;
42524-};
42525+} __do_const;
42526
42527 /* Averaging interval */
42528 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42529@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42530 struct sensor_template *attrs)
42531 {
42532 struct device *dev = &resource->acpi_dev->dev;
42533- struct sensor_device_attribute *sensors =
42534+ sensor_device_attribute_no_const *sensors =
42535 &resource->sensors[resource->num_sensors];
42536 int res = 0;
42537
42538@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42539 return 0;
42540 }
42541
42542-static struct dmi_system_id __initdata pm_dmi_table[] = {
42543+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42544 {
42545 enable_cap_knobs, "IBM Active Energy Manager",
42546 {
42547diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42548index 0af63da..05a183a 100644
42549--- a/drivers/hwmon/applesmc.c
42550+++ b/drivers/hwmon/applesmc.c
42551@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42552 {
42553 struct applesmc_node_group *grp;
42554 struct applesmc_dev_attr *node;
42555- struct attribute *attr;
42556+ attribute_no_const *attr;
42557 int ret, i;
42558
42559 for (grp = groups; grp->format; grp++) {
42560diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42561index cccef87..06ce8ec 100644
42562--- a/drivers/hwmon/asus_atk0110.c
42563+++ b/drivers/hwmon/asus_atk0110.c
42564@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42565 struct atk_sensor_data {
42566 struct list_head list;
42567 struct atk_data *data;
42568- struct device_attribute label_attr;
42569- struct device_attribute input_attr;
42570- struct device_attribute limit1_attr;
42571- struct device_attribute limit2_attr;
42572+ device_attribute_no_const label_attr;
42573+ device_attribute_no_const input_attr;
42574+ device_attribute_no_const limit1_attr;
42575+ device_attribute_no_const limit2_attr;
42576 char label_attr_name[ATTR_NAME_SIZE];
42577 char input_attr_name[ATTR_NAME_SIZE];
42578 char limit1_attr_name[ATTR_NAME_SIZE];
42579@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42580 static struct device_attribute atk_name_attr =
42581 __ATTR(name, 0444, atk_name_show, NULL);
42582
42583-static void atk_init_attribute(struct device_attribute *attr, char *name,
42584+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42585 sysfs_show_func show)
42586 {
42587 sysfs_attr_init(&attr->attr);
42588diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42589index ed303ba..e24bd26f 100644
42590--- a/drivers/hwmon/coretemp.c
42591+++ b/drivers/hwmon/coretemp.c
42592@@ -782,7 +782,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42593 return NOTIFY_OK;
42594 }
42595
42596-static struct notifier_block coretemp_cpu_notifier __refdata = {
42597+static struct notifier_block coretemp_cpu_notifier = {
42598 .notifier_call = coretemp_cpu_callback,
42599 };
42600
42601diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42602index 7a8a6fb..015c1fd 100644
42603--- a/drivers/hwmon/ibmaem.c
42604+++ b/drivers/hwmon/ibmaem.c
42605@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42606 struct aem_rw_sensor_template *rw)
42607 {
42608 struct device *dev = &data->pdev->dev;
42609- struct sensor_device_attribute *sensors = data->sensors;
42610+ sensor_device_attribute_no_const *sensors = data->sensors;
42611 int err;
42612
42613 /* Set up read-only sensors */
42614diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42615index 17ae2eb..21b71dd 100644
42616--- a/drivers/hwmon/iio_hwmon.c
42617+++ b/drivers/hwmon/iio_hwmon.c
42618@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42619 {
42620 struct device *dev = &pdev->dev;
42621 struct iio_hwmon_state *st;
42622- struct sensor_device_attribute *a;
42623+ sensor_device_attribute_no_const *a;
42624 int ret, i;
42625 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42626 enum iio_chan_type type;
42627diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42628index 37f0170..414ec2c 100644
42629--- a/drivers/hwmon/nct6683.c
42630+++ b/drivers/hwmon/nct6683.c
42631@@ -397,11 +397,11 @@ static struct attribute_group *
42632 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42633 int repeat)
42634 {
42635- struct sensor_device_attribute_2 *a2;
42636- struct sensor_device_attribute *a;
42637+ sensor_device_attribute_2_no_const *a2;
42638+ sensor_device_attribute_no_const *a;
42639 struct sensor_device_template **t;
42640 struct sensor_device_attr_u *su;
42641- struct attribute_group *group;
42642+ attribute_group_no_const *group;
42643 struct attribute **attrs;
42644 int i, j, count;
42645
42646diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42647index bd1c99d..2fa55ad 100644
42648--- a/drivers/hwmon/nct6775.c
42649+++ b/drivers/hwmon/nct6775.c
42650@@ -953,10 +953,10 @@ static struct attribute_group *
42651 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42652 int repeat)
42653 {
42654- struct attribute_group *group;
42655+ attribute_group_no_const *group;
42656 struct sensor_device_attr_u *su;
42657- struct sensor_device_attribute *a;
42658- struct sensor_device_attribute_2 *a2;
42659+ sensor_device_attribute_no_const *a;
42660+ sensor_device_attribute_2_no_const *a2;
42661 struct attribute **attrs;
42662 struct sensor_device_template **t;
42663 int i, count;
42664diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42665index f2e47c7..45d7941 100644
42666--- a/drivers/hwmon/pmbus/pmbus_core.c
42667+++ b/drivers/hwmon/pmbus/pmbus_core.c
42668@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42669 return 0;
42670 }
42671
42672-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42673+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42674 const char *name,
42675 umode_t mode,
42676 ssize_t (*show)(struct device *dev,
42677@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42678 dev_attr->store = store;
42679 }
42680
42681-static void pmbus_attr_init(struct sensor_device_attribute *a,
42682+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42683 const char *name,
42684 umode_t mode,
42685 ssize_t (*show)(struct device *dev,
42686@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42687 u16 reg, u8 mask)
42688 {
42689 struct pmbus_boolean *boolean;
42690- struct sensor_device_attribute *a;
42691+ sensor_device_attribute_no_const *a;
42692
42693 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42694 if (!boolean)
42695@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42696 bool update, bool readonly)
42697 {
42698 struct pmbus_sensor *sensor;
42699- struct device_attribute *a;
42700+ device_attribute_no_const *a;
42701
42702 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42703 if (!sensor)
42704@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42705 const char *lstring, int index)
42706 {
42707 struct pmbus_label *label;
42708- struct device_attribute *a;
42709+ device_attribute_no_const *a;
42710
42711 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42712 if (!label)
42713diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42714index d4f0935..7420593 100644
42715--- a/drivers/hwmon/sht15.c
42716+++ b/drivers/hwmon/sht15.c
42717@@ -169,7 +169,7 @@ struct sht15_data {
42718 int supply_uv;
42719 bool supply_uv_valid;
42720 struct work_struct update_supply_work;
42721- atomic_t interrupt_handled;
42722+ atomic_unchecked_t interrupt_handled;
42723 };
42724
42725 /**
42726@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42727 ret = gpio_direction_input(data->pdata->gpio_data);
42728 if (ret)
42729 return ret;
42730- atomic_set(&data->interrupt_handled, 0);
42731+ atomic_set_unchecked(&data->interrupt_handled, 0);
42732
42733 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42734 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42735 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42736 /* Only relevant if the interrupt hasn't occurred. */
42737- if (!atomic_read(&data->interrupt_handled))
42738+ if (!atomic_read_unchecked(&data->interrupt_handled))
42739 schedule_work(&data->read_work);
42740 }
42741 ret = wait_event_timeout(data->wait_queue,
42742@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42743
42744 /* First disable the interrupt */
42745 disable_irq_nosync(irq);
42746- atomic_inc(&data->interrupt_handled);
42747+ atomic_inc_unchecked(&data->interrupt_handled);
42748 /* Then schedule a reading work struct */
42749 if (data->state != SHT15_READING_NOTHING)
42750 schedule_work(&data->read_work);
42751@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42752 * If not, then start the interrupt again - care here as could
42753 * have gone low in meantime so verify it hasn't!
42754 */
42755- atomic_set(&data->interrupt_handled, 0);
42756+ atomic_set_unchecked(&data->interrupt_handled, 0);
42757 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42758 /* If still not occurred or another handler was scheduled */
42759 if (gpio_get_value(data->pdata->gpio_data)
42760- || atomic_read(&data->interrupt_handled))
42761+ || atomic_read_unchecked(&data->interrupt_handled))
42762 return;
42763 }
42764
42765diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42766index ac91c07..8e69663 100644
42767--- a/drivers/hwmon/via-cputemp.c
42768+++ b/drivers/hwmon/via-cputemp.c
42769@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42770 return NOTIFY_OK;
42771 }
42772
42773-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42774+static struct notifier_block via_cputemp_cpu_notifier = {
42775 .notifier_call = via_cputemp_cpu_callback,
42776 };
42777
42778diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42779index 65e3240..e6c511d 100644
42780--- a/drivers/i2c/busses/i2c-amd756-s4882.c
42781+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42782@@ -39,7 +39,7 @@
42783 extern struct i2c_adapter amd756_smbus;
42784
42785 static struct i2c_adapter *s4882_adapter;
42786-static struct i2c_algorithm *s4882_algo;
42787+static i2c_algorithm_no_const *s4882_algo;
42788
42789 /* Wrapper access functions for multiplexed SMBus */
42790 static DEFINE_MUTEX(amd756_lock);
42791diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42792index b19a310..d6eece0 100644
42793--- a/drivers/i2c/busses/i2c-diolan-u2c.c
42794+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42795@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42796 /* usb layer */
42797
42798 /* Send command to device, and get response. */
42799-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42800+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42801 {
42802 int ret = 0;
42803 int actual;
42804diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42805index 88eda09..cf40434 100644
42806--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42807+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42808@@ -37,7 +37,7 @@
42809 extern struct i2c_adapter *nforce2_smbus;
42810
42811 static struct i2c_adapter *s4985_adapter;
42812-static struct i2c_algorithm *s4985_algo;
42813+static i2c_algorithm_no_const *s4985_algo;
42814
42815 /* Wrapper access functions for multiplexed SMBus */
42816 static DEFINE_MUTEX(nforce2_lock);
42817diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42818index 71c7a39..71dd3e0 100644
42819--- a/drivers/i2c/i2c-dev.c
42820+++ b/drivers/i2c/i2c-dev.c
42821@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42822 break;
42823 }
42824
42825- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42826+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42827 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42828 if (IS_ERR(rdwr_pa[i].buf)) {
42829 res = PTR_ERR(rdwr_pa[i].buf);
42830diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42831index 0b510ba..4fbb5085 100644
42832--- a/drivers/ide/ide-cd.c
42833+++ b/drivers/ide/ide-cd.c
42834@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42835 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42836 if ((unsigned long)buf & alignment
42837 || blk_rq_bytes(rq) & q->dma_pad_mask
42838- || object_is_on_stack(buf))
42839+ || object_starts_on_stack(buf))
42840 drive->dma = 0;
42841 }
42842 }
42843diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42844index 4df97f6..c751151 100644
42845--- a/drivers/iio/industrialio-core.c
42846+++ b/drivers/iio/industrialio-core.c
42847@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42848 }
42849
42850 static
42851-int __iio_device_attr_init(struct device_attribute *dev_attr,
42852+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42853 const char *postfix,
42854 struct iio_chan_spec const *chan,
42855 ssize_t (*readfunc)(struct device *dev,
42856diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42857index 0271608..81998c5 100644
42858--- a/drivers/infiniband/core/cm.c
42859+++ b/drivers/infiniband/core/cm.c
42860@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42861
42862 struct cm_counter_group {
42863 struct kobject obj;
42864- atomic_long_t counter[CM_ATTR_COUNT];
42865+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42866 };
42867
42868 struct cm_counter_attribute {
42869@@ -1397,7 +1397,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42870 struct ib_mad_send_buf *msg = NULL;
42871 int ret;
42872
42873- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42874+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42875 counter[CM_REQ_COUNTER]);
42876
42877 /* Quick state check to discard duplicate REQs. */
42878@@ -1784,7 +1784,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42879 if (!cm_id_priv)
42880 return;
42881
42882- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42883+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42884 counter[CM_REP_COUNTER]);
42885 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42886 if (ret)
42887@@ -1951,7 +1951,7 @@ static int cm_rtu_handler(struct cm_work *work)
42888 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42889 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42890 spin_unlock_irq(&cm_id_priv->lock);
42891- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42892+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42893 counter[CM_RTU_COUNTER]);
42894 goto out;
42895 }
42896@@ -2134,7 +2134,7 @@ static int cm_dreq_handler(struct cm_work *work)
42897 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42898 dreq_msg->local_comm_id);
42899 if (!cm_id_priv) {
42900- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42901+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42902 counter[CM_DREQ_COUNTER]);
42903 cm_issue_drep(work->port, work->mad_recv_wc);
42904 return -EINVAL;
42905@@ -2159,7 +2159,7 @@ static int cm_dreq_handler(struct cm_work *work)
42906 case IB_CM_MRA_REP_RCVD:
42907 break;
42908 case IB_CM_TIMEWAIT:
42909- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42910+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42911 counter[CM_DREQ_COUNTER]);
42912 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42913 goto unlock;
42914@@ -2173,7 +2173,7 @@ static int cm_dreq_handler(struct cm_work *work)
42915 cm_free_msg(msg);
42916 goto deref;
42917 case IB_CM_DREQ_RCVD:
42918- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42919+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42920 counter[CM_DREQ_COUNTER]);
42921 goto unlock;
42922 default:
42923@@ -2540,7 +2540,7 @@ static int cm_mra_handler(struct cm_work *work)
42924 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42925 cm_id_priv->msg, timeout)) {
42926 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42927- atomic_long_inc(&work->port->
42928+ atomic_long_inc_unchecked(&work->port->
42929 counter_group[CM_RECV_DUPLICATES].
42930 counter[CM_MRA_COUNTER]);
42931 goto out;
42932@@ -2549,7 +2549,7 @@ static int cm_mra_handler(struct cm_work *work)
42933 break;
42934 case IB_CM_MRA_REQ_RCVD:
42935 case IB_CM_MRA_REP_RCVD:
42936- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42937+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42938 counter[CM_MRA_COUNTER]);
42939 /* fall through */
42940 default:
42941@@ -2711,7 +2711,7 @@ static int cm_lap_handler(struct cm_work *work)
42942 case IB_CM_LAP_IDLE:
42943 break;
42944 case IB_CM_MRA_LAP_SENT:
42945- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42946+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42947 counter[CM_LAP_COUNTER]);
42948 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42949 goto unlock;
42950@@ -2727,7 +2727,7 @@ static int cm_lap_handler(struct cm_work *work)
42951 cm_free_msg(msg);
42952 goto deref;
42953 case IB_CM_LAP_RCVD:
42954- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42955+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42956 counter[CM_LAP_COUNTER]);
42957 goto unlock;
42958 default:
42959@@ -3011,7 +3011,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42960 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42961 if (cur_cm_id_priv) {
42962 spin_unlock_irq(&cm.lock);
42963- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42964+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42965 counter[CM_SIDR_REQ_COUNTER]);
42966 goto out; /* Duplicate message. */
42967 }
42968@@ -3223,10 +3223,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42969 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42970 msg->retries = 1;
42971
42972- atomic_long_add(1 + msg->retries,
42973+ atomic_long_add_unchecked(1 + msg->retries,
42974 &port->counter_group[CM_XMIT].counter[attr_index]);
42975 if (msg->retries)
42976- atomic_long_add(msg->retries,
42977+ atomic_long_add_unchecked(msg->retries,
42978 &port->counter_group[CM_XMIT_RETRIES].
42979 counter[attr_index]);
42980
42981@@ -3436,7 +3436,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42982 }
42983
42984 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42985- atomic_long_inc(&port->counter_group[CM_RECV].
42986+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42987 counter[attr_id - CM_ATTR_ID_OFFSET]);
42988
42989 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42990@@ -3667,7 +3667,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42991 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42992
42993 return sprintf(buf, "%ld\n",
42994- atomic_long_read(&group->counter[cm_attr->index]));
42995+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42996 }
42997
42998 static const struct sysfs_ops cm_counter_ops = {
42999diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
43000index 9f5ad7c..588cd84 100644
43001--- a/drivers/infiniband/core/fmr_pool.c
43002+++ b/drivers/infiniband/core/fmr_pool.c
43003@@ -98,8 +98,8 @@ struct ib_fmr_pool {
43004
43005 struct task_struct *thread;
43006
43007- atomic_t req_ser;
43008- atomic_t flush_ser;
43009+ atomic_unchecked_t req_ser;
43010+ atomic_unchecked_t flush_ser;
43011
43012 wait_queue_head_t force_wait;
43013 };
43014@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43015 struct ib_fmr_pool *pool = pool_ptr;
43016
43017 do {
43018- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
43019+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
43020 ib_fmr_batch_release(pool);
43021
43022- atomic_inc(&pool->flush_ser);
43023+ atomic_inc_unchecked(&pool->flush_ser);
43024 wake_up_interruptible(&pool->force_wait);
43025
43026 if (pool->flush_function)
43027@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43028 }
43029
43030 set_current_state(TASK_INTERRUPTIBLE);
43031- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
43032+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
43033 !kthread_should_stop())
43034 schedule();
43035 __set_current_state(TASK_RUNNING);
43036@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
43037 pool->dirty_watermark = params->dirty_watermark;
43038 pool->dirty_len = 0;
43039 spin_lock_init(&pool->pool_lock);
43040- atomic_set(&pool->req_ser, 0);
43041- atomic_set(&pool->flush_ser, 0);
43042+ atomic_set_unchecked(&pool->req_ser, 0);
43043+ atomic_set_unchecked(&pool->flush_ser, 0);
43044 init_waitqueue_head(&pool->force_wait);
43045
43046 pool->thread = kthread_run(ib_fmr_cleanup_thread,
43047@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
43048 }
43049 spin_unlock_irq(&pool->pool_lock);
43050
43051- serial = atomic_inc_return(&pool->req_ser);
43052+ serial = atomic_inc_return_unchecked(&pool->req_ser);
43053 wake_up_process(pool->thread);
43054
43055 if (wait_event_interruptible(pool->force_wait,
43056- atomic_read(&pool->flush_ser) - serial >= 0))
43057+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
43058 return -EINTR;
43059
43060 return 0;
43061@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
43062 } else {
43063 list_add_tail(&fmr->list, &pool->dirty_list);
43064 if (++pool->dirty_len >= pool->dirty_watermark) {
43065- atomic_inc(&pool->req_ser);
43066+ atomic_inc_unchecked(&pool->req_ser);
43067 wake_up_process(pool->thread);
43068 }
43069 }
43070diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
43071index a9f0489..27a161b 100644
43072--- a/drivers/infiniband/core/uverbs_cmd.c
43073+++ b/drivers/infiniband/core/uverbs_cmd.c
43074@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
43075 if (copy_from_user(&cmd, buf, sizeof cmd))
43076 return -EFAULT;
43077
43078+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43079+ return -EFAULT;
43080+
43081 INIT_UDATA(&udata, buf + sizeof cmd,
43082 (unsigned long) cmd.response + sizeof resp,
43083 in_len - sizeof cmd, out_len - sizeof resp);
43084diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43085index cff815b..75576dd 100644
43086--- a/drivers/infiniband/hw/cxgb4/mem.c
43087+++ b/drivers/infiniband/hw/cxgb4/mem.c
43088@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43089 int err;
43090 struct fw_ri_tpte tpt;
43091 u32 stag_idx;
43092- static atomic_t key;
43093+ static atomic_unchecked_t key;
43094
43095 if (c4iw_fatal_error(rdev))
43096 return -EIO;
43097@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43098 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43099 rdev->stats.stag.max = rdev->stats.stag.cur;
43100 mutex_unlock(&rdev->stats.lock);
43101- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43102+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43103 }
43104 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43105 __func__, stag_state, type, pdid, stag_idx);
43106diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43107index 79b3dbc..96e5fcc 100644
43108--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43109+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43110@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43111 struct ib_atomic_eth *ateth;
43112 struct ipath_ack_entry *e;
43113 u64 vaddr;
43114- atomic64_t *maddr;
43115+ atomic64_unchecked_t *maddr;
43116 u64 sdata;
43117 u32 rkey;
43118 u8 next;
43119@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43120 IB_ACCESS_REMOTE_ATOMIC)))
43121 goto nack_acc_unlck;
43122 /* Perform atomic OP and save result. */
43123- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43124+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43125 sdata = be64_to_cpu(ateth->swap_data);
43126 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43127 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43128- (u64) atomic64_add_return(sdata, maddr) - sdata :
43129+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43130 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43131 be64_to_cpu(ateth->compare_data),
43132 sdata);
43133diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43134index 1f95bba..9530f87 100644
43135--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43136+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43137@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43138 unsigned long flags;
43139 struct ib_wc wc;
43140 u64 sdata;
43141- atomic64_t *maddr;
43142+ atomic64_unchecked_t *maddr;
43143 enum ib_wc_status send_status;
43144
43145 /*
43146@@ -382,11 +382,11 @@ again:
43147 IB_ACCESS_REMOTE_ATOMIC)))
43148 goto acc_err;
43149 /* Perform atomic OP and save result. */
43150- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43151+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43152 sdata = wqe->wr.wr.atomic.compare_add;
43153 *(u64 *) sqp->s_sge.sge.vaddr =
43154 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43155- (u64) atomic64_add_return(sdata, maddr) - sdata :
43156+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43157 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43158 sdata, wqe->wr.wr.atomic.swap);
43159 goto send_comp;
43160diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43161index 9cd2b00..7486df4 100644
43162--- a/drivers/infiniband/hw/mlx4/mad.c
43163+++ b/drivers/infiniband/hw/mlx4/mad.c
43164@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43165
43166 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43167 {
43168- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43169+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43170 cpu_to_be64(0xff00000000000000LL);
43171 }
43172
43173diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43174index ed327e6..ca1739e0 100644
43175--- a/drivers/infiniband/hw/mlx4/mcg.c
43176+++ b/drivers/infiniband/hw/mlx4/mcg.c
43177@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43178 {
43179 char name[20];
43180
43181- atomic_set(&ctx->tid, 0);
43182+ atomic_set_unchecked(&ctx->tid, 0);
43183 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43184 ctx->mcg_wq = create_singlethread_workqueue(name);
43185 if (!ctx->mcg_wq)
43186diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43187index fce39343..9d8fdff 100644
43188--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43189+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43190@@ -435,7 +435,7 @@ struct mlx4_ib_demux_ctx {
43191 struct list_head mcg_mgid0_list;
43192 struct workqueue_struct *mcg_wq;
43193 struct mlx4_ib_demux_pv_ctx **tun;
43194- atomic_t tid;
43195+ atomic_unchecked_t tid;
43196 int flushing; /* flushing the work queue */
43197 };
43198
43199diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43200index 9d3e5c1..6f166df 100644
43201--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43202+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43203@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43204 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43205 }
43206
43207-int mthca_QUERY_FW(struct mthca_dev *dev)
43208+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43209 {
43210 struct mthca_mailbox *mailbox;
43211 u32 *outbox;
43212@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43213 CMD_TIME_CLASS_B);
43214 }
43215
43216-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43217+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43218 int num_mtt)
43219 {
43220 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43221@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43222 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43223 }
43224
43225-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43226+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43227 int eq_num)
43228 {
43229 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43230@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43231 CMD_TIME_CLASS_B);
43232 }
43233
43234-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43235+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43236 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43237 void *in_mad, void *response_mad)
43238 {
43239diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43240index ded76c1..0cf0a08 100644
43241--- a/drivers/infiniband/hw/mthca/mthca_main.c
43242+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43243@@ -692,7 +692,7 @@ err_close:
43244 return err;
43245 }
43246
43247-static int mthca_setup_hca(struct mthca_dev *dev)
43248+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43249 {
43250 int err;
43251
43252diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43253index ed9a989..6aa5dc2 100644
43254--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43255+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43256@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43257 * through the bitmaps)
43258 */
43259
43260-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43261+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43262 {
43263 int o;
43264 int m;
43265@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43266 return key;
43267 }
43268
43269-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43270+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43271 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43272 {
43273 struct mthca_mailbox *mailbox;
43274@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43275 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43276 }
43277
43278-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43279+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43280 u64 *buffer_list, int buffer_size_shift,
43281 int list_len, u64 iova, u64 total_size,
43282 u32 access, struct mthca_mr *mr)
43283diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43284index 415f8e1..e34214e 100644
43285--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43286+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43287@@ -764,7 +764,7 @@ unlock:
43288 return 0;
43289 }
43290
43291-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43292+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43293 {
43294 struct mthca_dev *dev = to_mdev(ibcq->device);
43295 struct mthca_cq *cq = to_mcq(ibcq);
43296diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43297index 9f9d5c5..3c19aac 100644
43298--- a/drivers/infiniband/hw/nes/nes.c
43299+++ b/drivers/infiniband/hw/nes/nes.c
43300@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43301 LIST_HEAD(nes_adapter_list);
43302 static LIST_HEAD(nes_dev_list);
43303
43304-atomic_t qps_destroyed;
43305+atomic_unchecked_t qps_destroyed;
43306
43307 static unsigned int ee_flsh_adapter;
43308 static unsigned int sysfs_nonidx_addr;
43309@@ -279,7 +279,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43310 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43311 struct nes_adapter *nesadapter = nesdev->nesadapter;
43312
43313- atomic_inc(&qps_destroyed);
43314+ atomic_inc_unchecked(&qps_destroyed);
43315
43316 /* Free the control structures */
43317
43318diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43319index bd9d132..70d84f4 100644
43320--- a/drivers/infiniband/hw/nes/nes.h
43321+++ b/drivers/infiniband/hw/nes/nes.h
43322@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43323 extern unsigned int wqm_quanta;
43324 extern struct list_head nes_adapter_list;
43325
43326-extern atomic_t cm_connects;
43327-extern atomic_t cm_accepts;
43328-extern atomic_t cm_disconnects;
43329-extern atomic_t cm_closes;
43330-extern atomic_t cm_connecteds;
43331-extern atomic_t cm_connect_reqs;
43332-extern atomic_t cm_rejects;
43333-extern atomic_t mod_qp_timouts;
43334-extern atomic_t qps_created;
43335-extern atomic_t qps_destroyed;
43336-extern atomic_t sw_qps_destroyed;
43337+extern atomic_unchecked_t cm_connects;
43338+extern atomic_unchecked_t cm_accepts;
43339+extern atomic_unchecked_t cm_disconnects;
43340+extern atomic_unchecked_t cm_closes;
43341+extern atomic_unchecked_t cm_connecteds;
43342+extern atomic_unchecked_t cm_connect_reqs;
43343+extern atomic_unchecked_t cm_rejects;
43344+extern atomic_unchecked_t mod_qp_timouts;
43345+extern atomic_unchecked_t qps_created;
43346+extern atomic_unchecked_t qps_destroyed;
43347+extern atomic_unchecked_t sw_qps_destroyed;
43348 extern u32 mh_detected;
43349 extern u32 mh_pauses_sent;
43350 extern u32 cm_packets_sent;
43351@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43352 extern u32 cm_packets_received;
43353 extern u32 cm_packets_dropped;
43354 extern u32 cm_packets_retrans;
43355-extern atomic_t cm_listens_created;
43356-extern atomic_t cm_listens_destroyed;
43357+extern atomic_unchecked_t cm_listens_created;
43358+extern atomic_unchecked_t cm_listens_destroyed;
43359 extern u32 cm_backlog_drops;
43360-extern atomic_t cm_loopbacks;
43361-extern atomic_t cm_nodes_created;
43362-extern atomic_t cm_nodes_destroyed;
43363-extern atomic_t cm_accel_dropped_pkts;
43364-extern atomic_t cm_resets_recvd;
43365-extern atomic_t pau_qps_created;
43366-extern atomic_t pau_qps_destroyed;
43367+extern atomic_unchecked_t cm_loopbacks;
43368+extern atomic_unchecked_t cm_nodes_created;
43369+extern atomic_unchecked_t cm_nodes_destroyed;
43370+extern atomic_unchecked_t cm_accel_dropped_pkts;
43371+extern atomic_unchecked_t cm_resets_recvd;
43372+extern atomic_unchecked_t pau_qps_created;
43373+extern atomic_unchecked_t pau_qps_destroyed;
43374
43375 extern u32 int_mod_timer_init;
43376 extern u32 int_mod_cq_depth_256;
43377diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43378index 72b4341..2600332 100644
43379--- a/drivers/infiniband/hw/nes/nes_cm.c
43380+++ b/drivers/infiniband/hw/nes/nes_cm.c
43381@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43382 u32 cm_packets_retrans;
43383 u32 cm_packets_created;
43384 u32 cm_packets_received;
43385-atomic_t cm_listens_created;
43386-atomic_t cm_listens_destroyed;
43387+atomic_unchecked_t cm_listens_created;
43388+atomic_unchecked_t cm_listens_destroyed;
43389 u32 cm_backlog_drops;
43390-atomic_t cm_loopbacks;
43391-atomic_t cm_nodes_created;
43392-atomic_t cm_nodes_destroyed;
43393-atomic_t cm_accel_dropped_pkts;
43394-atomic_t cm_resets_recvd;
43395+atomic_unchecked_t cm_loopbacks;
43396+atomic_unchecked_t cm_nodes_created;
43397+atomic_unchecked_t cm_nodes_destroyed;
43398+atomic_unchecked_t cm_accel_dropped_pkts;
43399+atomic_unchecked_t cm_resets_recvd;
43400
43401 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43402 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43403@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43404 /* instance of function pointers for client API */
43405 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43406 static struct nes_cm_ops nes_cm_api = {
43407- mini_cm_accelerated,
43408- mini_cm_listen,
43409- mini_cm_del_listen,
43410- mini_cm_connect,
43411- mini_cm_close,
43412- mini_cm_accept,
43413- mini_cm_reject,
43414- mini_cm_recv_pkt,
43415- mini_cm_dealloc_core,
43416- mini_cm_get,
43417- mini_cm_set
43418+ .accelerated = mini_cm_accelerated,
43419+ .listen = mini_cm_listen,
43420+ .stop_listener = mini_cm_del_listen,
43421+ .connect = mini_cm_connect,
43422+ .close = mini_cm_close,
43423+ .accept = mini_cm_accept,
43424+ .reject = mini_cm_reject,
43425+ .recv_pkt = mini_cm_recv_pkt,
43426+ .destroy_cm_core = mini_cm_dealloc_core,
43427+ .get = mini_cm_get,
43428+ .set = mini_cm_set
43429 };
43430
43431 static struct nes_cm_core *g_cm_core;
43432
43433-atomic_t cm_connects;
43434-atomic_t cm_accepts;
43435-atomic_t cm_disconnects;
43436-atomic_t cm_closes;
43437-atomic_t cm_connecteds;
43438-atomic_t cm_connect_reqs;
43439-atomic_t cm_rejects;
43440+atomic_unchecked_t cm_connects;
43441+atomic_unchecked_t cm_accepts;
43442+atomic_unchecked_t cm_disconnects;
43443+atomic_unchecked_t cm_closes;
43444+atomic_unchecked_t cm_connecteds;
43445+atomic_unchecked_t cm_connect_reqs;
43446+atomic_unchecked_t cm_rejects;
43447
43448 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43449 {
43450@@ -1461,7 +1461,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43451 kfree(listener);
43452 listener = NULL;
43453 ret = 0;
43454- atomic_inc(&cm_listens_destroyed);
43455+ atomic_inc_unchecked(&cm_listens_destroyed);
43456 } else {
43457 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43458 }
43459@@ -1667,7 +1667,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43460 cm_node->rem_mac);
43461
43462 add_hte_node(cm_core, cm_node);
43463- atomic_inc(&cm_nodes_created);
43464+ atomic_inc_unchecked(&cm_nodes_created);
43465
43466 return cm_node;
43467 }
43468@@ -1728,7 +1728,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43469 }
43470
43471 atomic_dec(&cm_core->node_cnt);
43472- atomic_inc(&cm_nodes_destroyed);
43473+ atomic_inc_unchecked(&cm_nodes_destroyed);
43474 nesqp = cm_node->nesqp;
43475 if (nesqp) {
43476 nesqp->cm_node = NULL;
43477@@ -1792,7 +1792,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43478
43479 static void drop_packet(struct sk_buff *skb)
43480 {
43481- atomic_inc(&cm_accel_dropped_pkts);
43482+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43483 dev_kfree_skb_any(skb);
43484 }
43485
43486@@ -1855,7 +1855,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43487 {
43488
43489 int reset = 0; /* whether to send reset in case of err.. */
43490- atomic_inc(&cm_resets_recvd);
43491+ atomic_inc_unchecked(&cm_resets_recvd);
43492 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43493 " refcnt=%d\n", cm_node, cm_node->state,
43494 atomic_read(&cm_node->ref_count));
43495@@ -2523,7 +2523,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43496 rem_ref_cm_node(cm_node->cm_core, cm_node);
43497 return NULL;
43498 }
43499- atomic_inc(&cm_loopbacks);
43500+ atomic_inc_unchecked(&cm_loopbacks);
43501 loopbackremotenode->loopbackpartner = cm_node;
43502 loopbackremotenode->tcp_cntxt.rcv_wscale =
43503 NES_CM_DEFAULT_RCV_WND_SCALE;
43504@@ -2804,7 +2804,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43505 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43506 else {
43507 rem_ref_cm_node(cm_core, cm_node);
43508- atomic_inc(&cm_accel_dropped_pkts);
43509+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43510 dev_kfree_skb_any(skb);
43511 }
43512 break;
43513@@ -3112,7 +3112,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43514
43515 if ((cm_id) && (cm_id->event_handler)) {
43516 if (issue_disconn) {
43517- atomic_inc(&cm_disconnects);
43518+ atomic_inc_unchecked(&cm_disconnects);
43519 cm_event.event = IW_CM_EVENT_DISCONNECT;
43520 cm_event.status = disconn_status;
43521 cm_event.local_addr = cm_id->local_addr;
43522@@ -3134,7 +3134,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43523 }
43524
43525 if (issue_close) {
43526- atomic_inc(&cm_closes);
43527+ atomic_inc_unchecked(&cm_closes);
43528 nes_disconnect(nesqp, 1);
43529
43530 cm_id->provider_data = nesqp;
43531@@ -3272,7 +3272,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43532
43533 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43534 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43535- atomic_inc(&cm_accepts);
43536+ atomic_inc_unchecked(&cm_accepts);
43537
43538 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43539 netdev_refcnt_read(nesvnic->netdev));
43540@@ -3470,7 +3470,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43541 struct nes_cm_core *cm_core;
43542 u8 *start_buff;
43543
43544- atomic_inc(&cm_rejects);
43545+ atomic_inc_unchecked(&cm_rejects);
43546 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43547 loopback = cm_node->loopbackpartner;
43548 cm_core = cm_node->cm_core;
43549@@ -3535,7 +3535,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43550 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43551 ntohs(laddr->sin_port));
43552
43553- atomic_inc(&cm_connects);
43554+ atomic_inc_unchecked(&cm_connects);
43555 nesqp->active_conn = 1;
43556
43557 /* cache the cm_id in the qp */
43558@@ -3680,7 +3680,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43559 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43560 return err;
43561 }
43562- atomic_inc(&cm_listens_created);
43563+ atomic_inc_unchecked(&cm_listens_created);
43564 }
43565
43566 cm_id->add_ref(cm_id);
43567@@ -3787,7 +3787,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43568
43569 if (nesqp->destroyed)
43570 return;
43571- atomic_inc(&cm_connecteds);
43572+ atomic_inc_unchecked(&cm_connecteds);
43573 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43574 " local port 0x%04X. jiffies = %lu.\n",
43575 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43576@@ -3972,7 +3972,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43577
43578 cm_id->add_ref(cm_id);
43579 ret = cm_id->event_handler(cm_id, &cm_event);
43580- atomic_inc(&cm_closes);
43581+ atomic_inc_unchecked(&cm_closes);
43582 cm_event.event = IW_CM_EVENT_CLOSE;
43583 cm_event.status = 0;
43584 cm_event.provider_data = cm_id->provider_data;
43585@@ -4012,7 +4012,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43586 return;
43587 cm_id = cm_node->cm_id;
43588
43589- atomic_inc(&cm_connect_reqs);
43590+ atomic_inc_unchecked(&cm_connect_reqs);
43591 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43592 cm_node, cm_id, jiffies);
43593
43594@@ -4061,7 +4061,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43595 return;
43596 cm_id = cm_node->cm_id;
43597
43598- atomic_inc(&cm_connect_reqs);
43599+ atomic_inc_unchecked(&cm_connect_reqs);
43600 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43601 cm_node, cm_id, jiffies);
43602
43603diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43604index 4166452..fc952c3 100644
43605--- a/drivers/infiniband/hw/nes/nes_mgt.c
43606+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43607@@ -40,8 +40,8 @@
43608 #include "nes.h"
43609 #include "nes_mgt.h"
43610
43611-atomic_t pau_qps_created;
43612-atomic_t pau_qps_destroyed;
43613+atomic_unchecked_t pau_qps_created;
43614+atomic_unchecked_t pau_qps_destroyed;
43615
43616 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43617 {
43618@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43619 {
43620 struct sk_buff *skb;
43621 unsigned long flags;
43622- atomic_inc(&pau_qps_destroyed);
43623+ atomic_inc_unchecked(&pau_qps_destroyed);
43624
43625 /* Free packets that have not yet been forwarded */
43626 /* Lock is acquired by skb_dequeue when removing the skb */
43627@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43628 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43629 skb_queue_head_init(&nesqp->pau_list);
43630 spin_lock_init(&nesqp->pau_lock);
43631- atomic_inc(&pau_qps_created);
43632+ atomic_inc_unchecked(&pau_qps_created);
43633 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43634 }
43635
43636diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43637index 70acda9..a96de9d 100644
43638--- a/drivers/infiniband/hw/nes/nes_nic.c
43639+++ b/drivers/infiniband/hw/nes/nes_nic.c
43640@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43641 target_stat_values[++index] = mh_detected;
43642 target_stat_values[++index] = mh_pauses_sent;
43643 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43644- target_stat_values[++index] = atomic_read(&cm_connects);
43645- target_stat_values[++index] = atomic_read(&cm_accepts);
43646- target_stat_values[++index] = atomic_read(&cm_disconnects);
43647- target_stat_values[++index] = atomic_read(&cm_connecteds);
43648- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43649- target_stat_values[++index] = atomic_read(&cm_rejects);
43650- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43651- target_stat_values[++index] = atomic_read(&qps_created);
43652- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43653- target_stat_values[++index] = atomic_read(&qps_destroyed);
43654- target_stat_values[++index] = atomic_read(&cm_closes);
43655+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43656+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43657+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43658+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43659+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43660+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43661+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43662+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43663+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43664+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43665+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43666 target_stat_values[++index] = cm_packets_sent;
43667 target_stat_values[++index] = cm_packets_bounced;
43668 target_stat_values[++index] = cm_packets_created;
43669 target_stat_values[++index] = cm_packets_received;
43670 target_stat_values[++index] = cm_packets_dropped;
43671 target_stat_values[++index] = cm_packets_retrans;
43672- target_stat_values[++index] = atomic_read(&cm_listens_created);
43673- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43674+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43675+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43676 target_stat_values[++index] = cm_backlog_drops;
43677- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43678- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43679- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43680- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43681- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43682+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43683+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43684+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43685+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43686+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43687 target_stat_values[++index] = nesadapter->free_4kpbl;
43688 target_stat_values[++index] = nesadapter->free_256pbl;
43689 target_stat_values[++index] = int_mod_timer_init;
43690 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43691 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43692 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43693- target_stat_values[++index] = atomic_read(&pau_qps_created);
43694- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43695+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43696+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43697 }
43698
43699 /**
43700diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43701index c0d0296..3185f57 100644
43702--- a/drivers/infiniband/hw/nes/nes_verbs.c
43703+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43704@@ -46,9 +46,9 @@
43705
43706 #include <rdma/ib_umem.h>
43707
43708-atomic_t mod_qp_timouts;
43709-atomic_t qps_created;
43710-atomic_t sw_qps_destroyed;
43711+atomic_unchecked_t mod_qp_timouts;
43712+atomic_unchecked_t qps_created;
43713+atomic_unchecked_t sw_qps_destroyed;
43714
43715 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43716
43717@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43718 if (init_attr->create_flags)
43719 return ERR_PTR(-EINVAL);
43720
43721- atomic_inc(&qps_created);
43722+ atomic_inc_unchecked(&qps_created);
43723 switch (init_attr->qp_type) {
43724 case IB_QPT_RC:
43725 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43726@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43727 struct iw_cm_event cm_event;
43728 int ret = 0;
43729
43730- atomic_inc(&sw_qps_destroyed);
43731+ atomic_inc_unchecked(&sw_qps_destroyed);
43732 nesqp->destroyed = 1;
43733
43734 /* Blow away the connection if it exists. */
43735diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43736index 7df16f7..7e1b21e 100644
43737--- a/drivers/infiniband/hw/qib/qib.h
43738+++ b/drivers/infiniband/hw/qib/qib.h
43739@@ -52,6 +52,7 @@
43740 #include <linux/kref.h>
43741 #include <linux/sched.h>
43742 #include <linux/kthread.h>
43743+#include <linux/slab.h>
43744
43745 #include "qib_common.h"
43746 #include "qib_verbs.h"
43747diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43748index cdc7df4..a2fdfdb 100644
43749--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43750+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43751@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43752 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43753 }
43754
43755-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43756+static struct rtnl_link_ops ipoib_link_ops = {
43757 .kind = "ipoib",
43758 .maxtype = IFLA_IPOIB_MAX,
43759 .policy = ipoib_policy,
43760diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43761index e853a21..56fc5a8 100644
43762--- a/drivers/input/gameport/gameport.c
43763+++ b/drivers/input/gameport/gameport.c
43764@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43765 */
43766 static void gameport_init_port(struct gameport *gameport)
43767 {
43768- static atomic_t gameport_no = ATOMIC_INIT(-1);
43769+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
43770
43771 __module_get(THIS_MODULE);
43772
43773 mutex_init(&gameport->drv_mutex);
43774 device_initialize(&gameport->dev);
43775 dev_set_name(&gameport->dev, "gameport%lu",
43776- (unsigned long)atomic_inc_return(&gameport_no));
43777+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
43778 gameport->dev.bus = &gameport_bus;
43779 gameport->dev.release = gameport_release_port;
43780 if (gameport->parent)
43781diff --git a/drivers/input/input.c b/drivers/input/input.c
43782index cc357f1..ee42fbc 100644
43783--- a/drivers/input/input.c
43784+++ b/drivers/input/input.c
43785@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
43786 */
43787 struct input_dev *input_allocate_device(void)
43788 {
43789- static atomic_t input_no = ATOMIC_INIT(-1);
43790+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
43791 struct input_dev *dev;
43792
43793 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43794@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
43795 INIT_LIST_HEAD(&dev->node);
43796
43797 dev_set_name(&dev->dev, "input%lu",
43798- (unsigned long)atomic_inc_return(&input_no));
43799+ (unsigned long)atomic_inc_return_unchecked(&input_no));
43800
43801 __module_get(THIS_MODULE);
43802 }
43803diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43804index 4a95b22..874c182 100644
43805--- a/drivers/input/joystick/sidewinder.c
43806+++ b/drivers/input/joystick/sidewinder.c
43807@@ -30,6 +30,7 @@
43808 #include <linux/kernel.h>
43809 #include <linux/module.h>
43810 #include <linux/slab.h>
43811+#include <linux/sched.h>
43812 #include <linux/input.h>
43813 #include <linux/gameport.h>
43814 #include <linux/jiffies.h>
43815diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43816index 61c7611..e1bfa38 100644
43817--- a/drivers/input/joystick/xpad.c
43818+++ b/drivers/input/joystick/xpad.c
43819@@ -905,7 +905,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43820
43821 static int xpad_led_probe(struct usb_xpad *xpad)
43822 {
43823- static atomic_t led_seq = ATOMIC_INIT(-1);
43824+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
43825 unsigned long led_no;
43826 struct xpad_led *led;
43827 struct led_classdev *led_cdev;
43828@@ -918,7 +918,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43829 if (!led)
43830 return -ENOMEM;
43831
43832- led_no = atomic_inc_return(&led_seq);
43833+ led_no = atomic_inc_return_unchecked(&led_seq);
43834
43835 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
43836 led->xpad = xpad;
43837diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43838index ac1fa5f..5f7502c 100644
43839--- a/drivers/input/misc/ims-pcu.c
43840+++ b/drivers/input/misc/ims-pcu.c
43841@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43842
43843 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43844 {
43845- static atomic_t device_no = ATOMIC_INIT(-1);
43846+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
43847
43848 const struct ims_pcu_device_info *info;
43849 int error;
43850@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43851 }
43852
43853 /* Device appears to be operable, complete initialization */
43854- pcu->device_no = atomic_inc_return(&device_no);
43855+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
43856
43857 /*
43858 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43859diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43860index ad5a5a1..5eac214 100644
43861--- a/drivers/input/mouse/psmouse.h
43862+++ b/drivers/input/mouse/psmouse.h
43863@@ -125,7 +125,7 @@ struct psmouse_attribute {
43864 ssize_t (*set)(struct psmouse *psmouse, void *data,
43865 const char *buf, size_t count);
43866 bool protect;
43867-};
43868+} __do_const;
43869 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43870
43871 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43872diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43873index b604564..3f14ae4 100644
43874--- a/drivers/input/mousedev.c
43875+++ b/drivers/input/mousedev.c
43876@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43877
43878 spin_unlock_irq(&client->packet_lock);
43879
43880- if (copy_to_user(buffer, data, count))
43881+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
43882 return -EFAULT;
43883
43884 return count;
43885diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43886index a05a517..323a2fd 100644
43887--- a/drivers/input/serio/serio.c
43888+++ b/drivers/input/serio/serio.c
43889@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43890 */
43891 static void serio_init_port(struct serio *serio)
43892 {
43893- static atomic_t serio_no = ATOMIC_INIT(-1);
43894+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
43895
43896 __module_get(THIS_MODULE);
43897
43898@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43899 mutex_init(&serio->drv_mutex);
43900 device_initialize(&serio->dev);
43901 dev_set_name(&serio->dev, "serio%lu",
43902- (unsigned long)atomic_inc_return(&serio_no));
43903+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
43904 serio->dev.bus = &serio_bus;
43905 serio->dev.release = serio_release_port;
43906 serio->dev.groups = serio_device_attr_groups;
43907diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43908index 71ef5d6..93380a9 100644
43909--- a/drivers/input/serio/serio_raw.c
43910+++ b/drivers/input/serio/serio_raw.c
43911@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43912
43913 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43914 {
43915- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
43916+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
43917 struct serio_raw *serio_raw;
43918 int err;
43919
43920@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43921 }
43922
43923 snprintf(serio_raw->name, sizeof(serio_raw->name),
43924- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
43925+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
43926 kref_init(&serio_raw->kref);
43927 INIT_LIST_HEAD(&serio_raw->client_list);
43928 init_waitqueue_head(&serio_raw->wait);
43929diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
43930index 92e2243..8fd9092 100644
43931--- a/drivers/input/touchscreen/htcpen.c
43932+++ b/drivers/input/touchscreen/htcpen.c
43933@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
43934 }
43935 };
43936
43937-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
43938+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
43939 {
43940 .ident = "Shift",
43941 .matches = {
43942diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43943index ca9f4ed..b860ff1 100644
43944--- a/drivers/iommu/amd_iommu.c
43945+++ b/drivers/iommu/amd_iommu.c
43946@@ -829,11 +829,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43947
43948 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43949 {
43950+ phys_addr_t physaddr;
43951 WARN_ON(address & 0x7ULL);
43952
43953 memset(cmd, 0, sizeof(*cmd));
43954- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43955- cmd->data[1] = upper_32_bits(__pa(address));
43956+
43957+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43958+ if (object_starts_on_stack((void *)address)) {
43959+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43960+ physaddr = __pa((u64)adjbuf);
43961+ } else
43962+#endif
43963+ physaddr = __pa(address);
43964+
43965+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43966+ cmd->data[1] = upper_32_bits(physaddr);
43967 cmd->data[2] = 1;
43968 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43969 }
43970diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43971index 65075ef..53823f9 100644
43972--- a/drivers/iommu/arm-smmu.c
43973+++ b/drivers/iommu/arm-smmu.c
43974@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
43975
43976 struct arm_smmu_domain {
43977 struct arm_smmu_device *smmu;
43978- struct io_pgtable_ops *pgtbl_ops;
43979+ struct io_pgtable *pgtbl;
43980 spinlock_t pgtbl_lock;
43981 struct arm_smmu_cfg cfg;
43982 enum arm_smmu_domain_stage stage;
43983@@ -817,7 +817,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43984 {
43985 int irq, start, ret = 0;
43986 unsigned long ias, oas;
43987- struct io_pgtable_ops *pgtbl_ops;
43988+ struct io_pgtable *pgtbl;
43989 struct io_pgtable_cfg pgtbl_cfg;
43990 enum io_pgtable_fmt fmt;
43991 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
43992@@ -902,14 +902,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43993 };
43994
43995 smmu_domain->smmu = smmu;
43996- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
43997- if (!pgtbl_ops) {
43998+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
43999+ if (!pgtbl) {
44000 ret = -ENOMEM;
44001 goto out_clear_smmu;
44002 }
44003
44004 /* Update our support page sizes to reflect the page table format */
44005- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44006+ pax_open_kernel();
44007+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44008+ pax_close_kernel();
44009
44010 /* Initialise the context bank with our page table cfg */
44011 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
44012@@ -930,7 +932,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44013 mutex_unlock(&smmu_domain->init_mutex);
44014
44015 /* Publish page table ops for map/unmap */
44016- smmu_domain->pgtbl_ops = pgtbl_ops;
44017+ smmu_domain->pgtbl = pgtbl;
44018 return 0;
44019
44020 out_clear_smmu:
44021@@ -963,8 +965,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
44022 free_irq(irq, domain);
44023 }
44024
44025- if (smmu_domain->pgtbl_ops)
44026- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
44027+ free_io_pgtable(smmu_domain->pgtbl);
44028
44029 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
44030 }
44031@@ -1190,13 +1191,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
44032 int ret;
44033 unsigned long flags;
44034 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44035- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44036+ struct io_pgtable *iop = smmu_domain->pgtbl;
44037
44038- if (!ops)
44039+ if (!iop)
44040 return -ENODEV;
44041
44042 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44043- ret = ops->map(ops, iova, paddr, size, prot);
44044+ ret = iop->ops->map(iop, iova, paddr, size, prot);
44045 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44046 return ret;
44047 }
44048@@ -1207,13 +1208,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
44049 size_t ret;
44050 unsigned long flags;
44051 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44052- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44053+ struct io_pgtable *iop = smmu_domain->pgtbl;
44054
44055- if (!ops)
44056+ if (!iop)
44057 return 0;
44058
44059 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44060- ret = ops->unmap(ops, iova, size);
44061+ ret = iop->ops->unmap(iop, iova, size);
44062 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44063 return ret;
44064 }
44065@@ -1224,7 +1225,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44066 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44067 struct arm_smmu_device *smmu = smmu_domain->smmu;
44068 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
44069- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44070+ struct io_pgtable *iop = smmu_domain->pgtbl;
44071 struct device *dev = smmu->dev;
44072 void __iomem *cb_base;
44073 u32 tmp;
44074@@ -1247,7 +1248,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44075 dev_err(dev,
44076 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
44077 &iova);
44078- return ops->iova_to_phys(ops, iova);
44079+ return iop->ops->iova_to_phys(iop, iova);
44080 }
44081
44082 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44083@@ -1268,9 +1269,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44084 phys_addr_t ret;
44085 unsigned long flags;
44086 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44087- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44088+ struct io_pgtable *iop = smmu_domain->pgtbl;
44089
44090- if (!ops)
44091+ if (!iop)
44092 return 0;
44093
44094 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44095@@ -1278,7 +1279,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44096 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44097 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44098 } else {
44099- ret = ops->iova_to_phys(ops, iova);
44100+ ret = iop->ops->iova_to_phys(iop, iova);
44101 }
44102
44103 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44104@@ -1668,7 +1669,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44105 size |= SZ_64K | SZ_512M;
44106 }
44107
44108- arm_smmu_ops.pgsize_bitmap &= size;
44109+ pax_open_kernel();
44110+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44111+ pax_close_kernel();
44112 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44113
44114 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44115diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44116index 4e46021..f0a24fef 100644
44117--- a/drivers/iommu/io-pgtable-arm.c
44118+++ b/drivers/iommu/io-pgtable-arm.c
44119@@ -36,12 +36,6 @@
44120 #define io_pgtable_to_data(x) \
44121 container_of((x), struct arm_lpae_io_pgtable, iop)
44122
44123-#define io_pgtable_ops_to_pgtable(x) \
44124- container_of((x), struct io_pgtable, ops)
44125-
44126-#define io_pgtable_ops_to_data(x) \
44127- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44128-
44129 /*
44130 * For consistency with the architecture, we always consider
44131 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44132@@ -304,10 +298,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44133 return pte;
44134 }
44135
44136-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44137+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44138 phys_addr_t paddr, size_t size, int iommu_prot)
44139 {
44140- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44141+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44142 arm_lpae_iopte *ptep = data->pgd;
44143 int lvl = ARM_LPAE_START_LVL(data);
44144 arm_lpae_iopte prot;
44145@@ -447,12 +441,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44146 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44147 }
44148
44149-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44150+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44151 size_t size)
44152 {
44153 size_t unmapped;
44154- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44155- struct io_pgtable *iop = &data->iop;
44156+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44157 arm_lpae_iopte *ptep = data->pgd;
44158 int lvl = ARM_LPAE_START_LVL(data);
44159
44160@@ -463,10 +456,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44161 return unmapped;
44162 }
44163
44164-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44165+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44166 unsigned long iova)
44167 {
44168- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44169+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44170 arm_lpae_iopte pte, *ptep = data->pgd;
44171 int lvl = ARM_LPAE_START_LVL(data);
44172
44173@@ -533,6 +526,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44174 }
44175 }
44176
44177+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44178+ .map = arm_lpae_map,
44179+ .unmap = arm_lpae_unmap,
44180+ .iova_to_phys = arm_lpae_iova_to_phys,
44181+};
44182+
44183 static struct arm_lpae_io_pgtable *
44184 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44185 {
44186@@ -564,11 +563,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44187 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44188 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44189
44190- data->iop.ops = (struct io_pgtable_ops) {
44191- .map = arm_lpae_map,
44192- .unmap = arm_lpae_unmap,
44193- .iova_to_phys = arm_lpae_iova_to_phys,
44194- };
44195+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44196
44197 return data;
44198 }
44199@@ -830,9 +825,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44200 .flush_pgtable = dummy_flush_pgtable,
44201 };
44202
44203-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44204+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44205 {
44206- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44207+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44208 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44209
44210 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44211@@ -842,9 +837,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44212 data->bits_per_level, data->pgd);
44213 }
44214
44215-#define __FAIL(ops, i) ({ \
44216+#define __FAIL(iop, i) ({ \
44217 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44218- arm_lpae_dump_ops(ops); \
44219+ arm_lpae_dump_ops(iop); \
44220 selftest_running = false; \
44221 -EFAULT; \
44222 })
44223@@ -859,30 +854,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44224 int i, j;
44225 unsigned long iova;
44226 size_t size;
44227- struct io_pgtable_ops *ops;
44228+ struct io_pgtable *iop;
44229+ const struct io_pgtable_ops *ops;
44230
44231 selftest_running = true;
44232
44233 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44234 cfg_cookie = cfg;
44235- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44236- if (!ops) {
44237+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44238+ if (!iop) {
44239 pr_err("selftest: failed to allocate io pgtable ops\n");
44240 return -ENOMEM;
44241 }
44242+ ops = iop->ops;
44243
44244 /*
44245 * Initial sanity checks.
44246 * Empty page tables shouldn't provide any translations.
44247 */
44248- if (ops->iova_to_phys(ops, 42))
44249- return __FAIL(ops, i);
44250+ if (ops->iova_to_phys(iop, 42))
44251+ return __FAIL(iop, i);
44252
44253- if (ops->iova_to_phys(ops, SZ_1G + 42))
44254- return __FAIL(ops, i);
44255+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44256+ return __FAIL(iop, i);
44257
44258- if (ops->iova_to_phys(ops, SZ_2G + 42))
44259- return __FAIL(ops, i);
44260+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44261+ return __FAIL(iop, i);
44262
44263 /*
44264 * Distinct mappings of different granule sizes.
44265@@ -892,19 +889,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44266 while (j != BITS_PER_LONG) {
44267 size = 1UL << j;
44268
44269- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44270+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44271 IOMMU_WRITE |
44272 IOMMU_NOEXEC |
44273 IOMMU_CACHE))
44274- return __FAIL(ops, i);
44275+ return __FAIL(iop, i);
44276
44277 /* Overlapping mappings */
44278- if (!ops->map(ops, iova, iova + size, size,
44279+ if (!ops->map(iop, iova, iova + size, size,
44280 IOMMU_READ | IOMMU_NOEXEC))
44281- return __FAIL(ops, i);
44282+ return __FAIL(iop, i);
44283
44284- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44285- return __FAIL(ops, i);
44286+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44287+ return __FAIL(iop, i);
44288
44289 iova += SZ_1G;
44290 j++;
44291@@ -913,15 +910,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44292
44293 /* Partial unmap */
44294 size = 1UL << __ffs(cfg->pgsize_bitmap);
44295- if (ops->unmap(ops, SZ_1G + size, size) != size)
44296- return __FAIL(ops, i);
44297+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44298+ return __FAIL(iop, i);
44299
44300 /* Remap of partial unmap */
44301- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44302- return __FAIL(ops, i);
44303+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44304+ return __FAIL(iop, i);
44305
44306- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44307- return __FAIL(ops, i);
44308+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44309+ return __FAIL(iop, i);
44310
44311 /* Full unmap */
44312 iova = 0;
44313@@ -929,25 +926,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44314 while (j != BITS_PER_LONG) {
44315 size = 1UL << j;
44316
44317- if (ops->unmap(ops, iova, size) != size)
44318- return __FAIL(ops, i);
44319+ if (ops->unmap(iop, iova, size) != size)
44320+ return __FAIL(iop, i);
44321
44322- if (ops->iova_to_phys(ops, iova + 42))
44323- return __FAIL(ops, i);
44324+ if (ops->iova_to_phys(iop, iova + 42))
44325+ return __FAIL(iop, i);
44326
44327 /* Remap full block */
44328- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44329- return __FAIL(ops, i);
44330+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44331+ return __FAIL(iop, i);
44332
44333- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44334- return __FAIL(ops, i);
44335+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44336+ return __FAIL(iop, i);
44337
44338 iova += SZ_1G;
44339 j++;
44340 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44341 }
44342
44343- free_io_pgtable_ops(ops);
44344+ free_io_pgtable(iop);
44345 }
44346
44347 selftest_running = false;
44348diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44349index 6436fe2..088c965 100644
44350--- a/drivers/iommu/io-pgtable.c
44351+++ b/drivers/iommu/io-pgtable.c
44352@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44353 #endif
44354 };
44355
44356-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44357+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44358 struct io_pgtable_cfg *cfg,
44359 void *cookie)
44360 {
44361@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44362 iop->cookie = cookie;
44363 iop->cfg = *cfg;
44364
44365- return &iop->ops;
44366+ return iop;
44367 }
44368
44369 /*
44370 * It is the IOMMU driver's responsibility to ensure that the page table
44371 * is no longer accessible to the walker by this point.
44372 */
44373-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44374+void free_io_pgtable(struct io_pgtable *iop)
44375 {
44376- struct io_pgtable *iop;
44377-
44378- if (!ops)
44379+ if (!iop)
44380 return;
44381
44382- iop = container_of(ops, struct io_pgtable, ops);
44383 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44384 io_pgtable_init_table[iop->fmt]->free(iop);
44385 }
44386diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44387index 10e32f6..0b276c8 100644
44388--- a/drivers/iommu/io-pgtable.h
44389+++ b/drivers/iommu/io-pgtable.h
44390@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44391 * These functions map directly onto the iommu_ops member functions with
44392 * the same names.
44393 */
44394+struct io_pgtable;
44395 struct io_pgtable_ops {
44396- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44397+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44398 phys_addr_t paddr, size_t size, int prot);
44399- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44400+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44401 size_t size);
44402- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44403+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44404 unsigned long iova);
44405 };
44406
44407 /**
44408- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44409+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44410 *
44411 * @fmt: The page table format.
44412 * @cfg: The page table configuration. This will be modified to represent
44413@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44414 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44415 * the callback routines in cfg->tlb.
44416 */
44417-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44418- struct io_pgtable_cfg *cfg,
44419- void *cookie);
44420+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44421+ struct io_pgtable_cfg *cfg,
44422+ void *cookie);
44423
44424 /**
44425 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44426@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44427 *
44428 * @ops: The ops returned from alloc_io_pgtable_ops.
44429 */
44430-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44431+void free_io_pgtable(struct io_pgtable *iop);
44432
44433
44434 /*
44435@@ -125,7 +126,7 @@ struct io_pgtable {
44436 enum io_pgtable_fmt fmt;
44437 void *cookie;
44438 struct io_pgtable_cfg cfg;
44439- struct io_pgtable_ops ops;
44440+ const struct io_pgtable_ops *ops;
44441 };
44442
44443 /**
44444diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44445index d4f527e..8e4a4fd 100644
44446--- a/drivers/iommu/iommu.c
44447+++ b/drivers/iommu/iommu.c
44448@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44449 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44450 {
44451 int err;
44452- struct notifier_block *nb;
44453+ notifier_block_no_const *nb;
44454 struct iommu_callback_data cb = {
44455 .ops = ops,
44456 };
44457diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44458index 1a67c53..23181d8 100644
44459--- a/drivers/iommu/ipmmu-vmsa.c
44460+++ b/drivers/iommu/ipmmu-vmsa.c
44461@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44462 struct iommu_domain io_domain;
44463
44464 struct io_pgtable_cfg cfg;
44465- struct io_pgtable_ops *iop;
44466+ struct io_pgtable *iop;
44467
44468 unsigned int context_id;
44469 spinlock_t lock; /* Protects mappings */
44470@@ -328,8 +328,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44471 domain->cfg.oas = 40;
44472 domain->cfg.tlb = &ipmmu_gather_ops;
44473
44474- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44475- domain);
44476+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44477 if (!domain->iop)
44478 return -EINVAL;
44479
44480@@ -487,7 +486,7 @@ static void ipmmu_domain_free(struct iommu_domain *io_domain)
44481 * been detached.
44482 */
44483 ipmmu_domain_destroy_context(domain);
44484- free_io_pgtable_ops(domain->iop);
44485+ free_io_pgtable(domain->iop);
44486 kfree(domain);
44487 }
44488
44489@@ -556,7 +555,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44490 if (!domain)
44491 return -ENODEV;
44492
44493- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44494+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44495 }
44496
44497 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44498@@ -564,7 +563,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44499 {
44500 struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
44501
44502- return domain->iop->unmap(domain->iop, iova, size);
44503+ return domain->iop->ops->unmap(domain->iop, iova, size);
44504 }
44505
44506 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44507@@ -574,7 +573,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44508
44509 /* TODO: Is locking needed ? */
44510
44511- return domain->iop->iova_to_phys(domain->iop, iova);
44512+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44513 }
44514
44515 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44516diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44517index 390079e..1da9d6c 100644
44518--- a/drivers/iommu/irq_remapping.c
44519+++ b/drivers/iommu/irq_remapping.c
44520@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44521 void panic_if_irq_remap(const char *msg)
44522 {
44523 if (irq_remapping_enabled)
44524- panic(msg);
44525+ panic("%s", msg);
44526 }
44527
44528 static void ir_ack_apic_edge(struct irq_data *data)
44529@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44530
44531 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44532 {
44533- chip->irq_print_chip = ir_print_prefix;
44534- chip->irq_ack = ir_ack_apic_edge;
44535- chip->irq_eoi = ir_ack_apic_level;
44536- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44537+ pax_open_kernel();
44538+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44539+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44540+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44541+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44542+ pax_close_kernel();
44543 }
44544
44545 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44546diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44547index 01999d7..4f14bb7 100644
44548--- a/drivers/irqchip/irq-gic.c
44549+++ b/drivers/irqchip/irq-gic.c
44550@@ -313,7 +313,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44551 chained_irq_exit(chip, desc);
44552 }
44553
44554-static struct irq_chip gic_chip = {
44555+static irq_chip_no_const gic_chip __read_only = {
44556 .name = "GIC",
44557 .irq_mask = gic_mask_irq,
44558 .irq_unmask = gic_unmask_irq,
44559diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44560index 9a0767b..5e5f86f 100644
44561--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44562+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44563@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44564 struct intc_irqpin_iomem *i;
44565 struct resource *io[INTC_IRQPIN_REG_NR];
44566 struct resource *irq;
44567- struct irq_chip *irq_chip;
44568+ irq_chip_no_const *irq_chip;
44569 void (*enable_fn)(struct irq_data *d);
44570 void (*disable_fn)(struct irq_data *d);
44571 const char *name = dev_name(dev);
44572diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44573index cdf80b7..e5c3ade 100644
44574--- a/drivers/irqchip/irq-renesas-irqc.c
44575+++ b/drivers/irqchip/irq-renesas-irqc.c
44576@@ -179,7 +179,7 @@ static int irqc_probe(struct platform_device *pdev)
44577 struct irqc_priv *p;
44578 struct resource *io;
44579 struct resource *irq;
44580- struct irq_chip *irq_chip;
44581+ irq_chip_no_const *irq_chip;
44582 const char *name = dev_name(&pdev->dev);
44583 int ret;
44584 int k;
44585diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44586index 6a2df32..dc962f1 100644
44587--- a/drivers/isdn/capi/capi.c
44588+++ b/drivers/isdn/capi/capi.c
44589@@ -81,8 +81,8 @@ struct capiminor {
44590
44591 struct capi20_appl *ap;
44592 u32 ncci;
44593- atomic_t datahandle;
44594- atomic_t msgid;
44595+ atomic_unchecked_t datahandle;
44596+ atomic_unchecked_t msgid;
44597
44598 struct tty_port port;
44599 int ttyinstop;
44600@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44601 capimsg_setu16(s, 2, mp->ap->applid);
44602 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44603 capimsg_setu8 (s, 5, CAPI_RESP);
44604- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44605+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44606 capimsg_setu32(s, 8, mp->ncci);
44607 capimsg_setu16(s, 12, datahandle);
44608 }
44609@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44610 mp->outbytes -= len;
44611 spin_unlock_bh(&mp->outlock);
44612
44613- datahandle = atomic_inc_return(&mp->datahandle);
44614+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44615 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44616 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44617 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44618 capimsg_setu16(skb->data, 2, mp->ap->applid);
44619 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44620 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44621- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44622+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44623 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44624 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44625 capimsg_setu16(skb->data, 16, len); /* Data length */
44626diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44627index aecec6d..11e13c5 100644
44628--- a/drivers/isdn/gigaset/bas-gigaset.c
44629+++ b/drivers/isdn/gigaset/bas-gigaset.c
44630@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44631
44632
44633 static const struct gigaset_ops gigops = {
44634- gigaset_write_cmd,
44635- gigaset_write_room,
44636- gigaset_chars_in_buffer,
44637- gigaset_brkchars,
44638- gigaset_init_bchannel,
44639- gigaset_close_bchannel,
44640- gigaset_initbcshw,
44641- gigaset_freebcshw,
44642- gigaset_reinitbcshw,
44643- gigaset_initcshw,
44644- gigaset_freecshw,
44645- gigaset_set_modem_ctrl,
44646- gigaset_baud_rate,
44647- gigaset_set_line_ctrl,
44648- gigaset_isoc_send_skb,
44649- gigaset_isoc_input,
44650+ .write_cmd = gigaset_write_cmd,
44651+ .write_room = gigaset_write_room,
44652+ .chars_in_buffer = gigaset_chars_in_buffer,
44653+ .brkchars = gigaset_brkchars,
44654+ .init_bchannel = gigaset_init_bchannel,
44655+ .close_bchannel = gigaset_close_bchannel,
44656+ .initbcshw = gigaset_initbcshw,
44657+ .freebcshw = gigaset_freebcshw,
44658+ .reinitbcshw = gigaset_reinitbcshw,
44659+ .initcshw = gigaset_initcshw,
44660+ .freecshw = gigaset_freecshw,
44661+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44662+ .baud_rate = gigaset_baud_rate,
44663+ .set_line_ctrl = gigaset_set_line_ctrl,
44664+ .send_skb = gigaset_isoc_send_skb,
44665+ .handle_input = gigaset_isoc_input,
44666 };
44667
44668 /* bas_gigaset_init
44669diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
44670index 600c79b..3752bab 100644
44671--- a/drivers/isdn/gigaset/interface.c
44672+++ b/drivers/isdn/gigaset/interface.c
44673@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
44674 }
44675 tty->driver_data = cs;
44676
44677- ++cs->port.count;
44678+ atomic_inc(&cs->port.count);
44679
44680- if (cs->port.count == 1) {
44681+ if (atomic_read(&cs->port.count) == 1) {
44682 tty_port_tty_set(&cs->port, tty);
44683 cs->port.low_latency = 1;
44684 }
44685@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
44686
44687 if (!cs->connected)
44688 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
44689- else if (!cs->port.count)
44690+ else if (!atomic_read(&cs->port.count))
44691 dev_warn(cs->dev, "%s: device not opened\n", __func__);
44692- else if (!--cs->port.count)
44693+ else if (!atomic_dec_return(&cs->port.count))
44694 tty_port_tty_set(&cs->port, NULL);
44695
44696 mutex_unlock(&cs->mutex);
44697diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
44698index 8c91fd5..14f13ce 100644
44699--- a/drivers/isdn/gigaset/ser-gigaset.c
44700+++ b/drivers/isdn/gigaset/ser-gigaset.c
44701@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
44702 }
44703
44704 static const struct gigaset_ops ops = {
44705- gigaset_write_cmd,
44706- gigaset_write_room,
44707- gigaset_chars_in_buffer,
44708- gigaset_brkchars,
44709- gigaset_init_bchannel,
44710- gigaset_close_bchannel,
44711- gigaset_initbcshw,
44712- gigaset_freebcshw,
44713- gigaset_reinitbcshw,
44714- gigaset_initcshw,
44715- gigaset_freecshw,
44716- gigaset_set_modem_ctrl,
44717- gigaset_baud_rate,
44718- gigaset_set_line_ctrl,
44719- gigaset_m10x_send_skb, /* asyncdata.c */
44720- gigaset_m10x_input, /* asyncdata.c */
44721+ .write_cmd = gigaset_write_cmd,
44722+ .write_room = gigaset_write_room,
44723+ .chars_in_buffer = gigaset_chars_in_buffer,
44724+ .brkchars = gigaset_brkchars,
44725+ .init_bchannel = gigaset_init_bchannel,
44726+ .close_bchannel = gigaset_close_bchannel,
44727+ .initbcshw = gigaset_initbcshw,
44728+ .freebcshw = gigaset_freebcshw,
44729+ .reinitbcshw = gigaset_reinitbcshw,
44730+ .initcshw = gigaset_initcshw,
44731+ .freecshw = gigaset_freecshw,
44732+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44733+ .baud_rate = gigaset_baud_rate,
44734+ .set_line_ctrl = gigaset_set_line_ctrl,
44735+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
44736+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
44737 };
44738
44739
44740diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
44741index 5f306e2..5342f88 100644
44742--- a/drivers/isdn/gigaset/usb-gigaset.c
44743+++ b/drivers/isdn/gigaset/usb-gigaset.c
44744@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
44745 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
44746 memcpy(cs->hw.usb->bchars, buf, 6);
44747 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
44748- 0, 0, &buf, 6, 2000);
44749+ 0, 0, buf, 6, 2000);
44750 }
44751
44752 static void gigaset_freebcshw(struct bc_state *bcs)
44753@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
44754 }
44755
44756 static const struct gigaset_ops ops = {
44757- gigaset_write_cmd,
44758- gigaset_write_room,
44759- gigaset_chars_in_buffer,
44760- gigaset_brkchars,
44761- gigaset_init_bchannel,
44762- gigaset_close_bchannel,
44763- gigaset_initbcshw,
44764- gigaset_freebcshw,
44765- gigaset_reinitbcshw,
44766- gigaset_initcshw,
44767- gigaset_freecshw,
44768- gigaset_set_modem_ctrl,
44769- gigaset_baud_rate,
44770- gigaset_set_line_ctrl,
44771- gigaset_m10x_send_skb,
44772- gigaset_m10x_input,
44773+ .write_cmd = gigaset_write_cmd,
44774+ .write_room = gigaset_write_room,
44775+ .chars_in_buffer = gigaset_chars_in_buffer,
44776+ .brkchars = gigaset_brkchars,
44777+ .init_bchannel = gigaset_init_bchannel,
44778+ .close_bchannel = gigaset_close_bchannel,
44779+ .initbcshw = gigaset_initbcshw,
44780+ .freebcshw = gigaset_freebcshw,
44781+ .reinitbcshw = gigaset_reinitbcshw,
44782+ .initcshw = gigaset_initcshw,
44783+ .freecshw = gigaset_freecshw,
44784+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44785+ .baud_rate = gigaset_baud_rate,
44786+ .set_line_ctrl = gigaset_set_line_ctrl,
44787+ .send_skb = gigaset_m10x_send_skb,
44788+ .handle_input = gigaset_m10x_input,
44789 };
44790
44791 /*
44792diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
44793index 4d9b195..455075c 100644
44794--- a/drivers/isdn/hardware/avm/b1.c
44795+++ b/drivers/isdn/hardware/avm/b1.c
44796@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
44797 }
44798 if (left) {
44799 if (t4file->user) {
44800- if (copy_from_user(buf, dp, left))
44801+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44802 return -EFAULT;
44803 } else {
44804 memcpy(buf, dp, left);
44805@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
44806 }
44807 if (left) {
44808 if (config->user) {
44809- if (copy_from_user(buf, dp, left))
44810+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44811 return -EFAULT;
44812 } else {
44813 memcpy(buf, dp, left);
44814diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
44815index 9b856e1..fa03c92 100644
44816--- a/drivers/isdn/i4l/isdn_common.c
44817+++ b/drivers/isdn/i4l/isdn_common.c
44818@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
44819 } else
44820 return -EINVAL;
44821 case IIOCDBGVAR:
44822+ if (!capable(CAP_SYS_RAWIO))
44823+ return -EPERM;
44824 if (arg) {
44825 if (copy_to_user(argp, &dev, sizeof(ulong)))
44826 return -EFAULT;
44827diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
44828index 91d5730..336523e 100644
44829--- a/drivers/isdn/i4l/isdn_concap.c
44830+++ b/drivers/isdn/i4l/isdn_concap.c
44831@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
44832 }
44833
44834 struct concap_device_ops isdn_concap_reliable_dl_dops = {
44835- &isdn_concap_dl_data_req,
44836- &isdn_concap_dl_connect_req,
44837- &isdn_concap_dl_disconn_req
44838+ .data_req = &isdn_concap_dl_data_req,
44839+ .connect_req = &isdn_concap_dl_connect_req,
44840+ .disconn_req = &isdn_concap_dl_disconn_req
44841 };
44842
44843 /* The following should better go into a dedicated source file such that
44844diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44845index bc91261..2ef7e36 100644
44846--- a/drivers/isdn/i4l/isdn_tty.c
44847+++ b/drivers/isdn/i4l/isdn_tty.c
44848@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44849
44850 #ifdef ISDN_DEBUG_MODEM_OPEN
44851 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44852- port->count);
44853+ atomic_read(&port->count));
44854 #endif
44855- port->count++;
44856+ atomic_inc(&port->count);
44857 port->tty = tty;
44858 /*
44859 * Start up serial port
44860@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44861 #endif
44862 return;
44863 }
44864- if ((tty->count == 1) && (port->count != 1)) {
44865+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44866 /*
44867 * Uh, oh. tty->count is 1, which means that the tty
44868 * structure will be freed. Info->count should always
44869@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44870 * serial port won't be shutdown.
44871 */
44872 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44873- "info->count is %d\n", port->count);
44874- port->count = 1;
44875+ "info->count is %d\n", atomic_read(&port->count));
44876+ atomic_set(&port->count, 1);
44877 }
44878- if (--port->count < 0) {
44879+ if (atomic_dec_return(&port->count) < 0) {
44880 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44881- info->line, port->count);
44882- port->count = 0;
44883+ info->line, atomic_read(&port->count));
44884+ atomic_set(&port->count, 0);
44885 }
44886- if (port->count) {
44887+ if (atomic_read(&port->count)) {
44888 #ifdef ISDN_DEBUG_MODEM_OPEN
44889 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44890 #endif
44891@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44892 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44893 return;
44894 isdn_tty_shutdown(info);
44895- port->count = 0;
44896+ atomic_set(&port->count, 0);
44897 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44898 port->tty = NULL;
44899 wake_up_interruptible(&port->open_wait);
44900@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44901 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44902 modem_info *info = &dev->mdm.info[i];
44903
44904- if (info->port.count == 0)
44905+ if (atomic_read(&info->port.count) == 0)
44906 continue;
44907 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44908 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44909diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44910index e2d4e58..40cd045 100644
44911--- a/drivers/isdn/i4l/isdn_x25iface.c
44912+++ b/drivers/isdn/i4l/isdn_x25iface.c
44913@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44914
44915
44916 static struct concap_proto_ops ix25_pops = {
44917- &isdn_x25iface_proto_new,
44918- &isdn_x25iface_proto_del,
44919- &isdn_x25iface_proto_restart,
44920- &isdn_x25iface_proto_close,
44921- &isdn_x25iface_xmit,
44922- &isdn_x25iface_receive,
44923- &isdn_x25iface_connect_ind,
44924- &isdn_x25iface_disconn_ind
44925+ .proto_new = &isdn_x25iface_proto_new,
44926+ .proto_del = &isdn_x25iface_proto_del,
44927+ .restart = &isdn_x25iface_proto_restart,
44928+ .close = &isdn_x25iface_proto_close,
44929+ .encap_and_xmit = &isdn_x25iface_xmit,
44930+ .data_ind = &isdn_x25iface_receive,
44931+ .connect_ind = &isdn_x25iface_connect_ind,
44932+ .disconn_ind = &isdn_x25iface_disconn_ind
44933 };
44934
44935 /* error message helper function */
44936diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44937index 358a574..b4987ea 100644
44938--- a/drivers/isdn/icn/icn.c
44939+++ b/drivers/isdn/icn/icn.c
44940@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44941 if (count > len)
44942 count = len;
44943 if (user) {
44944- if (copy_from_user(msg, buf, count))
44945+ if (count > sizeof msg || copy_from_user(msg, buf, count))
44946 return -EFAULT;
44947 } else
44948 memcpy(msg, buf, count);
44949diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44950index 52c4382..09e0c7c 100644
44951--- a/drivers/isdn/mISDN/dsp_cmx.c
44952+++ b/drivers/isdn/mISDN/dsp_cmx.c
44953@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44954 static u16 dsp_count; /* last sample count */
44955 static int dsp_count_valid; /* if we have last sample count */
44956
44957-void
44958+void __intentional_overflow(-1)
44959 dsp_cmx_send(void *arg)
44960 {
44961 struct dsp_conf *conf;
44962diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44963index 312ffd3..9263d05 100644
44964--- a/drivers/lguest/core.c
44965+++ b/drivers/lguest/core.c
44966@@ -96,9 +96,17 @@ static __init int map_switcher(void)
44967 * The end address needs +1 because __get_vm_area allocates an
44968 * extra guard page, so we need space for that.
44969 */
44970+
44971+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44972+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44973+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44974+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44975+#else
44976 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44977 VM_ALLOC, switcher_addr, switcher_addr
44978 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44979+#endif
44980+
44981 if (!switcher_vma) {
44982 err = -ENOMEM;
44983 printk("lguest: could not map switcher pages high\n");
44984@@ -121,7 +129,7 @@ static __init int map_switcher(void)
44985 * Now the Switcher is mapped at the right address, we can't fail!
44986 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44987 */
44988- memcpy(switcher_vma->addr, start_switcher_text,
44989+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44990 end_switcher_text - start_switcher_text);
44991
44992 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44993diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44994index e3abebc9..6a35328 100644
44995--- a/drivers/lguest/page_tables.c
44996+++ b/drivers/lguest/page_tables.c
44997@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44998 /*:*/
44999
45000 #ifdef CONFIG_X86_PAE
45001-static void release_pmd(pmd_t *spmd)
45002+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
45003 {
45004 /* If the entry's not present, there's nothing to release. */
45005 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
45006diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
45007index 30f2aef..391c748 100644
45008--- a/drivers/lguest/x86/core.c
45009+++ b/drivers/lguest/x86/core.c
45010@@ -60,7 +60,7 @@ static struct {
45011 /* Offset from where switcher.S was compiled to where we've copied it */
45012 static unsigned long switcher_offset(void)
45013 {
45014- return switcher_addr - (unsigned long)start_switcher_text;
45015+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
45016 }
45017
45018 /* This cpu's struct lguest_pages (after the Switcher text page) */
45019@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
45020 * These copies are pretty cheap, so we do them unconditionally: */
45021 /* Save the current Host top-level page directory.
45022 */
45023+
45024+#ifdef CONFIG_PAX_PER_CPU_PGD
45025+ pages->state.host_cr3 = read_cr3();
45026+#else
45027 pages->state.host_cr3 = __pa(current->mm->pgd);
45028+#endif
45029+
45030 /*
45031 * Set up the Guest's page tables to see this CPU's pages (and no
45032 * other CPU's pages).
45033@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
45034 * compiled-in switcher code and the high-mapped copy we just made.
45035 */
45036 for (i = 0; i < IDT_ENTRIES; i++)
45037- default_idt_entries[i] += switcher_offset();
45038+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
45039
45040 /*
45041 * Set up the Switcher's per-cpu areas.
45042@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
45043 * it will be undisturbed when we switch. To change %cs and jump we
45044 * need this structure to feed to Intel's "lcall" instruction.
45045 */
45046- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
45047+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
45048 lguest_entry.segment = LGUEST_CS;
45049
45050 /*
45051diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
45052index 40634b0..4f5855e 100644
45053--- a/drivers/lguest/x86/switcher_32.S
45054+++ b/drivers/lguest/x86/switcher_32.S
45055@@ -87,6 +87,7 @@
45056 #include <asm/page.h>
45057 #include <asm/segment.h>
45058 #include <asm/lguest.h>
45059+#include <asm/processor-flags.h>
45060
45061 // We mark the start of the code to copy
45062 // It's placed in .text tho it's never run here
45063@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
45064 // Changes type when we load it: damn Intel!
45065 // For after we switch over our page tables
45066 // That entry will be read-only: we'd crash.
45067+
45068+#ifdef CONFIG_PAX_KERNEXEC
45069+ mov %cr0, %edx
45070+ xor $X86_CR0_WP, %edx
45071+ mov %edx, %cr0
45072+#endif
45073+
45074 movl $(GDT_ENTRY_TSS*8), %edx
45075 ltr %dx
45076
45077@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45078 // Let's clear it again for our return.
45079 // The GDT descriptor of the Host
45080 // Points to the table after two "size" bytes
45081- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45082+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45083 // Clear "used" from type field (byte 5, bit 2)
45084- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45085+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45086+
45087+#ifdef CONFIG_PAX_KERNEXEC
45088+ mov %cr0, %eax
45089+ xor $X86_CR0_WP, %eax
45090+ mov %eax, %cr0
45091+#endif
45092
45093 // Once our page table's switched, the Guest is live!
45094 // The Host fades as we run this final step.
45095@@ -295,13 +309,12 @@ deliver_to_host:
45096 // I consulted gcc, and it gave
45097 // These instructions, which I gladly credit:
45098 leal (%edx,%ebx,8), %eax
45099- movzwl (%eax),%edx
45100- movl 4(%eax), %eax
45101- xorw %ax, %ax
45102- orl %eax, %edx
45103+ movl 4(%eax), %edx
45104+ movw (%eax), %dx
45105 // Now the address of the handler's in %edx
45106 // We call it now: its "iret" drops us home.
45107- jmp *%edx
45108+ ljmp $__KERNEL_CS, $1f
45109+1: jmp *%edx
45110
45111 // Every interrupt can come to us here
45112 // But we must truly tell each apart.
45113diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45114index a08e3ee..df8ade2 100644
45115--- a/drivers/md/bcache/closure.h
45116+++ b/drivers/md/bcache/closure.h
45117@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45118 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45119 struct workqueue_struct *wq)
45120 {
45121- BUG_ON(object_is_on_stack(cl));
45122+ BUG_ON(object_starts_on_stack(cl));
45123 closure_set_ip(cl);
45124 cl->fn = fn;
45125 cl->wq = wq;
45126diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45127index c90118e..226d9e5 100644
45128--- a/drivers/md/bitmap.c
45129+++ b/drivers/md/bitmap.c
45130@@ -1936,7 +1936,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45131 chunk_kb ? "KB" : "B");
45132 if (bitmap->storage.file) {
45133 seq_printf(seq, ", file: ");
45134- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45135+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45136 }
45137
45138 seq_printf(seq, "\n");
45139diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45140index 720ceeb..030f1d4 100644
45141--- a/drivers/md/dm-ioctl.c
45142+++ b/drivers/md/dm-ioctl.c
45143@@ -1773,7 +1773,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45144 cmd == DM_LIST_VERSIONS_CMD)
45145 return 0;
45146
45147- if ((cmd == DM_DEV_CREATE_CMD)) {
45148+ if (cmd == DM_DEV_CREATE_CMD) {
45149 if (!*param->name) {
45150 DMWARN("name not supplied when creating device");
45151 return -EINVAL;
45152diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45153index 089d627..ef7352e 100644
45154--- a/drivers/md/dm-raid1.c
45155+++ b/drivers/md/dm-raid1.c
45156@@ -40,7 +40,7 @@ enum dm_raid1_error {
45157
45158 struct mirror {
45159 struct mirror_set *ms;
45160- atomic_t error_count;
45161+ atomic_unchecked_t error_count;
45162 unsigned long error_type;
45163 struct dm_dev *dev;
45164 sector_t offset;
45165@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45166 struct mirror *m;
45167
45168 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45169- if (!atomic_read(&m->error_count))
45170+ if (!atomic_read_unchecked(&m->error_count))
45171 return m;
45172
45173 return NULL;
45174@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45175 * simple way to tell if a device has encountered
45176 * errors.
45177 */
45178- atomic_inc(&m->error_count);
45179+ atomic_inc_unchecked(&m->error_count);
45180
45181 if (test_and_set_bit(error_type, &m->error_type))
45182 return;
45183@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45184 struct mirror *m = get_default_mirror(ms);
45185
45186 do {
45187- if (likely(!atomic_read(&m->error_count)))
45188+ if (likely(!atomic_read_unchecked(&m->error_count)))
45189 return m;
45190
45191 if (m-- == ms->mirror)
45192@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45193 {
45194 struct mirror *default_mirror = get_default_mirror(m->ms);
45195
45196- return !atomic_read(&default_mirror->error_count);
45197+ return !atomic_read_unchecked(&default_mirror->error_count);
45198 }
45199
45200 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45201@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45202 */
45203 if (likely(region_in_sync(ms, region, 1)))
45204 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45205- else if (m && atomic_read(&m->error_count))
45206+ else if (m && atomic_read_unchecked(&m->error_count))
45207 m = NULL;
45208
45209 if (likely(m))
45210@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45211 }
45212
45213 ms->mirror[mirror].ms = ms;
45214- atomic_set(&(ms->mirror[mirror].error_count), 0);
45215+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45216 ms->mirror[mirror].error_type = 0;
45217 ms->mirror[mirror].offset = offset;
45218
45219@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45220 */
45221 static char device_status_char(struct mirror *m)
45222 {
45223- if (!atomic_read(&(m->error_count)))
45224+ if (!atomic_read_unchecked(&(m->error_count)))
45225 return 'A';
45226
45227 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45228diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45229index 419bdd4..e5eb76d 100644
45230--- a/drivers/md/dm-stats.c
45231+++ b/drivers/md/dm-stats.c
45232@@ -382,7 +382,7 @@ do_sync_free:
45233 synchronize_rcu_expedited();
45234 dm_stat_free(&s->rcu_head);
45235 } else {
45236- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45237+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45238 call_rcu(&s->rcu_head, dm_stat_free);
45239 }
45240 return 0;
45241@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45242 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45243 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45244 ));
45245- ACCESS_ONCE(last->last_sector) = end_sector;
45246- ACCESS_ONCE(last->last_rw) = bi_rw;
45247+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45248+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45249 }
45250
45251 rcu_read_lock();
45252diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45253index f8b37d4..5c5cafd 100644
45254--- a/drivers/md/dm-stripe.c
45255+++ b/drivers/md/dm-stripe.c
45256@@ -21,7 +21,7 @@ struct stripe {
45257 struct dm_dev *dev;
45258 sector_t physical_start;
45259
45260- atomic_t error_count;
45261+ atomic_unchecked_t error_count;
45262 };
45263
45264 struct stripe_c {
45265@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45266 kfree(sc);
45267 return r;
45268 }
45269- atomic_set(&(sc->stripe[i].error_count), 0);
45270+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45271 }
45272
45273 ti->private = sc;
45274@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45275 DMEMIT("%d ", sc->stripes);
45276 for (i = 0; i < sc->stripes; i++) {
45277 DMEMIT("%s ", sc->stripe[i].dev->name);
45278- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45279+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45280 'D' : 'A';
45281 }
45282 buffer[i] = '\0';
45283@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45284 */
45285 for (i = 0; i < sc->stripes; i++)
45286 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45287- atomic_inc(&(sc->stripe[i].error_count));
45288- if (atomic_read(&(sc->stripe[i].error_count)) <
45289+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45290+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45291 DM_IO_ERROR_THRESHOLD)
45292 schedule_work(&sc->trigger_event);
45293 }
45294diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45295index 16ba55a..31af906 100644
45296--- a/drivers/md/dm-table.c
45297+++ b/drivers/md/dm-table.c
45298@@ -305,7 +305,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45299 if (!dev_size)
45300 return 0;
45301
45302- if ((start >= dev_size) || (start + len > dev_size)) {
45303+ if ((start >= dev_size) || (len > dev_size - start)) {
45304 DMWARN("%s: %s too small for target: "
45305 "start=%llu, len=%llu, dev_size=%llu",
45306 dm_device_name(ti->table->md), bdevname(bdev, b),
45307diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45308index 79f6941..b33b4e0 100644
45309--- a/drivers/md/dm-thin-metadata.c
45310+++ b/drivers/md/dm-thin-metadata.c
45311@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45312 {
45313 pmd->info.tm = pmd->tm;
45314 pmd->info.levels = 2;
45315- pmd->info.value_type.context = pmd->data_sm;
45316+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45317 pmd->info.value_type.size = sizeof(__le64);
45318 pmd->info.value_type.inc = data_block_inc;
45319 pmd->info.value_type.dec = data_block_dec;
45320@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45321
45322 pmd->bl_info.tm = pmd->tm;
45323 pmd->bl_info.levels = 1;
45324- pmd->bl_info.value_type.context = pmd->data_sm;
45325+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45326 pmd->bl_info.value_type.size = sizeof(__le64);
45327 pmd->bl_info.value_type.inc = data_block_inc;
45328 pmd->bl_info.value_type.dec = data_block_dec;
45329diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45330index 697f34f..8301900 100644
45331--- a/drivers/md/dm.c
45332+++ b/drivers/md/dm.c
45333@@ -191,9 +191,9 @@ struct mapped_device {
45334 /*
45335 * Event handling.
45336 */
45337- atomic_t event_nr;
45338+ atomic_unchecked_t event_nr;
45339 wait_queue_head_t eventq;
45340- atomic_t uevent_seq;
45341+ atomic_unchecked_t uevent_seq;
45342 struct list_head uevent_list;
45343 spinlock_t uevent_lock; /* Protect access to uevent_list */
45344
45345@@ -2287,8 +2287,8 @@ static struct mapped_device *alloc_dev(int minor)
45346 spin_lock_init(&md->deferred_lock);
45347 atomic_set(&md->holders, 1);
45348 atomic_set(&md->open_count, 0);
45349- atomic_set(&md->event_nr, 0);
45350- atomic_set(&md->uevent_seq, 0);
45351+ atomic_set_unchecked(&md->event_nr, 0);
45352+ atomic_set_unchecked(&md->uevent_seq, 0);
45353 INIT_LIST_HEAD(&md->uevent_list);
45354 INIT_LIST_HEAD(&md->table_devices);
45355 spin_lock_init(&md->uevent_lock);
45356@@ -2455,7 +2455,7 @@ static void event_callback(void *context)
45357
45358 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45359
45360- atomic_inc(&md->event_nr);
45361+ atomic_inc_unchecked(&md->event_nr);
45362 wake_up(&md->eventq);
45363 }
45364
45365@@ -3454,18 +3454,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45366
45367 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45368 {
45369- return atomic_add_return(1, &md->uevent_seq);
45370+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45371 }
45372
45373 uint32_t dm_get_event_nr(struct mapped_device *md)
45374 {
45375- return atomic_read(&md->event_nr);
45376+ return atomic_read_unchecked(&md->event_nr);
45377 }
45378
45379 int dm_wait_event(struct mapped_device *md, int event_nr)
45380 {
45381 return wait_event_interruptible(md->eventq,
45382- (event_nr != atomic_read(&md->event_nr)));
45383+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45384 }
45385
45386 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45387diff --git a/drivers/md/md.c b/drivers/md/md.c
45388index e462151..8ac9655 100644
45389--- a/drivers/md/md.c
45390+++ b/drivers/md/md.c
45391@@ -197,10 +197,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45392 * start build, activate spare
45393 */
45394 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45395-static atomic_t md_event_count;
45396+static atomic_unchecked_t md_event_count;
45397 void md_new_event(struct mddev *mddev)
45398 {
45399- atomic_inc(&md_event_count);
45400+ atomic_inc_unchecked(&md_event_count);
45401 wake_up(&md_event_waiters);
45402 }
45403 EXPORT_SYMBOL_GPL(md_new_event);
45404@@ -210,7 +210,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45405 */
45406 static void md_new_event_inintr(struct mddev *mddev)
45407 {
45408- atomic_inc(&md_event_count);
45409+ atomic_inc_unchecked(&md_event_count);
45410 wake_up(&md_event_waiters);
45411 }
45412
45413@@ -1449,7 +1449,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45414 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45415 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45416 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45417- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45418+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45419
45420 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45421 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45422@@ -1700,7 +1700,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45423 else
45424 sb->resync_offset = cpu_to_le64(0);
45425
45426- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45427+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45428
45429 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45430 sb->size = cpu_to_le64(mddev->dev_sectors);
45431@@ -2624,7 +2624,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45432 static ssize_t
45433 errors_show(struct md_rdev *rdev, char *page)
45434 {
45435- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45436+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45437 }
45438
45439 static ssize_t
45440@@ -2633,7 +2633,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45441 char *e;
45442 unsigned long n = simple_strtoul(buf, &e, 10);
45443 if (*buf && (*e == 0 || *e == '\n')) {
45444- atomic_set(&rdev->corrected_errors, n);
45445+ atomic_set_unchecked(&rdev->corrected_errors, n);
45446 return len;
45447 }
45448 return -EINVAL;
45449@@ -3069,8 +3069,8 @@ int md_rdev_init(struct md_rdev *rdev)
45450 rdev->sb_loaded = 0;
45451 rdev->bb_page = NULL;
45452 atomic_set(&rdev->nr_pending, 0);
45453- atomic_set(&rdev->read_errors, 0);
45454- atomic_set(&rdev->corrected_errors, 0);
45455+ atomic_set_unchecked(&rdev->read_errors, 0);
45456+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45457
45458 INIT_LIST_HEAD(&rdev->same_set);
45459 init_waitqueue_head(&rdev->blocked_wait);
45460@@ -5746,16 +5746,16 @@ static int get_bitmap_file(struct mddev *mddev, void __user * arg)
45461
45462 err = 0;
45463 spin_lock(&mddev->lock);
45464- /* bitmap disabled, zero the first byte and copy out */
45465- if (!mddev->bitmap_info.file)
45466- file->pathname[0] = '\0';
45467- else if ((ptr = d_path(&mddev->bitmap_info.file->f_path,
45468- file->pathname, sizeof(file->pathname))),
45469- IS_ERR(ptr))
45470- err = PTR_ERR(ptr);
45471- else
45472- memmove(file->pathname, ptr,
45473- sizeof(file->pathname)-(ptr-file->pathname));
45474+ /* bitmap enabled */
45475+ if (mddev->bitmap_info.file) {
45476+ ptr = d_path(&mddev->bitmap_info.file->f_path,
45477+ file->pathname, sizeof(file->pathname));
45478+ if (IS_ERR(ptr))
45479+ err = PTR_ERR(ptr);
45480+ else
45481+ memmove(file->pathname, ptr,
45482+ sizeof(file->pathname)-(ptr-file->pathname));
45483+ }
45484 spin_unlock(&mddev->lock);
45485
45486 if (err == 0 &&
45487@@ -7237,7 +7237,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45488
45489 spin_unlock(&pers_lock);
45490 seq_printf(seq, "\n");
45491- seq->poll_event = atomic_read(&md_event_count);
45492+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45493 return 0;
45494 }
45495 if (v == (void*)2) {
45496@@ -7340,7 +7340,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45497 return error;
45498
45499 seq = file->private_data;
45500- seq->poll_event = atomic_read(&md_event_count);
45501+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45502 return error;
45503 }
45504
45505@@ -7357,7 +7357,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45506 /* always allow read */
45507 mask = POLLIN | POLLRDNORM;
45508
45509- if (seq->poll_event != atomic_read(&md_event_count))
45510+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45511 mask |= POLLERR | POLLPRI;
45512 return mask;
45513 }
45514@@ -7453,7 +7453,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45515 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45516 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45517 (int)part_stat_read(&disk->part0, sectors[1]) -
45518- atomic_read(&disk->sync_io);
45519+ atomic_read_unchecked(&disk->sync_io);
45520 /* sync IO will cause sync_io to increase before the disk_stats
45521 * as sync_io is counted when a request starts, and
45522 * disk_stats is counted when it completes.
45523diff --git a/drivers/md/md.h b/drivers/md/md.h
45524index 4046a6c..e2f2997 100644
45525--- a/drivers/md/md.h
45526+++ b/drivers/md/md.h
45527@@ -95,13 +95,13 @@ struct md_rdev {
45528 * only maintained for arrays that
45529 * support hot removal
45530 */
45531- atomic_t read_errors; /* number of consecutive read errors that
45532+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45533 * we have tried to ignore.
45534 */
45535 struct timespec last_read_error; /* monotonic time since our
45536 * last read error
45537 */
45538- atomic_t corrected_errors; /* number of corrected read errors,
45539+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45540 * for reporting to userspace and storing
45541 * in superblock.
45542 */
45543@@ -486,7 +486,7 @@ extern void mddev_unlock(struct mddev *mddev);
45544
45545 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45546 {
45547- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45548+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45549 }
45550
45551 struct md_personality
45552diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45553index 5309129..7fb096e 100644
45554--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45555+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45556@@ -691,7 +691,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45557 * Flick into a mode where all blocks get allocated in the new area.
45558 */
45559 smm->begin = old_len;
45560- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45561+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45562
45563 /*
45564 * Extend.
45565@@ -728,7 +728,7 @@ out:
45566 /*
45567 * Switch back to normal behaviour.
45568 */
45569- memcpy(sm, &ops, sizeof(*sm));
45570+ memcpy((void *)sm, &ops, sizeof(*sm));
45571 return r;
45572 }
45573
45574diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45575index 3e6d115..ffecdeb 100644
45576--- a/drivers/md/persistent-data/dm-space-map.h
45577+++ b/drivers/md/persistent-data/dm-space-map.h
45578@@ -71,6 +71,7 @@ struct dm_space_map {
45579 dm_sm_threshold_fn fn,
45580 void *context);
45581 };
45582+typedef struct dm_space_map __no_const dm_space_map_no_const;
45583
45584 /*----------------------------------------------------------------*/
45585
45586diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45587index 5ce3cd5c..f147017 100644
45588--- a/drivers/md/raid1.c
45589+++ b/drivers/md/raid1.c
45590@@ -1936,7 +1936,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45591 if (r1_sync_page_io(rdev, sect, s,
45592 bio->bi_io_vec[idx].bv_page,
45593 READ) != 0)
45594- atomic_add(s, &rdev->corrected_errors);
45595+ atomic_add_unchecked(s, &rdev->corrected_errors);
45596 }
45597 sectors -= s;
45598 sect += s;
45599@@ -2169,7 +2169,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45600 !test_bit(Faulty, &rdev->flags)) {
45601 if (r1_sync_page_io(rdev, sect, s,
45602 conf->tmppage, READ)) {
45603- atomic_add(s, &rdev->corrected_errors);
45604+ atomic_add_unchecked(s, &rdev->corrected_errors);
45605 printk(KERN_INFO
45606 "md/raid1:%s: read error corrected "
45607 "(%d sectors at %llu on %s)\n",
45608diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45609index f55c3f3..4cca8c8 100644
45610--- a/drivers/md/raid10.c
45611+++ b/drivers/md/raid10.c
45612@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45613 /* The write handler will notice the lack of
45614 * R10BIO_Uptodate and record any errors etc
45615 */
45616- atomic_add(r10_bio->sectors,
45617+ atomic_add_unchecked(r10_bio->sectors,
45618 &conf->mirrors[d].rdev->corrected_errors);
45619
45620 /* for reconstruct, we always reschedule after a read.
45621@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45622 {
45623 struct timespec cur_time_mon;
45624 unsigned long hours_since_last;
45625- unsigned int read_errors = atomic_read(&rdev->read_errors);
45626+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45627
45628 ktime_get_ts(&cur_time_mon);
45629
45630@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45631 * overflowing the shift of read_errors by hours_since_last.
45632 */
45633 if (hours_since_last >= 8 * sizeof(read_errors))
45634- atomic_set(&rdev->read_errors, 0);
45635+ atomic_set_unchecked(&rdev->read_errors, 0);
45636 else
45637- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45638+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45639 }
45640
45641 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45642@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45643 return;
45644
45645 check_decay_read_errors(mddev, rdev);
45646- atomic_inc(&rdev->read_errors);
45647- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45648+ atomic_inc_unchecked(&rdev->read_errors);
45649+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45650 char b[BDEVNAME_SIZE];
45651 bdevname(rdev->bdev, b);
45652
45653@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45654 "md/raid10:%s: %s: Raid device exceeded "
45655 "read_error threshold [cur %d:max %d]\n",
45656 mdname(mddev), b,
45657- atomic_read(&rdev->read_errors), max_read_errors);
45658+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45659 printk(KERN_NOTICE
45660 "md/raid10:%s: %s: Failing raid device\n",
45661 mdname(mddev), b);
45662@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45663 sect +
45664 choose_data_offset(r10_bio, rdev)),
45665 bdevname(rdev->bdev, b));
45666- atomic_add(s, &rdev->corrected_errors);
45667+ atomic_add_unchecked(s, &rdev->corrected_errors);
45668 }
45669
45670 rdev_dec_pending(rdev, mddev);
45671diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45672index b6793d2..92be2bc 100644
45673--- a/drivers/md/raid5.c
45674+++ b/drivers/md/raid5.c
45675@@ -1108,23 +1108,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45676 struct bio_vec bvl;
45677 struct bvec_iter iter;
45678 struct page *bio_page;
45679- int page_offset;
45680+ s64 page_offset;
45681 struct async_submit_ctl submit;
45682 enum async_tx_flags flags = 0;
45683
45684 if (bio->bi_iter.bi_sector >= sector)
45685- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
45686+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
45687 else
45688- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45689+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45690
45691 if (frombio)
45692 flags |= ASYNC_TX_FENCE;
45693 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45694
45695 bio_for_each_segment(bvl, bio, iter) {
45696- int len = bvl.bv_len;
45697- int clen;
45698- int b_offset = 0;
45699+ s64 len = bvl.bv_len;
45700+ s64 clen;
45701+ s64 b_offset = 0;
45702
45703 if (page_offset < 0) {
45704 b_offset = -page_offset;
45705@@ -2017,6 +2017,10 @@ static int grow_one_stripe(struct r5conf *conf, gfp_t gfp)
45706 return 1;
45707 }
45708
45709+#ifdef CONFIG_GRKERNSEC_HIDESYM
45710+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45711+#endif
45712+
45713 static int grow_stripes(struct r5conf *conf, int num)
45714 {
45715 struct kmem_cache *sc;
45716@@ -2027,7 +2031,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45717 "raid%d-%s", conf->level, mdname(conf->mddev));
45718 else
45719 sprintf(conf->cache_name[0],
45720+#ifdef CONFIG_GRKERNSEC_HIDESYM
45721+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
45722+#else
45723 "raid%d-%p", conf->level, conf->mddev);
45724+#endif
45725 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
45726
45727 conf->active_name = 0;
45728@@ -2315,21 +2323,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
45729 mdname(conf->mddev), STRIPE_SECTORS,
45730 (unsigned long long)s,
45731 bdevname(rdev->bdev, b));
45732- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
45733+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
45734 clear_bit(R5_ReadError, &sh->dev[i].flags);
45735 clear_bit(R5_ReWrite, &sh->dev[i].flags);
45736 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
45737 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
45738
45739- if (atomic_read(&rdev->read_errors))
45740- atomic_set(&rdev->read_errors, 0);
45741+ if (atomic_read_unchecked(&rdev->read_errors))
45742+ atomic_set_unchecked(&rdev->read_errors, 0);
45743 } else {
45744 const char *bdn = bdevname(rdev->bdev, b);
45745 int retry = 0;
45746 int set_bad = 0;
45747
45748 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
45749- atomic_inc(&rdev->read_errors);
45750+ atomic_inc_unchecked(&rdev->read_errors);
45751 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
45752 printk_ratelimited(
45753 KERN_WARNING
45754@@ -2357,7 +2365,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
45755 mdname(conf->mddev),
45756 (unsigned long long)s,
45757 bdn);
45758- } else if (atomic_read(&rdev->read_errors)
45759+ } else if (atomic_read_unchecked(&rdev->read_errors)
45760 > conf->max_nr_stripes)
45761 printk(KERN_WARNING
45762 "md/raid:%s: Too many read errors, failing device %s.\n",
45763diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
45764index 13bb57f..0ca21b2 100644
45765--- a/drivers/media/dvb-core/dvbdev.c
45766+++ b/drivers/media/dvb-core/dvbdev.c
45767@@ -272,7 +272,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
45768 const struct dvb_device *template, void *priv, int type)
45769 {
45770 struct dvb_device *dvbdev;
45771- struct file_operations *dvbdevfops;
45772+ file_operations_no_const *dvbdevfops;
45773 struct device *clsdev;
45774 int minor;
45775 int id;
45776diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
45777index 6ad22b6..6e90e2a 100644
45778--- a/drivers/media/dvb-frontends/af9033.h
45779+++ b/drivers/media/dvb-frontends/af9033.h
45780@@ -96,6 +96,6 @@ struct af9033_ops {
45781 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
45782 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
45783 int onoff);
45784-};
45785+} __no_const;
45786
45787 #endif /* AF9033_H */
45788diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
45789index 6ae9899..07d8543 100644
45790--- a/drivers/media/dvb-frontends/dib3000.h
45791+++ b/drivers/media/dvb-frontends/dib3000.h
45792@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
45793 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
45794 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
45795 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
45796-};
45797+} __no_const;
45798
45799 #if IS_REACHABLE(CONFIG_DVB_DIB3000MB)
45800 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
45801diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
45802index baa2789..c8de7fe 100644
45803--- a/drivers/media/dvb-frontends/dib7000p.h
45804+++ b/drivers/media/dvb-frontends/dib7000p.h
45805@@ -64,7 +64,7 @@ struct dib7000p_ops {
45806 int (*get_adc_power)(struct dvb_frontend *fe);
45807 int (*slave_reset)(struct dvb_frontend *fe);
45808 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
45809-};
45810+} __no_const;
45811
45812 #if IS_REACHABLE(CONFIG_DVB_DIB7000P)
45813 void *dib7000p_attach(struct dib7000p_ops *ops);
45814diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
45815index 780c37b..50e2620 100644
45816--- a/drivers/media/dvb-frontends/dib8000.h
45817+++ b/drivers/media/dvb-frontends/dib8000.h
45818@@ -61,7 +61,7 @@ struct dib8000_ops {
45819 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
45820 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
45821 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
45822-};
45823+} __no_const;
45824
45825 #if IS_REACHABLE(CONFIG_DVB_DIB8000)
45826 void *dib8000_attach(struct dib8000_ops *ops);
45827diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
45828index c9decd8..7849cec 100644
45829--- a/drivers/media/pci/cx88/cx88-video.c
45830+++ b/drivers/media/pci/cx88/cx88-video.c
45831@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
45832
45833 /* ------------------------------------------------------------------ */
45834
45835-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45836-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45837-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45838+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45839+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45840+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45841
45842 module_param_array(video_nr, int, NULL, 0444);
45843 module_param_array(vbi_nr, int, NULL, 0444);
45844diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
45845index c2e60b4..5eeccc0 100644
45846--- a/drivers/media/pci/ivtv/ivtv-driver.c
45847+++ b/drivers/media/pci/ivtv/ivtv-driver.c
45848@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
45849 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
45850
45851 /* ivtv instance counter */
45852-static atomic_t ivtv_instance = ATOMIC_INIT(0);
45853+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
45854
45855 /* Parameter declarations */
45856 static int cardtype[IVTV_MAX_CARDS];
45857diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
45858index 570d119..ed25830 100644
45859--- a/drivers/media/pci/solo6x10/solo6x10-core.c
45860+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
45861@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
45862
45863 static int solo_sysfs_init(struct solo_dev *solo_dev)
45864 {
45865- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
45866+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
45867 struct device *dev = &solo_dev->dev;
45868 const char *driver;
45869 int i;
45870diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45871index 7ddc767..1c24361 100644
45872--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45873+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45874@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45875
45876 int solo_g723_init(struct solo_dev *solo_dev)
45877 {
45878- static struct snd_device_ops ops = { NULL };
45879+ static struct snd_device_ops ops = { };
45880 struct snd_card *card;
45881 struct snd_kcontrol_new kctl;
45882 char name[32];
45883diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45884index 8c84846..27b4f83 100644
45885--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45886+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45887@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45888
45889 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45890 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45891- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45892+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45893 if (p2m_id < 0)
45894 p2m_id = -p2m_id;
45895 }
45896diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45897index 1ca54b0..7d7cb9a 100644
45898--- a/drivers/media/pci/solo6x10/solo6x10.h
45899+++ b/drivers/media/pci/solo6x10/solo6x10.h
45900@@ -218,7 +218,7 @@ struct solo_dev {
45901
45902 /* P2M DMA Engine */
45903 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45904- atomic_t p2m_count;
45905+ atomic_unchecked_t p2m_count;
45906 int p2m_jiffies;
45907 unsigned int p2m_timeouts;
45908
45909diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45910index c135165..dc69499 100644
45911--- a/drivers/media/pci/tw68/tw68-core.c
45912+++ b/drivers/media/pci/tw68/tw68-core.c
45913@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45914 module_param_array(card, int, NULL, 0444);
45915 MODULE_PARM_DESC(card, "card type");
45916
45917-static atomic_t tw68_instance = ATOMIC_INIT(0);
45918+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45919
45920 /* ------------------------------------------------------------------ */
45921
45922diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45923index 17b189a..b78aa6b 100644
45924--- a/drivers/media/platform/omap/omap_vout.c
45925+++ b/drivers/media/platform/omap/omap_vout.c
45926@@ -63,7 +63,6 @@ enum omap_vout_channels {
45927 OMAP_VIDEO2,
45928 };
45929
45930-static struct videobuf_queue_ops video_vbq_ops;
45931 /* Variables configurable through module params*/
45932 static u32 video1_numbuffers = 3;
45933 static u32 video2_numbuffers = 3;
45934@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45935 {
45936 struct videobuf_queue *q;
45937 struct omap_vout_device *vout = NULL;
45938+ static struct videobuf_queue_ops video_vbq_ops = {
45939+ .buf_setup = omap_vout_buffer_setup,
45940+ .buf_prepare = omap_vout_buffer_prepare,
45941+ .buf_release = omap_vout_buffer_release,
45942+ .buf_queue = omap_vout_buffer_queue,
45943+ };
45944
45945 vout = video_drvdata(file);
45946 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45947@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45948 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45949
45950 q = &vout->vbq;
45951- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45952- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45953- video_vbq_ops.buf_release = omap_vout_buffer_release;
45954- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45955 spin_lock_init(&vout->vbq_lock);
45956
45957 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45958diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45959index fb2acc5..a2fcbdc4 100644
45960--- a/drivers/media/platform/s5p-tv/mixer.h
45961+++ b/drivers/media/platform/s5p-tv/mixer.h
45962@@ -156,7 +156,7 @@ struct mxr_layer {
45963 /** layer index (unique identifier) */
45964 int idx;
45965 /** callbacks for layer methods */
45966- struct mxr_layer_ops ops;
45967+ struct mxr_layer_ops *ops;
45968 /** format array */
45969 const struct mxr_format **fmt_array;
45970 /** size of format array */
45971diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45972index 74344c7..a39e70e 100644
45973--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45974+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45975@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45976 {
45977 struct mxr_layer *layer;
45978 int ret;
45979- struct mxr_layer_ops ops = {
45980+ static struct mxr_layer_ops ops = {
45981 .release = mxr_graph_layer_release,
45982 .buffer_set = mxr_graph_buffer_set,
45983 .stream_set = mxr_graph_stream_set,
45984diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45985index b713403..53cb5ad 100644
45986--- a/drivers/media/platform/s5p-tv/mixer_reg.c
45987+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45988@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45989 layer->update_buf = next;
45990 }
45991
45992- layer->ops.buffer_set(layer, layer->update_buf);
45993+ layer->ops->buffer_set(layer, layer->update_buf);
45994
45995 if (done && done != layer->shadow_buf)
45996 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45997diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45998index 751f3b6..d829203 100644
45999--- a/drivers/media/platform/s5p-tv/mixer_video.c
46000+++ b/drivers/media/platform/s5p-tv/mixer_video.c
46001@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
46002 layer->geo.src.height = layer->geo.src.full_height;
46003
46004 mxr_geometry_dump(mdev, &layer->geo);
46005- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46006+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46007 mxr_geometry_dump(mdev, &layer->geo);
46008 }
46009
46010@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
46011 layer->geo.dst.full_width = mbus_fmt.width;
46012 layer->geo.dst.full_height = mbus_fmt.height;
46013 layer->geo.dst.field = mbus_fmt.field;
46014- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46015+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46016
46017 mxr_geometry_dump(mdev, &layer->geo);
46018 }
46019@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
46020 /* set source size to highest accepted value */
46021 geo->src.full_width = max(geo->dst.full_width, pix->width);
46022 geo->src.full_height = max(geo->dst.full_height, pix->height);
46023- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46024+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46025 mxr_geometry_dump(mdev, &layer->geo);
46026 /* set cropping to total visible screen */
46027 geo->src.width = pix->width;
46028@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
46029 geo->src.x_offset = 0;
46030 geo->src.y_offset = 0;
46031 /* assure consistency of geometry */
46032- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46033+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46034 mxr_geometry_dump(mdev, &layer->geo);
46035 /* set full size to lowest possible value */
46036 geo->src.full_width = 0;
46037 geo->src.full_height = 0;
46038- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46039+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46040 mxr_geometry_dump(mdev, &layer->geo);
46041
46042 /* returning results */
46043@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
46044 target->width = s->r.width;
46045 target->height = s->r.height;
46046
46047- layer->ops.fix_geometry(layer, stage, s->flags);
46048+ layer->ops->fix_geometry(layer, stage, s->flags);
46049
46050 /* retrieve update selection rectangle */
46051 res.left = target->x_offset;
46052@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
46053 mxr_output_get(mdev);
46054
46055 mxr_layer_update_output(layer);
46056- layer->ops.format_set(layer);
46057+ layer->ops->format_set(layer);
46058 /* enabling layer in hardware */
46059 spin_lock_irqsave(&layer->enq_slock, flags);
46060 layer->state = MXR_LAYER_STREAMING;
46061 spin_unlock_irqrestore(&layer->enq_slock, flags);
46062
46063- layer->ops.stream_set(layer, MXR_ENABLE);
46064+ layer->ops->stream_set(layer, MXR_ENABLE);
46065 mxr_streamer_get(mdev);
46066
46067 return 0;
46068@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
46069 spin_unlock_irqrestore(&layer->enq_slock, flags);
46070
46071 /* disabling layer in hardware */
46072- layer->ops.stream_set(layer, MXR_DISABLE);
46073+ layer->ops->stream_set(layer, MXR_DISABLE);
46074 /* remove one streamer */
46075 mxr_streamer_put(mdev);
46076 /* allow changes in output configuration */
46077@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46078
46079 void mxr_layer_release(struct mxr_layer *layer)
46080 {
46081- if (layer->ops.release)
46082- layer->ops.release(layer);
46083+ if (layer->ops->release)
46084+ layer->ops->release(layer);
46085 }
46086
46087 void mxr_base_layer_release(struct mxr_layer *layer)
46088@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46089
46090 layer->mdev = mdev;
46091 layer->idx = idx;
46092- layer->ops = *ops;
46093+ layer->ops = ops;
46094
46095 spin_lock_init(&layer->enq_slock);
46096 INIT_LIST_HEAD(&layer->enq_list);
46097diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46098index c9388c4..ce71ece 100644
46099--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46100+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46101@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46102 {
46103 struct mxr_layer *layer;
46104 int ret;
46105- struct mxr_layer_ops ops = {
46106+ static struct mxr_layer_ops ops = {
46107 .release = mxr_vp_layer_release,
46108 .buffer_set = mxr_vp_buffer_set,
46109 .stream_set = mxr_vp_stream_set,
46110diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46111index 82affae..42833ec 100644
46112--- a/drivers/media/radio/radio-cadet.c
46113+++ b/drivers/media/radio/radio-cadet.c
46114@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46115 unsigned char readbuf[RDS_BUFFER];
46116 int i = 0;
46117
46118+ if (count > RDS_BUFFER)
46119+ return -EFAULT;
46120 mutex_lock(&dev->lock);
46121 if (dev->rdsstat == 0)
46122 cadet_start_rds(dev);
46123@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46124 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46125 mutex_unlock(&dev->lock);
46126
46127- if (i && copy_to_user(data, readbuf, i))
46128- return -EFAULT;
46129+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46130+ i = -EFAULT;
46131+
46132 return i;
46133 }
46134
46135diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46136index 5236035..c622c74 100644
46137--- a/drivers/media/radio/radio-maxiradio.c
46138+++ b/drivers/media/radio/radio-maxiradio.c
46139@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46140 /* TEA5757 pin mappings */
46141 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46142
46143-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46144+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46145
46146 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46147 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46148diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46149index 050b3bb..79f62b9 100644
46150--- a/drivers/media/radio/radio-shark.c
46151+++ b/drivers/media/radio/radio-shark.c
46152@@ -79,7 +79,7 @@ struct shark_device {
46153 u32 last_val;
46154 };
46155
46156-static atomic_t shark_instance = ATOMIC_INIT(0);
46157+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46158
46159 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46160 {
46161diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46162index 8654e0d..0608a64 100644
46163--- a/drivers/media/radio/radio-shark2.c
46164+++ b/drivers/media/radio/radio-shark2.c
46165@@ -74,7 +74,7 @@ struct shark_device {
46166 u8 *transfer_buffer;
46167 };
46168
46169-static atomic_t shark_instance = ATOMIC_INIT(0);
46170+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46171
46172 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46173 {
46174diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46175index dccf586..d5db411 100644
46176--- a/drivers/media/radio/radio-si476x.c
46177+++ b/drivers/media/radio/radio-si476x.c
46178@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46179 struct si476x_radio *radio;
46180 struct v4l2_ctrl *ctrl;
46181
46182- static atomic_t instance = ATOMIC_INIT(0);
46183+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46184
46185 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46186 if (!radio)
46187diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46188index 704397f..4d05977 100644
46189--- a/drivers/media/radio/wl128x/fmdrv_common.c
46190+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46191@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46192 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46193
46194 /* Radio Nr */
46195-static u32 radio_nr = -1;
46196+static int radio_nr = -1;
46197 module_param(radio_nr, int, 0444);
46198 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46199
46200diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46201index 9fd1527..8927230 100644
46202--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46203+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46204@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46205
46206 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46207 {
46208- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46209- char result[64];
46210- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46211- sizeof(result), 0);
46212+ char *buf;
46213+ char *result;
46214+ int retval;
46215+
46216+ buf = kmalloc(2, GFP_KERNEL);
46217+ if (buf == NULL)
46218+ return -ENOMEM;
46219+ result = kmalloc(64, GFP_KERNEL);
46220+ if (result == NULL) {
46221+ kfree(buf);
46222+ return -ENOMEM;
46223+ }
46224+
46225+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46226+ buf[1] = enable ? 1 : 0;
46227+
46228+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46229+
46230+ kfree(buf);
46231+ kfree(result);
46232+ return retval;
46233 }
46234
46235 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46236 {
46237- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46238- char state[3];
46239- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46240+ char *buf;
46241+ char *state;
46242+ int retval;
46243+
46244+ buf = kmalloc(2, GFP_KERNEL);
46245+ if (buf == NULL)
46246+ return -ENOMEM;
46247+ state = kmalloc(3, GFP_KERNEL);
46248+ if (state == NULL) {
46249+ kfree(buf);
46250+ return -ENOMEM;
46251+ }
46252+
46253+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46254+ buf[1] = enable ? 1 : 0;
46255+
46256+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46257+
46258+ kfree(buf);
46259+ kfree(state);
46260+ return retval;
46261 }
46262
46263 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46264 {
46265- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46266- char state[3];
46267+ char *query;
46268+ char *state;
46269 int ret;
46270+ query = kmalloc(1, GFP_KERNEL);
46271+ if (query == NULL)
46272+ return -ENOMEM;
46273+ state = kmalloc(3, GFP_KERNEL);
46274+ if (state == NULL) {
46275+ kfree(query);
46276+ return -ENOMEM;
46277+ }
46278+
46279+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46280
46281 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46282
46283- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46284- sizeof(state), 0);
46285+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46286 if (ret < 0) {
46287 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46288 "state info\n");
46289@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46290
46291 /* Copy this pointer as we are gonna need it in the release phase */
46292 cinergyt2_usb_device = adap->dev;
46293-
46294+ kfree(query);
46295+ kfree(state);
46296 return 0;
46297 }
46298
46299@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46300 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46301 {
46302 struct cinergyt2_state *st = d->priv;
46303- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46304+ u8 *key, *cmd;
46305 int i;
46306
46307+ cmd = kmalloc(1, GFP_KERNEL);
46308+ if (cmd == NULL)
46309+ return -EINVAL;
46310+ key = kzalloc(5, GFP_KERNEL);
46311+ if (key == NULL) {
46312+ kfree(cmd);
46313+ return -EINVAL;
46314+ }
46315+
46316+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46317+
46318 *state = REMOTE_NO_KEY_PRESSED;
46319
46320- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46321+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46322 if (key[4] == 0xff) {
46323 /* key repeat */
46324 st->rc_counter++;
46325@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46326 *event = d->last_event;
46327 deb_rc("repeat key, event %x\n",
46328 *event);
46329- return 0;
46330+ goto out;
46331 }
46332 }
46333 deb_rc("repeated key (non repeatable)\n");
46334 }
46335- return 0;
46336+ goto out;
46337 }
46338
46339 /* hack to pass checksum on the custom field */
46340@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46341
46342 deb_rc("key: %*ph\n", 5, key);
46343 }
46344+out:
46345+ kfree(cmd);
46346+ kfree(key);
46347 return 0;
46348 }
46349
46350diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46351index c890fe4..f9b2ae6 100644
46352--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46353+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46354@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46355 fe_status_t *status)
46356 {
46357 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46358- struct dvbt_get_status_msg result;
46359- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46360+ struct dvbt_get_status_msg *result;
46361+ u8 *cmd;
46362 int ret;
46363
46364- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46365- sizeof(result), 0);
46366+ cmd = kmalloc(1, GFP_KERNEL);
46367+ if (cmd == NULL)
46368+ return -ENOMEM;
46369+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46370+ if (result == NULL) {
46371+ kfree(cmd);
46372+ return -ENOMEM;
46373+ }
46374+
46375+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46376+
46377+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46378+ sizeof(*result), 0);
46379 if (ret < 0)
46380- return ret;
46381+ goto out;
46382
46383 *status = 0;
46384
46385- if (0xffff - le16_to_cpu(result.gain) > 30)
46386+ if (0xffff - le16_to_cpu(result->gain) > 30)
46387 *status |= FE_HAS_SIGNAL;
46388- if (result.lock_bits & (1 << 6))
46389+ if (result->lock_bits & (1 << 6))
46390 *status |= FE_HAS_LOCK;
46391- if (result.lock_bits & (1 << 5))
46392+ if (result->lock_bits & (1 << 5))
46393 *status |= FE_HAS_SYNC;
46394- if (result.lock_bits & (1 << 4))
46395+ if (result->lock_bits & (1 << 4))
46396 *status |= FE_HAS_CARRIER;
46397- if (result.lock_bits & (1 << 1))
46398+ if (result->lock_bits & (1 << 1))
46399 *status |= FE_HAS_VITERBI;
46400
46401 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46402 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46403 *status &= ~FE_HAS_LOCK;
46404
46405- return 0;
46406+out:
46407+ kfree(cmd);
46408+ kfree(result);
46409+ return ret;
46410 }
46411
46412 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46413 {
46414 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46415- struct dvbt_get_status_msg status;
46416- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46417+ struct dvbt_get_status_msg *status;
46418+ char *cmd;
46419 int ret;
46420
46421- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46422- sizeof(status), 0);
46423+ cmd = kmalloc(1, GFP_KERNEL);
46424+ if (cmd == NULL)
46425+ return -ENOMEM;
46426+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46427+ if (status == NULL) {
46428+ kfree(cmd);
46429+ return -ENOMEM;
46430+ }
46431+
46432+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46433+
46434+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46435+ sizeof(*status), 0);
46436 if (ret < 0)
46437- return ret;
46438+ goto out;
46439
46440- *ber = le32_to_cpu(status.viterbi_error_rate);
46441+ *ber = le32_to_cpu(status->viterbi_error_rate);
46442+out:
46443+ kfree(cmd);
46444+ kfree(status);
46445 return 0;
46446 }
46447
46448 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46449 {
46450 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46451- struct dvbt_get_status_msg status;
46452- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46453+ struct dvbt_get_status_msg *status;
46454+ u8 *cmd;
46455 int ret;
46456
46457- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46458- sizeof(status), 0);
46459+ cmd = kmalloc(1, GFP_KERNEL);
46460+ if (cmd == NULL)
46461+ return -ENOMEM;
46462+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46463+ if (status == NULL) {
46464+ kfree(cmd);
46465+ return -ENOMEM;
46466+ }
46467+
46468+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46469+
46470+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46471+ sizeof(*status), 0);
46472 if (ret < 0) {
46473 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46474 ret);
46475- return ret;
46476+ goto out;
46477 }
46478- *unc = le32_to_cpu(status.uncorrected_block_count);
46479- return 0;
46480+ *unc = le32_to_cpu(status->uncorrected_block_count);
46481+
46482+out:
46483+ kfree(cmd);
46484+ kfree(status);
46485+ return ret;
46486 }
46487
46488 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46489 u16 *strength)
46490 {
46491 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46492- struct dvbt_get_status_msg status;
46493- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46494+ struct dvbt_get_status_msg *status;
46495+ char *cmd;
46496 int ret;
46497
46498- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46499- sizeof(status), 0);
46500+ cmd = kmalloc(1, GFP_KERNEL);
46501+ if (cmd == NULL)
46502+ return -ENOMEM;
46503+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46504+ if (status == NULL) {
46505+ kfree(cmd);
46506+ return -ENOMEM;
46507+ }
46508+
46509+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46510+
46511+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46512+ sizeof(*status), 0);
46513 if (ret < 0) {
46514 err("cinergyt2_fe_read_signal_strength() Failed!"
46515 " (Error=%d)\n", ret);
46516- return ret;
46517+ goto out;
46518 }
46519- *strength = (0xffff - le16_to_cpu(status.gain));
46520+ *strength = (0xffff - le16_to_cpu(status->gain));
46521+
46522+out:
46523+ kfree(cmd);
46524+ kfree(status);
46525 return 0;
46526 }
46527
46528 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46529 {
46530 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46531- struct dvbt_get_status_msg status;
46532- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46533+ struct dvbt_get_status_msg *status;
46534+ char *cmd;
46535 int ret;
46536
46537- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46538- sizeof(status), 0);
46539+ cmd = kmalloc(1, GFP_KERNEL);
46540+ if (cmd == NULL)
46541+ return -ENOMEM;
46542+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46543+ if (status == NULL) {
46544+ kfree(cmd);
46545+ return -ENOMEM;
46546+ }
46547+
46548+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46549+
46550+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46551+ sizeof(*status), 0);
46552 if (ret < 0) {
46553 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46554- return ret;
46555+ goto out;
46556 }
46557- *snr = (status.snr << 8) | status.snr;
46558- return 0;
46559+ *snr = (status->snr << 8) | status->snr;
46560+
46561+out:
46562+ kfree(cmd);
46563+ kfree(status);
46564+ return ret;
46565 }
46566
46567 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46568@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46569 {
46570 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46571 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46572- struct dvbt_set_parameters_msg param;
46573- char result[2];
46574+ struct dvbt_set_parameters_msg *param;
46575+ char *result;
46576 int err;
46577
46578- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46579- param.tps = cpu_to_le16(compute_tps(fep));
46580- param.freq = cpu_to_le32(fep->frequency / 1000);
46581- param.flags = 0;
46582+ result = kmalloc(2, GFP_KERNEL);
46583+ if (result == NULL)
46584+ return -ENOMEM;
46585+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46586+ if (param == NULL) {
46587+ kfree(result);
46588+ return -ENOMEM;
46589+ }
46590+
46591+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46592+ param->tps = cpu_to_le16(compute_tps(fep));
46593+ param->freq = cpu_to_le32(fep->frequency / 1000);
46594+ param->flags = 0;
46595
46596 switch (fep->bandwidth_hz) {
46597 default:
46598 case 8000000:
46599- param.bandwidth = 8;
46600+ param->bandwidth = 8;
46601 break;
46602 case 7000000:
46603- param.bandwidth = 7;
46604+ param->bandwidth = 7;
46605 break;
46606 case 6000000:
46607- param.bandwidth = 6;
46608+ param->bandwidth = 6;
46609 break;
46610 }
46611
46612 err = dvb_usb_generic_rw(state->d,
46613- (char *)&param, sizeof(param),
46614- result, sizeof(result), 0);
46615+ (char *)param, sizeof(*param),
46616+ result, 2, 0);
46617 if (err < 0)
46618 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46619
46620- return (err < 0) ? err : 0;
46621+ kfree(result);
46622+ kfree(param);
46623+ return err;
46624 }
46625
46626 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46627diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46628index 733a7ff..f8b52e3 100644
46629--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46630+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46631@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46632
46633 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46634 {
46635- struct hexline hx;
46636- u8 reset;
46637+ struct hexline *hx;
46638+ u8 *reset;
46639 int ret,pos=0;
46640
46641+ reset = kmalloc(1, GFP_KERNEL);
46642+ if (reset == NULL)
46643+ return -ENOMEM;
46644+
46645+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46646+ if (hx == NULL) {
46647+ kfree(reset);
46648+ return -ENOMEM;
46649+ }
46650+
46651 /* stop the CPU */
46652- reset = 1;
46653- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46654+ reset[0] = 1;
46655+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46656 err("could not stop the USB controller CPU.");
46657
46658- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46659- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46660- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46661+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46662+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46663+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46664
46665- if (ret != hx.len) {
46666+ if (ret != hx->len) {
46667 err("error while transferring firmware "
46668 "(transferred size: %d, block size: %d)",
46669- ret,hx.len);
46670+ ret,hx->len);
46671 ret = -EINVAL;
46672 break;
46673 }
46674 }
46675 if (ret < 0) {
46676 err("firmware download failed at %d with %d",pos,ret);
46677+ kfree(reset);
46678+ kfree(hx);
46679 return ret;
46680 }
46681
46682 if (ret == 0) {
46683 /* restart the CPU */
46684- reset = 0;
46685- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
46686+ reset[0] = 0;
46687+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46688 err("could not restart the USB controller CPU.");
46689 ret = -EINVAL;
46690 }
46691 } else
46692 ret = -EIO;
46693
46694+ kfree(reset);
46695+ kfree(hx);
46696+
46697 return ret;
46698 }
46699 EXPORT_SYMBOL(usb_cypress_load_firmware);
46700diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46701index 5801ae7..83f71fa 100644
46702--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46703+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46704@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46705 static int technisat_usb2_i2c_access(struct usb_device *udev,
46706 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46707 {
46708- u8 b[64];
46709- int ret, actual_length;
46710+ u8 *b = kmalloc(64, GFP_KERNEL);
46711+ int ret, actual_length, error = 0;
46712+
46713+ if (b == NULL)
46714+ return -ENOMEM;
46715
46716 deb_i2c("i2c-access: %02x, tx: ", device_addr);
46717 debug_dump(tx, txlen, deb_i2c);
46718@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46719
46720 if (ret < 0) {
46721 err("i2c-error: out failed %02x = %d", device_addr, ret);
46722- return -ENODEV;
46723+ error = -ENODEV;
46724+ goto out;
46725 }
46726
46727 ret = usb_bulk_msg(udev,
46728@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46729 b, 64, &actual_length, 1000);
46730 if (ret < 0) {
46731 err("i2c-error: in failed %02x = %d", device_addr, ret);
46732- return -ENODEV;
46733+ error = -ENODEV;
46734+ goto out;
46735 }
46736
46737 if (b[0] != I2C_STATUS_OK) {
46738@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46739 /* handle tuner-i2c-nak */
46740 if (!(b[0] == I2C_STATUS_NAK &&
46741 device_addr == 0x60
46742- /* && device_is_technisat_usb2 */))
46743- return -ENODEV;
46744+ /* && device_is_technisat_usb2 */)) {
46745+ error = -ENODEV;
46746+ goto out;
46747+ }
46748 }
46749
46750 deb_i2c("status: %d, ", b[0]);
46751@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46752
46753 deb_i2c("\n");
46754
46755- return 0;
46756+out:
46757+ kfree(b);
46758+ return error;
46759 }
46760
46761 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
46762@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46763 {
46764 int ret;
46765
46766- u8 led[8] = {
46767- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46768- 0
46769- };
46770+ u8 *led = kzalloc(8, GFP_KERNEL);
46771+
46772+ if (led == NULL)
46773+ return -ENOMEM;
46774
46775 if (disable_led_control && state != TECH_LED_OFF)
46776 return 0;
46777
46778+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
46779+
46780 switch (state) {
46781 case TECH_LED_ON:
46782 led[1] = 0x82;
46783@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46784 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46785 USB_TYPE_VENDOR | USB_DIR_OUT,
46786 0, 0,
46787- led, sizeof(led), 500);
46788+ led, 8, 500);
46789
46790 mutex_unlock(&d->i2c_mutex);
46791+
46792+ kfree(led);
46793+
46794 return ret;
46795 }
46796
46797 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
46798 {
46799 int ret;
46800- u8 b = 0;
46801+ u8 *b = kzalloc(1, GFP_KERNEL);
46802+
46803+ if (b == NULL)
46804+ return -ENOMEM;
46805
46806 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
46807 return -EAGAIN;
46808@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
46809 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
46810 USB_TYPE_VENDOR | USB_DIR_OUT,
46811 (red << 8) | green, 0,
46812- &b, 1, 500);
46813+ b, 1, 500);
46814
46815 mutex_unlock(&d->i2c_mutex);
46816
46817+ kfree(b);
46818+
46819 return ret;
46820 }
46821
46822@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46823 struct dvb_usb_device_description **desc, int *cold)
46824 {
46825 int ret;
46826- u8 version[3];
46827+ u8 *version = kmalloc(3, GFP_KERNEL);
46828
46829 /* first select the interface */
46830 if (usb_set_interface(udev, 0, 1) != 0)
46831@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46832
46833 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
46834
46835+ if (version == NULL)
46836+ return 0;
46837+
46838 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
46839 GET_VERSION_INFO_VENDOR_REQUEST,
46840 USB_TYPE_VENDOR | USB_DIR_IN,
46841 0, 0,
46842- version, sizeof(version), 500);
46843+ version, 3, 500);
46844
46845 if (ret < 0)
46846 *cold = 1;
46847@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46848 *cold = 0;
46849 }
46850
46851+ kfree(version);
46852+
46853 return 0;
46854 }
46855
46856@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
46857
46858 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46859 {
46860- u8 buf[62], *b;
46861+ u8 *buf, *b;
46862 int ret;
46863 struct ir_raw_event ev;
46864
46865+ buf = kmalloc(62, GFP_KERNEL);
46866+
46867+ if (buf == NULL)
46868+ return -ENOMEM;
46869+
46870 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46871 buf[1] = 0x08;
46872 buf[2] = 0x8f;
46873@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46874 GET_IR_DATA_VENDOR_REQUEST,
46875 USB_TYPE_VENDOR | USB_DIR_IN,
46876 0x8080, 0,
46877- buf, sizeof(buf), 500);
46878+ buf, 62, 500);
46879
46880 unlock:
46881 mutex_unlock(&d->i2c_mutex);
46882
46883- if (ret < 0)
46884+ if (ret < 0) {
46885+ kfree(buf);
46886 return ret;
46887+ }
46888
46889- if (ret == 1)
46890+ if (ret == 1) {
46891+ kfree(buf);
46892 return 0; /* no key pressed */
46893+ }
46894
46895 /* decoding */
46896 b = buf+1;
46897@@ -656,6 +689,8 @@ unlock:
46898
46899 ir_raw_event_handle(d->rc_dev);
46900
46901+ kfree(buf);
46902+
46903 return 1;
46904 }
46905
46906diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46907index af63543..0436f20 100644
46908--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46909+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46910@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46911 * by passing a very big num_planes value */
46912 uplane = compat_alloc_user_space(num_planes *
46913 sizeof(struct v4l2_plane));
46914- kp->m.planes = (__force struct v4l2_plane *)uplane;
46915+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46916
46917 while (--num_planes >= 0) {
46918 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46919@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46920 if (num_planes == 0)
46921 return 0;
46922
46923- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46924+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46925 if (get_user(p, &up->m.planes))
46926 return -EFAULT;
46927 uplane32 = compat_ptr(p);
46928@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46929 get_user(kp->flags, &up->flags) ||
46930 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46931 return -EFAULT;
46932- kp->base = (__force void *)compat_ptr(tmp);
46933+ kp->base = (__force_kernel void *)compat_ptr(tmp);
46934 return 0;
46935 }
46936
46937@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46938 n * sizeof(struct v4l2_ext_control32)))
46939 return -EFAULT;
46940 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46941- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46942+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46943 while (--n >= 0) {
46944 u32 id;
46945
46946@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46947 {
46948 struct v4l2_ext_control32 __user *ucontrols;
46949 struct v4l2_ext_control __user *kcontrols =
46950- (__force struct v4l2_ext_control __user *)kp->controls;
46951+ (struct v4l2_ext_control __force_user *)kp->controls;
46952 int n = kp->count;
46953 compat_caddr_t p;
46954
46955@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46956 get_user(tmp, &up->edid) ||
46957 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46958 return -EFAULT;
46959- kp->edid = (__force u8 *)compat_ptr(tmp);
46960+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46961 return 0;
46962 }
46963
46964diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46965index 5b0a30b..1974b38 100644
46966--- a/drivers/media/v4l2-core/v4l2-device.c
46967+++ b/drivers/media/v4l2-core/v4l2-device.c
46968@@ -74,9 +74,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46969 EXPORT_SYMBOL_GPL(v4l2_device_put);
46970
46971 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46972- atomic_t *instance)
46973+ atomic_unchecked_t *instance)
46974 {
46975- int num = atomic_inc_return(instance) - 1;
46976+ int num = atomic_inc_return_unchecked(instance) - 1;
46977 int len = strlen(basename);
46978
46979 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46980diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46981index aa407cb..ee847d4 100644
46982--- a/drivers/media/v4l2-core/v4l2-ioctl.c
46983+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46984@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
46985 struct file *file, void *fh, void *p);
46986 } u;
46987 void (*debug)(const void *arg, bool write_only);
46988-};
46989+} __do_const;
46990+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46991
46992 /* This control needs a priority check */
46993 #define INFO_FL_PRIO (1 << 0)
46994@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
46995 struct video_device *vfd = video_devdata(file);
46996 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46997 bool write_only = false;
46998- struct v4l2_ioctl_info default_info;
46999+ v4l2_ioctl_info_no_const default_info;
47000 const struct v4l2_ioctl_info *info;
47001 void *fh = file->private_data;
47002 struct v4l2_fh *vfh = NULL;
47003@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47004 ret = -EINVAL;
47005 break;
47006 }
47007- *user_ptr = (void __user *)buf->m.planes;
47008+ *user_ptr = (void __force_user *)buf->m.planes;
47009 *kernel_ptr = (void **)&buf->m.planes;
47010 *array_size = sizeof(struct v4l2_plane) * buf->length;
47011 ret = 1;
47012@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47013 ret = -EINVAL;
47014 break;
47015 }
47016- *user_ptr = (void __user *)edid->edid;
47017+ *user_ptr = (void __force_user *)edid->edid;
47018 *kernel_ptr = (void **)&edid->edid;
47019 *array_size = edid->blocks * 128;
47020 ret = 1;
47021@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47022 ret = -EINVAL;
47023 break;
47024 }
47025- *user_ptr = (void __user *)ctrls->controls;
47026+ *user_ptr = (void __force_user *)ctrls->controls;
47027 *kernel_ptr = (void **)&ctrls->controls;
47028 *array_size = sizeof(struct v4l2_ext_control)
47029 * ctrls->count;
47030@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
47031 }
47032
47033 if (has_array_args) {
47034- *kernel_ptr = (void __force *)user_ptr;
47035+ *kernel_ptr = (void __force_kernel *)user_ptr;
47036 if (copy_to_user(user_ptr, mbuf, array_size))
47037 err = -EFAULT;
47038 goto out_array_args;
47039diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
47040index c94ea0d..b8a9f88 100644
47041--- a/drivers/memory/omap-gpmc.c
47042+++ b/drivers/memory/omap-gpmc.c
47043@@ -232,7 +232,6 @@ struct omap3_gpmc_regs {
47044 };
47045
47046 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
47047-static struct irq_chip gpmc_irq_chip;
47048 static int gpmc_irq_start;
47049
47050 static struct resource gpmc_mem_root;
47051@@ -1146,6 +1145,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
47052
47053 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
47054
47055+static struct irq_chip gpmc_irq_chip = {
47056+ .name = "gpmc",
47057+ .irq_startup = gpmc_irq_noop_ret,
47058+ .irq_enable = gpmc_irq_enable,
47059+ .irq_disable = gpmc_irq_disable,
47060+ .irq_shutdown = gpmc_irq_noop,
47061+ .irq_ack = gpmc_irq_noop,
47062+ .irq_mask = gpmc_irq_noop,
47063+ .irq_unmask = gpmc_irq_noop,
47064+};
47065+
47066 static int gpmc_setup_irq(void)
47067 {
47068 int i;
47069@@ -1160,15 +1170,6 @@ static int gpmc_setup_irq(void)
47070 return gpmc_irq_start;
47071 }
47072
47073- gpmc_irq_chip.name = "gpmc";
47074- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
47075- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
47076- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
47077- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47078- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47079- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47080- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47081-
47082 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47083 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47084
47085diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47086index 187f836..679544b 100644
47087--- a/drivers/message/fusion/mptbase.c
47088+++ b/drivers/message/fusion/mptbase.c
47089@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47090 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47091 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47092
47093+#ifdef CONFIG_GRKERNSEC_HIDESYM
47094+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47095+#else
47096 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47097 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47098+#endif
47099+
47100 /*
47101 * Rounding UP to nearest 4-kB boundary here...
47102 */
47103@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47104 ioc->facts.GlobalCredits);
47105
47106 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47107+#ifdef CONFIG_GRKERNSEC_HIDESYM
47108+ NULL, NULL);
47109+#else
47110 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47111+#endif
47112 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47113 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47114 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47115diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47116index 5bdaae1..eced16f 100644
47117--- a/drivers/message/fusion/mptsas.c
47118+++ b/drivers/message/fusion/mptsas.c
47119@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47120 return 0;
47121 }
47122
47123+static inline void
47124+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47125+{
47126+ if (phy_info->port_details) {
47127+ phy_info->port_details->rphy = rphy;
47128+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47129+ ioc->name, rphy));
47130+ }
47131+
47132+ if (rphy) {
47133+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47134+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47135+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47136+ ioc->name, rphy, rphy->dev.release));
47137+ }
47138+}
47139+
47140 /* no mutex */
47141 static void
47142 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47143@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47144 return NULL;
47145 }
47146
47147-static inline void
47148-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47149-{
47150- if (phy_info->port_details) {
47151- phy_info->port_details->rphy = rphy;
47152- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47153- ioc->name, rphy));
47154- }
47155-
47156- if (rphy) {
47157- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47158- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47159- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47160- ioc->name, rphy, rphy->dev.release));
47161- }
47162-}
47163-
47164 static inline struct sas_port *
47165 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47166 {
47167diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47168index cdd6f3d..1907a98 100644
47169--- a/drivers/mfd/ab8500-debugfs.c
47170+++ b/drivers/mfd/ab8500-debugfs.c
47171@@ -100,7 +100,7 @@ static int irq_last;
47172 static u32 *irq_count;
47173 static int num_irqs;
47174
47175-static struct device_attribute **dev_attr;
47176+static device_attribute_no_const **dev_attr;
47177 static char **event_name;
47178
47179 static u8 avg_sample = SAMPLE_16;
47180diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47181index 8057849..0550fdf 100644
47182--- a/drivers/mfd/kempld-core.c
47183+++ b/drivers/mfd/kempld-core.c
47184@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47185 .remove = kempld_remove,
47186 };
47187
47188-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47189+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47190 {
47191 .ident = "BHL6",
47192 .matches = {
47193diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47194index c880c89..45a7c68 100644
47195--- a/drivers/mfd/max8925-i2c.c
47196+++ b/drivers/mfd/max8925-i2c.c
47197@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47198 const struct i2c_device_id *id)
47199 {
47200 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47201- static struct max8925_chip *chip;
47202+ struct max8925_chip *chip;
47203 struct device_node *node = client->dev.of_node;
47204
47205 if (node && !pdata) {
47206diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47207index 7612d89..70549c2 100644
47208--- a/drivers/mfd/tps65910.c
47209+++ b/drivers/mfd/tps65910.c
47210@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47211 struct tps65910_platform_data *pdata)
47212 {
47213 int ret = 0;
47214- static struct regmap_irq_chip *tps6591x_irqs_chip;
47215+ struct regmap_irq_chip *tps6591x_irqs_chip;
47216
47217 if (!irq) {
47218 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47219diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47220index 1b772ef..01e77d33 100644
47221--- a/drivers/mfd/twl4030-irq.c
47222+++ b/drivers/mfd/twl4030-irq.c
47223@@ -34,6 +34,7 @@
47224 #include <linux/of.h>
47225 #include <linux/irqdomain.h>
47226 #include <linux/i2c/twl.h>
47227+#include <asm/pgtable.h>
47228
47229 #include "twl-core.h"
47230
47231@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47232 * Install an irq handler for each of the SIH modules;
47233 * clone dummy irq_chip since PIH can't *do* anything
47234 */
47235- twl4030_irq_chip = dummy_irq_chip;
47236- twl4030_irq_chip.name = "twl4030";
47237+ pax_open_kernel();
47238+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47239+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47240
47241- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47242+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47243+ pax_close_kernel();
47244
47245 for (i = irq_base; i < irq_end; i++) {
47246 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47247diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47248index 464419b..64bae8d 100644
47249--- a/drivers/misc/c2port/core.c
47250+++ b/drivers/misc/c2port/core.c
47251@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47252 goto error_idr_alloc;
47253 c2dev->id = ret;
47254
47255- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47256+ pax_open_kernel();
47257+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47258+ pax_close_kernel();
47259
47260 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47261 "c2port%d", c2dev->id);
47262diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47263index 8385177..2f54635 100644
47264--- a/drivers/misc/eeprom/sunxi_sid.c
47265+++ b/drivers/misc/eeprom/sunxi_sid.c
47266@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47267
47268 platform_set_drvdata(pdev, sid_data);
47269
47270- sid_bin_attr.size = sid_data->keysize;
47271+ pax_open_kernel();
47272+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47273+ pax_close_kernel();
47274 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47275 return -ENODEV;
47276
47277diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47278index 36f5d52..32311c3 100644
47279--- a/drivers/misc/kgdbts.c
47280+++ b/drivers/misc/kgdbts.c
47281@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47282 char before[BREAK_INSTR_SIZE];
47283 char after[BREAK_INSTR_SIZE];
47284
47285- probe_kernel_read(before, (char *)kgdbts_break_test,
47286+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47287 BREAK_INSTR_SIZE);
47288 init_simple_test();
47289 ts.tst = plant_and_detach_test;
47290@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47291 /* Activate test with initial breakpoint */
47292 if (!is_early)
47293 kgdb_breakpoint();
47294- probe_kernel_read(after, (char *)kgdbts_break_test,
47295+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47296 BREAK_INSTR_SIZE);
47297 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47298 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47299diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47300index 4739689..8a52950 100644
47301--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47302+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47303@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47304 * the lid is closed. This leads to interrupts as soon as a little move
47305 * is done.
47306 */
47307- atomic_inc(&lis3->count);
47308+ atomic_inc_unchecked(&lis3->count);
47309
47310 wake_up_interruptible(&lis3->misc_wait);
47311 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47312@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47313 if (lis3->pm_dev)
47314 pm_runtime_get_sync(lis3->pm_dev);
47315
47316- atomic_set(&lis3->count, 0);
47317+ atomic_set_unchecked(&lis3->count, 0);
47318 return 0;
47319 }
47320
47321@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47322 add_wait_queue(&lis3->misc_wait, &wait);
47323 while (true) {
47324 set_current_state(TASK_INTERRUPTIBLE);
47325- data = atomic_xchg(&lis3->count, 0);
47326+ data = atomic_xchg_unchecked(&lis3->count, 0);
47327 if (data)
47328 break;
47329
47330@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47331 struct lis3lv02d, miscdev);
47332
47333 poll_wait(file, &lis3->misc_wait, wait);
47334- if (atomic_read(&lis3->count))
47335+ if (atomic_read_unchecked(&lis3->count))
47336 return POLLIN | POLLRDNORM;
47337 return 0;
47338 }
47339diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47340index c439c82..1f20f57 100644
47341--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47342+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47343@@ -297,7 +297,7 @@ struct lis3lv02d {
47344 struct input_polled_dev *idev; /* input device */
47345 struct platform_device *pdev; /* platform device */
47346 struct regulator_bulk_data regulators[2];
47347- atomic_t count; /* interrupt count after last read */
47348+ atomic_unchecked_t count; /* interrupt count after last read */
47349 union axis_conversion ac; /* hw -> logical axis */
47350 int mapped_btns[3];
47351
47352diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47353index 2f30bad..c4c13d0 100644
47354--- a/drivers/misc/sgi-gru/gruhandles.c
47355+++ b/drivers/misc/sgi-gru/gruhandles.c
47356@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47357 unsigned long nsec;
47358
47359 nsec = CLKS2NSEC(clks);
47360- atomic_long_inc(&mcs_op_statistics[op].count);
47361- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47362+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47363+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47364 if (mcs_op_statistics[op].max < nsec)
47365 mcs_op_statistics[op].max = nsec;
47366 }
47367diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47368index 4f76359..cdfcb2e 100644
47369--- a/drivers/misc/sgi-gru/gruprocfs.c
47370+++ b/drivers/misc/sgi-gru/gruprocfs.c
47371@@ -32,9 +32,9 @@
47372
47373 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47374
47375-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47376+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47377 {
47378- unsigned long val = atomic_long_read(v);
47379+ unsigned long val = atomic_long_read_unchecked(v);
47380
47381 seq_printf(s, "%16lu %s\n", val, id);
47382 }
47383@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47384
47385 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47386 for (op = 0; op < mcsop_last; op++) {
47387- count = atomic_long_read(&mcs_op_statistics[op].count);
47388- total = atomic_long_read(&mcs_op_statistics[op].total);
47389+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47390+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47391 max = mcs_op_statistics[op].max;
47392 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47393 count ? total / count : 0, max);
47394diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47395index 5c3ce24..4915ccb 100644
47396--- a/drivers/misc/sgi-gru/grutables.h
47397+++ b/drivers/misc/sgi-gru/grutables.h
47398@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47399 * GRU statistics.
47400 */
47401 struct gru_stats_s {
47402- atomic_long_t vdata_alloc;
47403- atomic_long_t vdata_free;
47404- atomic_long_t gts_alloc;
47405- atomic_long_t gts_free;
47406- atomic_long_t gms_alloc;
47407- atomic_long_t gms_free;
47408- atomic_long_t gts_double_allocate;
47409- atomic_long_t assign_context;
47410- atomic_long_t assign_context_failed;
47411- atomic_long_t free_context;
47412- atomic_long_t load_user_context;
47413- atomic_long_t load_kernel_context;
47414- atomic_long_t lock_kernel_context;
47415- atomic_long_t unlock_kernel_context;
47416- atomic_long_t steal_user_context;
47417- atomic_long_t steal_kernel_context;
47418- atomic_long_t steal_context_failed;
47419- atomic_long_t nopfn;
47420- atomic_long_t asid_new;
47421- atomic_long_t asid_next;
47422- atomic_long_t asid_wrap;
47423- atomic_long_t asid_reuse;
47424- atomic_long_t intr;
47425- atomic_long_t intr_cbr;
47426- atomic_long_t intr_tfh;
47427- atomic_long_t intr_spurious;
47428- atomic_long_t intr_mm_lock_failed;
47429- atomic_long_t call_os;
47430- atomic_long_t call_os_wait_queue;
47431- atomic_long_t user_flush_tlb;
47432- atomic_long_t user_unload_context;
47433- atomic_long_t user_exception;
47434- atomic_long_t set_context_option;
47435- atomic_long_t check_context_retarget_intr;
47436- atomic_long_t check_context_unload;
47437- atomic_long_t tlb_dropin;
47438- atomic_long_t tlb_preload_page;
47439- atomic_long_t tlb_dropin_fail_no_asid;
47440- atomic_long_t tlb_dropin_fail_upm;
47441- atomic_long_t tlb_dropin_fail_invalid;
47442- atomic_long_t tlb_dropin_fail_range_active;
47443- atomic_long_t tlb_dropin_fail_idle;
47444- atomic_long_t tlb_dropin_fail_fmm;
47445- atomic_long_t tlb_dropin_fail_no_exception;
47446- atomic_long_t tfh_stale_on_fault;
47447- atomic_long_t mmu_invalidate_range;
47448- atomic_long_t mmu_invalidate_page;
47449- atomic_long_t flush_tlb;
47450- atomic_long_t flush_tlb_gru;
47451- atomic_long_t flush_tlb_gru_tgh;
47452- atomic_long_t flush_tlb_gru_zero_asid;
47453+ atomic_long_unchecked_t vdata_alloc;
47454+ atomic_long_unchecked_t vdata_free;
47455+ atomic_long_unchecked_t gts_alloc;
47456+ atomic_long_unchecked_t gts_free;
47457+ atomic_long_unchecked_t gms_alloc;
47458+ atomic_long_unchecked_t gms_free;
47459+ atomic_long_unchecked_t gts_double_allocate;
47460+ atomic_long_unchecked_t assign_context;
47461+ atomic_long_unchecked_t assign_context_failed;
47462+ atomic_long_unchecked_t free_context;
47463+ atomic_long_unchecked_t load_user_context;
47464+ atomic_long_unchecked_t load_kernel_context;
47465+ atomic_long_unchecked_t lock_kernel_context;
47466+ atomic_long_unchecked_t unlock_kernel_context;
47467+ atomic_long_unchecked_t steal_user_context;
47468+ atomic_long_unchecked_t steal_kernel_context;
47469+ atomic_long_unchecked_t steal_context_failed;
47470+ atomic_long_unchecked_t nopfn;
47471+ atomic_long_unchecked_t asid_new;
47472+ atomic_long_unchecked_t asid_next;
47473+ atomic_long_unchecked_t asid_wrap;
47474+ atomic_long_unchecked_t asid_reuse;
47475+ atomic_long_unchecked_t intr;
47476+ atomic_long_unchecked_t intr_cbr;
47477+ atomic_long_unchecked_t intr_tfh;
47478+ atomic_long_unchecked_t intr_spurious;
47479+ atomic_long_unchecked_t intr_mm_lock_failed;
47480+ atomic_long_unchecked_t call_os;
47481+ atomic_long_unchecked_t call_os_wait_queue;
47482+ atomic_long_unchecked_t user_flush_tlb;
47483+ atomic_long_unchecked_t user_unload_context;
47484+ atomic_long_unchecked_t user_exception;
47485+ atomic_long_unchecked_t set_context_option;
47486+ atomic_long_unchecked_t check_context_retarget_intr;
47487+ atomic_long_unchecked_t check_context_unload;
47488+ atomic_long_unchecked_t tlb_dropin;
47489+ atomic_long_unchecked_t tlb_preload_page;
47490+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47491+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47492+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47493+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47494+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47495+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47496+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47497+ atomic_long_unchecked_t tfh_stale_on_fault;
47498+ atomic_long_unchecked_t mmu_invalidate_range;
47499+ atomic_long_unchecked_t mmu_invalidate_page;
47500+ atomic_long_unchecked_t flush_tlb;
47501+ atomic_long_unchecked_t flush_tlb_gru;
47502+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47503+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47504
47505- atomic_long_t copy_gpa;
47506- atomic_long_t read_gpa;
47507+ atomic_long_unchecked_t copy_gpa;
47508+ atomic_long_unchecked_t read_gpa;
47509
47510- atomic_long_t mesq_receive;
47511- atomic_long_t mesq_receive_none;
47512- atomic_long_t mesq_send;
47513- atomic_long_t mesq_send_failed;
47514- atomic_long_t mesq_noop;
47515- atomic_long_t mesq_send_unexpected_error;
47516- atomic_long_t mesq_send_lb_overflow;
47517- atomic_long_t mesq_send_qlimit_reached;
47518- atomic_long_t mesq_send_amo_nacked;
47519- atomic_long_t mesq_send_put_nacked;
47520- atomic_long_t mesq_page_overflow;
47521- atomic_long_t mesq_qf_locked;
47522- atomic_long_t mesq_qf_noop_not_full;
47523- atomic_long_t mesq_qf_switch_head_failed;
47524- atomic_long_t mesq_qf_unexpected_error;
47525- atomic_long_t mesq_noop_unexpected_error;
47526- atomic_long_t mesq_noop_lb_overflow;
47527- atomic_long_t mesq_noop_qlimit_reached;
47528- atomic_long_t mesq_noop_amo_nacked;
47529- atomic_long_t mesq_noop_put_nacked;
47530- atomic_long_t mesq_noop_page_overflow;
47531+ atomic_long_unchecked_t mesq_receive;
47532+ atomic_long_unchecked_t mesq_receive_none;
47533+ atomic_long_unchecked_t mesq_send;
47534+ atomic_long_unchecked_t mesq_send_failed;
47535+ atomic_long_unchecked_t mesq_noop;
47536+ atomic_long_unchecked_t mesq_send_unexpected_error;
47537+ atomic_long_unchecked_t mesq_send_lb_overflow;
47538+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47539+ atomic_long_unchecked_t mesq_send_amo_nacked;
47540+ atomic_long_unchecked_t mesq_send_put_nacked;
47541+ atomic_long_unchecked_t mesq_page_overflow;
47542+ atomic_long_unchecked_t mesq_qf_locked;
47543+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47544+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47545+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47546+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47547+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47548+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47549+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47550+ atomic_long_unchecked_t mesq_noop_put_nacked;
47551+ atomic_long_unchecked_t mesq_noop_page_overflow;
47552
47553 };
47554
47555@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47556 tghop_invalidate, mcsop_last};
47557
47558 struct mcs_op_statistic {
47559- atomic_long_t count;
47560- atomic_long_t total;
47561+ atomic_long_unchecked_t count;
47562+ atomic_long_unchecked_t total;
47563 unsigned long max;
47564 };
47565
47566@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47567
47568 #define STAT(id) do { \
47569 if (gru_options & OPT_STATS) \
47570- atomic_long_inc(&gru_stats.id); \
47571+ atomic_long_inc_unchecked(&gru_stats.id); \
47572 } while (0)
47573
47574 #ifdef CONFIG_SGI_GRU_DEBUG
47575diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47576index c862cd4..0d176fe 100644
47577--- a/drivers/misc/sgi-xp/xp.h
47578+++ b/drivers/misc/sgi-xp/xp.h
47579@@ -288,7 +288,7 @@ struct xpc_interface {
47580 xpc_notify_func, void *);
47581 void (*received) (short, int, void *);
47582 enum xp_retval (*partid_to_nasids) (short, void *);
47583-};
47584+} __no_const;
47585
47586 extern struct xpc_interface xpc_interface;
47587
47588diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47589index 01be66d..e3a0c7e 100644
47590--- a/drivers/misc/sgi-xp/xp_main.c
47591+++ b/drivers/misc/sgi-xp/xp_main.c
47592@@ -78,13 +78,13 @@ xpc_notloaded(void)
47593 }
47594
47595 struct xpc_interface xpc_interface = {
47596- (void (*)(int))xpc_notloaded,
47597- (void (*)(int))xpc_notloaded,
47598- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47599- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47600+ .connect = (void (*)(int))xpc_notloaded,
47601+ .disconnect = (void (*)(int))xpc_notloaded,
47602+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47603+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47604 void *))xpc_notloaded,
47605- (void (*)(short, int, void *))xpc_notloaded,
47606- (enum xp_retval(*)(short, void *))xpc_notloaded
47607+ .received = (void (*)(short, int, void *))xpc_notloaded,
47608+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47609 };
47610 EXPORT_SYMBOL_GPL(xpc_interface);
47611
47612diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47613index b94d5f7..7f494c5 100644
47614--- a/drivers/misc/sgi-xp/xpc.h
47615+++ b/drivers/misc/sgi-xp/xpc.h
47616@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47617 void (*received_payload) (struct xpc_channel *, void *);
47618 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47619 };
47620+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47621
47622 /* struct xpc_partition act_state values (for XPC HB) */
47623
47624@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47625 /* found in xpc_main.c */
47626 extern struct device *xpc_part;
47627 extern struct device *xpc_chan;
47628-extern struct xpc_arch_operations xpc_arch_ops;
47629+extern xpc_arch_operations_no_const xpc_arch_ops;
47630 extern int xpc_disengage_timelimit;
47631 extern int xpc_disengage_timedout;
47632 extern int xpc_activate_IRQ_rcvd;
47633diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47634index 7f32712..8539ab2 100644
47635--- a/drivers/misc/sgi-xp/xpc_main.c
47636+++ b/drivers/misc/sgi-xp/xpc_main.c
47637@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47638 .notifier_call = xpc_system_die,
47639 };
47640
47641-struct xpc_arch_operations xpc_arch_ops;
47642+xpc_arch_operations_no_const xpc_arch_ops;
47643
47644 /*
47645 * Timer function to enforce the timelimit on the partition disengage.
47646diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47647index 31d2627..d1b80a5 100644
47648--- a/drivers/mmc/card/block.c
47649+++ b/drivers/mmc/card/block.c
47650@@ -579,7 +579,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47651 if (idata->ic.postsleep_min_us)
47652 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47653
47654- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47655+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47656 err = -EFAULT;
47657 goto cmd_rel_host;
47658 }
47659diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47660index f45ab91..9f50d8f 100644
47661--- a/drivers/mmc/host/dw_mmc.h
47662+++ b/drivers/mmc/host/dw_mmc.h
47663@@ -287,5 +287,5 @@ struct dw_mci_drv_data {
47664 int (*execute_tuning)(struct dw_mci_slot *slot);
47665 int (*prepare_hs400_tuning)(struct dw_mci *host,
47666 struct mmc_ios *ios);
47667-};
47668+} __do_const;
47669 #endif /* _DW_MMC_H_ */
47670diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47671index fb26674..3172c2b 100644
47672--- a/drivers/mmc/host/mmci.c
47673+++ b/drivers/mmc/host/mmci.c
47674@@ -1633,7 +1633,9 @@ static int mmci_probe(struct amba_device *dev,
47675 mmc->caps |= MMC_CAP_CMD23;
47676
47677 if (variant->busy_detect) {
47678- mmci_ops.card_busy = mmci_card_busy;
47679+ pax_open_kernel();
47680+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47681+ pax_close_kernel();
47682 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47683 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47684 mmc->max_busy_timeout = 0;
47685diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47686index d0abdffb..bb1f8d7 100644
47687--- a/drivers/mmc/host/omap_hsmmc.c
47688+++ b/drivers/mmc/host/omap_hsmmc.c
47689@@ -2004,7 +2004,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47690
47691 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47692 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47693- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47694+ pax_open_kernel();
47695+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47696+ pax_close_kernel();
47697 }
47698
47699 pm_runtime_enable(host->dev);
47700diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47701index 82f512d..5a228bb 100644
47702--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47703+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47704@@ -993,9 +993,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47705 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47706 }
47707
47708- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47709- sdhci_esdhc_ops.platform_execute_tuning =
47710+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47711+ pax_open_kernel();
47712+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47713 esdhc_executing_tuning;
47714+ pax_close_kernel();
47715+ }
47716
47717 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47718 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47719diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47720index c6d2dd7..81b1ca3 100644
47721--- a/drivers/mmc/host/sdhci-s3c.c
47722+++ b/drivers/mmc/host/sdhci-s3c.c
47723@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47724 * we can use overriding functions instead of default.
47725 */
47726 if (sc->no_divider) {
47727- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47728- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47729- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47730+ pax_open_kernel();
47731+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47732+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47733+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47734+ pax_close_kernel();
47735 }
47736
47737 /* It supports additional host capabilities if needed */
47738diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47739index 9a1a6ff..b8f1a57 100644
47740--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47741+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47742@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47743 size_t totlen = 0, thislen;
47744 int ret = 0;
47745 size_t buflen = 0;
47746- static char *buffer;
47747+ char *buffer;
47748
47749 if (!ECCBUF_SIZE) {
47750 /* We should fall back to a general writev implementation.
47751diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47752index 870c7fc..c7d6440 100644
47753--- a/drivers/mtd/nand/denali.c
47754+++ b/drivers/mtd/nand/denali.c
47755@@ -24,6 +24,7 @@
47756 #include <linux/slab.h>
47757 #include <linux/mtd/mtd.h>
47758 #include <linux/module.h>
47759+#include <linux/slab.h>
47760
47761 #include "denali.h"
47762
47763diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47764index 1b8f350..990f2e9 100644
47765--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47766+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47767@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47768
47769 /* first try to map the upper buffer directly */
47770 if (virt_addr_valid(this->upper_buf) &&
47771- !object_is_on_stack(this->upper_buf)) {
47772+ !object_starts_on_stack(this->upper_buf)) {
47773 sg_init_one(sgl, this->upper_buf, this->upper_len);
47774 ret = dma_map_sg(this->dev, sgl, 1, dr);
47775 if (ret == 0)
47776diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47777index a5dfbfb..8042ab4 100644
47778--- a/drivers/mtd/nftlmount.c
47779+++ b/drivers/mtd/nftlmount.c
47780@@ -24,6 +24,7 @@
47781 #include <asm/errno.h>
47782 #include <linux/delay.h>
47783 #include <linux/slab.h>
47784+#include <linux/sched.h>
47785 #include <linux/mtd/mtd.h>
47786 #include <linux/mtd/nand.h>
47787 #include <linux/mtd/nftl.h>
47788diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47789index c23184a..4115c41 100644
47790--- a/drivers/mtd/sm_ftl.c
47791+++ b/drivers/mtd/sm_ftl.c
47792@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47793 #define SM_CIS_VENDOR_OFFSET 0x59
47794 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47795 {
47796- struct attribute_group *attr_group;
47797+ attribute_group_no_const *attr_group;
47798 struct attribute **attributes;
47799 struct sm_sysfs_attribute *vendor_attribute;
47800 char *vendor;
47801diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47802index 7b11243..b3278a3 100644
47803--- a/drivers/net/bonding/bond_netlink.c
47804+++ b/drivers/net/bonding/bond_netlink.c
47805@@ -585,7 +585,7 @@ nla_put_failure:
47806 return -EMSGSIZE;
47807 }
47808
47809-struct rtnl_link_ops bond_link_ops __read_mostly = {
47810+struct rtnl_link_ops bond_link_ops = {
47811 .kind = "bond",
47812 .priv_size = sizeof(struct bonding),
47813 .setup = bond_setup,
47814diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47815index b3b922a..80bba38 100644
47816--- a/drivers/net/caif/caif_hsi.c
47817+++ b/drivers/net/caif/caif_hsi.c
47818@@ -1444,7 +1444,7 @@ err:
47819 return -ENODEV;
47820 }
47821
47822-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47823+static struct rtnl_link_ops caif_hsi_link_ops = {
47824 .kind = "cfhsi",
47825 .priv_size = sizeof(struct cfhsi),
47826 .setup = cfhsi_setup,
47827diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47828index e8c96b8..516a96c 100644
47829--- a/drivers/net/can/Kconfig
47830+++ b/drivers/net/can/Kconfig
47831@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47832
47833 config CAN_FLEXCAN
47834 tristate "Support for Freescale FLEXCAN based chips"
47835- depends on ARM || PPC
47836+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47837 ---help---
47838 Say Y here if you want to support for Freescale FlexCAN.
47839
47840diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47841index aede704..b516b4d 100644
47842--- a/drivers/net/can/dev.c
47843+++ b/drivers/net/can/dev.c
47844@@ -961,7 +961,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47845 return -EOPNOTSUPP;
47846 }
47847
47848-static struct rtnl_link_ops can_link_ops __read_mostly = {
47849+static struct rtnl_link_ops can_link_ops = {
47850 .kind = "can",
47851 .maxtype = IFLA_CAN_MAX,
47852 .policy = can_policy,
47853diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47854index 674f367..ec3a31f 100644
47855--- a/drivers/net/can/vcan.c
47856+++ b/drivers/net/can/vcan.c
47857@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
47858 dev->destructor = free_netdev;
47859 }
47860
47861-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47862+static struct rtnl_link_ops vcan_link_ops = {
47863 .kind = "vcan",
47864 .setup = vcan_setup,
47865 };
47866diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47867index 49adbf1..fff7ff8 100644
47868--- a/drivers/net/dummy.c
47869+++ b/drivers/net/dummy.c
47870@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47871 return 0;
47872 }
47873
47874-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47875+static struct rtnl_link_ops dummy_link_ops = {
47876 .kind = DRV_NAME,
47877 .setup = dummy_setup,
47878 .validate = dummy_validate,
47879diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47880index 0443654..4f0aa18 100644
47881--- a/drivers/net/ethernet/8390/ax88796.c
47882+++ b/drivers/net/ethernet/8390/ax88796.c
47883@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47884 if (ax->plat->reg_offsets)
47885 ei_local->reg_offset = ax->plat->reg_offsets;
47886 else {
47887+ resource_size_t _mem_size = mem_size;
47888+ do_div(_mem_size, 0x18);
47889 ei_local->reg_offset = ax->reg_offsets;
47890 for (ret = 0; ret < 0x18; ret++)
47891- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47892+ ax->reg_offsets[ret] = _mem_size * ret;
47893 }
47894
47895 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47896diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47897index da48e66..2dbec80 100644
47898--- a/drivers/net/ethernet/altera/altera_tse_main.c
47899+++ b/drivers/net/ethernet/altera/altera_tse_main.c
47900@@ -1256,7 +1256,7 @@ static int tse_shutdown(struct net_device *dev)
47901 return 0;
47902 }
47903
47904-static struct net_device_ops altera_tse_netdev_ops = {
47905+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47906 .ndo_open = tse_open,
47907 .ndo_stop = tse_shutdown,
47908 .ndo_start_xmit = tse_start_xmit,
47909@@ -1493,11 +1493,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47910 ndev->netdev_ops = &altera_tse_netdev_ops;
47911 altera_tse_set_ethtool_ops(ndev);
47912
47913+ pax_open_kernel();
47914 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47915
47916 if (priv->hash_filter)
47917 altera_tse_netdev_ops.ndo_set_rx_mode =
47918 tse_set_rx_mode_hashfilter;
47919+ pax_close_kernel();
47920
47921 /* Scatter/gather IO is not supported,
47922 * so it is turned off
47923diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47924index 34c28aa..5e06567 100644
47925--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47926+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47927@@ -1124,14 +1124,14 @@ do { \
47928 * operations, everything works on mask values.
47929 */
47930 #define XMDIO_READ(_pdata, _mmd, _reg) \
47931- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47932+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47933 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47934
47935 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47936 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47937
47938 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47939- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47940+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47941 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47942
47943 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47944diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47945index 8a50b01..39c1ad0 100644
47946--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47947+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47948@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47949
47950 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47951
47952- pdata->hw_if.config_dcb_tc(pdata);
47953+ pdata->hw_if->config_dcb_tc(pdata);
47954
47955 return 0;
47956 }
47957@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47958
47959 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47960
47961- pdata->hw_if.config_dcb_pfc(pdata);
47962+ pdata->hw_if->config_dcb_pfc(pdata);
47963
47964 return 0;
47965 }
47966diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47967index 5c92fb7..08be735 100644
47968--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47969+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47970@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
47971
47972 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47973 {
47974- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47975+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47976 struct xgbe_channel *channel;
47977 struct xgbe_ring *ring;
47978 struct xgbe_ring_data *rdata;
47979@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47980
47981 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47982 {
47983- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47984+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47985 struct xgbe_channel *channel;
47986 struct xgbe_ring *ring;
47987 struct xgbe_ring_desc *rdesc;
47988@@ -620,17 +620,12 @@ err_out:
47989 return 0;
47990 }
47991
47992-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47993-{
47994- DBGPR("-->xgbe_init_function_ptrs_desc\n");
47995-
47996- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47997- desc_if->free_ring_resources = xgbe_free_ring_resources;
47998- desc_if->map_tx_skb = xgbe_map_tx_skb;
47999- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
48000- desc_if->unmap_rdata = xgbe_unmap_rdata;
48001- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
48002- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
48003-
48004- DBGPR("<--xgbe_init_function_ptrs_desc\n");
48005-}
48006+struct xgbe_desc_if default_xgbe_desc_if = {
48007+ .alloc_ring_resources = xgbe_alloc_ring_resources,
48008+ .free_ring_resources = xgbe_free_ring_resources,
48009+ .map_tx_skb = xgbe_map_tx_skb,
48010+ .map_rx_buffer = xgbe_map_rx_buffer,
48011+ .unmap_rdata = xgbe_unmap_rdata,
48012+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
48013+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
48014+};
48015diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48016index 21d9497..c74b40f 100644
48017--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48018+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48019@@ -2772,7 +2772,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
48020
48021 static int xgbe_init(struct xgbe_prv_data *pdata)
48022 {
48023- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48024+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48025 int ret;
48026
48027 DBGPR("-->xgbe_init\n");
48028@@ -2838,106 +2838,101 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
48029 return 0;
48030 }
48031
48032-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
48033-{
48034- DBGPR("-->xgbe_init_function_ptrs\n");
48035-
48036- hw_if->tx_complete = xgbe_tx_complete;
48037-
48038- hw_if->set_mac_address = xgbe_set_mac_address;
48039- hw_if->config_rx_mode = xgbe_config_rx_mode;
48040-
48041- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
48042- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
48043-
48044- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
48045- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
48046- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
48047- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
48048- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
48049-
48050- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
48051- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
48052-
48053- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
48054- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
48055- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
48056-
48057- hw_if->enable_tx = xgbe_enable_tx;
48058- hw_if->disable_tx = xgbe_disable_tx;
48059- hw_if->enable_rx = xgbe_enable_rx;
48060- hw_if->disable_rx = xgbe_disable_rx;
48061-
48062- hw_if->powerup_tx = xgbe_powerup_tx;
48063- hw_if->powerdown_tx = xgbe_powerdown_tx;
48064- hw_if->powerup_rx = xgbe_powerup_rx;
48065- hw_if->powerdown_rx = xgbe_powerdown_rx;
48066-
48067- hw_if->dev_xmit = xgbe_dev_xmit;
48068- hw_if->dev_read = xgbe_dev_read;
48069- hw_if->enable_int = xgbe_enable_int;
48070- hw_if->disable_int = xgbe_disable_int;
48071- hw_if->init = xgbe_init;
48072- hw_if->exit = xgbe_exit;
48073+struct xgbe_hw_if default_xgbe_hw_if = {
48074+ .tx_complete = xgbe_tx_complete,
48075+
48076+ .set_mac_address = xgbe_set_mac_address,
48077+ .config_rx_mode = xgbe_config_rx_mode,
48078+
48079+ .enable_rx_csum = xgbe_enable_rx_csum,
48080+ .disable_rx_csum = xgbe_disable_rx_csum,
48081+
48082+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48083+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48084+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48085+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48086+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48087+
48088+ .read_mmd_regs = xgbe_read_mmd_regs,
48089+ .write_mmd_regs = xgbe_write_mmd_regs,
48090+
48091+ .set_gmii_speed = xgbe_set_gmii_speed,
48092+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48093+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48094+
48095+ .enable_tx = xgbe_enable_tx,
48096+ .disable_tx = xgbe_disable_tx,
48097+ .enable_rx = xgbe_enable_rx,
48098+ .disable_rx = xgbe_disable_rx,
48099+
48100+ .powerup_tx = xgbe_powerup_tx,
48101+ .powerdown_tx = xgbe_powerdown_tx,
48102+ .powerup_rx = xgbe_powerup_rx,
48103+ .powerdown_rx = xgbe_powerdown_rx,
48104+
48105+ .dev_xmit = xgbe_dev_xmit,
48106+ .dev_read = xgbe_dev_read,
48107+ .enable_int = xgbe_enable_int,
48108+ .disable_int = xgbe_disable_int,
48109+ .init = xgbe_init,
48110+ .exit = xgbe_exit,
48111
48112 /* Descriptor related Sequences have to be initialized here */
48113- hw_if->tx_desc_init = xgbe_tx_desc_init;
48114- hw_if->rx_desc_init = xgbe_rx_desc_init;
48115- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48116- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48117- hw_if->is_last_desc = xgbe_is_last_desc;
48118- hw_if->is_context_desc = xgbe_is_context_desc;
48119- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48120+ .tx_desc_init = xgbe_tx_desc_init,
48121+ .rx_desc_init = xgbe_rx_desc_init,
48122+ .tx_desc_reset = xgbe_tx_desc_reset,
48123+ .rx_desc_reset = xgbe_rx_desc_reset,
48124+ .is_last_desc = xgbe_is_last_desc,
48125+ .is_context_desc = xgbe_is_context_desc,
48126+ .tx_start_xmit = xgbe_tx_start_xmit,
48127
48128 /* For FLOW ctrl */
48129- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48130- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48131+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48132+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48133
48134 /* For RX coalescing */
48135- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48136- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48137- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48138- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48139+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48140+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48141+ .usec_to_riwt = xgbe_usec_to_riwt,
48142+ .riwt_to_usec = xgbe_riwt_to_usec,
48143
48144 /* For RX and TX threshold config */
48145- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48146- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48147+ .config_rx_threshold = xgbe_config_rx_threshold,
48148+ .config_tx_threshold = xgbe_config_tx_threshold,
48149
48150 /* For RX and TX Store and Forward Mode config */
48151- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48152- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48153+ .config_rsf_mode = xgbe_config_rsf_mode,
48154+ .config_tsf_mode = xgbe_config_tsf_mode,
48155
48156 /* For TX DMA Operating on Second Frame config */
48157- hw_if->config_osp_mode = xgbe_config_osp_mode;
48158+ .config_osp_mode = xgbe_config_osp_mode,
48159
48160 /* For RX and TX PBL config */
48161- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48162- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48163- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48164- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48165- hw_if->config_pblx8 = xgbe_config_pblx8;
48166+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48167+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48168+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48169+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48170+ .config_pblx8 = xgbe_config_pblx8,
48171
48172 /* For MMC statistics support */
48173- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48174- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48175- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48176+ .tx_mmc_int = xgbe_tx_mmc_int,
48177+ .rx_mmc_int = xgbe_rx_mmc_int,
48178+ .read_mmc_stats = xgbe_read_mmc_stats,
48179
48180 /* For PTP config */
48181- hw_if->config_tstamp = xgbe_config_tstamp;
48182- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48183- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48184- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48185- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48186+ .config_tstamp = xgbe_config_tstamp,
48187+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48188+ .set_tstamp_time = xgbe_set_tstamp_time,
48189+ .get_tstamp_time = xgbe_get_tstamp_time,
48190+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48191
48192 /* For Data Center Bridging config */
48193- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48194- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48195+ .config_dcb_tc = xgbe_config_dcb_tc,
48196+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48197
48198 /* For Receive Side Scaling */
48199- hw_if->enable_rss = xgbe_enable_rss;
48200- hw_if->disable_rss = xgbe_disable_rss;
48201- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48202- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48203-
48204- DBGPR("<--xgbe_init_function_ptrs\n");
48205-}
48206+ .enable_rss = xgbe_enable_rss,
48207+ .disable_rss = xgbe_disable_rss,
48208+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48209+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48210+};
48211diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48212index 9fd6c69..588ff02 100644
48213--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48214+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48215@@ -243,7 +243,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48216 * support, tell it now
48217 */
48218 if (ring->tx.xmit_more)
48219- pdata->hw_if.tx_start_xmit(channel, ring);
48220+ pdata->hw_if->tx_start_xmit(channel, ring);
48221
48222 return NETDEV_TX_BUSY;
48223 }
48224@@ -271,7 +271,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48225
48226 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48227 {
48228- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48229+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48230 struct xgbe_channel *channel;
48231 enum xgbe_int int_id;
48232 unsigned int i;
48233@@ -293,7 +293,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48234
48235 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48236 {
48237- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48238+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48239 struct xgbe_channel *channel;
48240 enum xgbe_int int_id;
48241 unsigned int i;
48242@@ -316,7 +316,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48243 static irqreturn_t xgbe_isr(int irq, void *data)
48244 {
48245 struct xgbe_prv_data *pdata = data;
48246- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48247+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48248 struct xgbe_channel *channel;
48249 unsigned int dma_isr, dma_ch_isr;
48250 unsigned int mac_isr, mac_tssr;
48251@@ -682,7 +682,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48252
48253 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48254 {
48255- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48256+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48257
48258 DBGPR("-->xgbe_init_tx_coalesce\n");
48259
48260@@ -696,7 +696,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48261
48262 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48263 {
48264- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48265+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48266
48267 DBGPR("-->xgbe_init_rx_coalesce\n");
48268
48269@@ -711,7 +711,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48270
48271 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48272 {
48273- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48274+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48275 struct xgbe_channel *channel;
48276 struct xgbe_ring *ring;
48277 struct xgbe_ring_data *rdata;
48278@@ -736,7 +736,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48279
48280 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48281 {
48282- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48283+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48284 struct xgbe_channel *channel;
48285 struct xgbe_ring *ring;
48286 struct xgbe_ring_data *rdata;
48287@@ -762,7 +762,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48288 static void xgbe_adjust_link(struct net_device *netdev)
48289 {
48290 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48291- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48292+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48293 struct phy_device *phydev = pdata->phydev;
48294 int new_state = 0;
48295
48296@@ -870,7 +870,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48297 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48298 {
48299 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48300- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48301+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48302 unsigned long flags;
48303
48304 DBGPR("-->xgbe_powerdown\n");
48305@@ -908,7 +908,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48306 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48307 {
48308 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48309- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48310+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48311 unsigned long flags;
48312
48313 DBGPR("-->xgbe_powerup\n");
48314@@ -945,7 +945,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48315
48316 static int xgbe_start(struct xgbe_prv_data *pdata)
48317 {
48318- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48319+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48320 struct net_device *netdev = pdata->netdev;
48321 int ret;
48322
48323@@ -984,7 +984,7 @@ err_napi:
48324
48325 static void xgbe_stop(struct xgbe_prv_data *pdata)
48326 {
48327- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48328+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48329 struct xgbe_channel *channel;
48330 struct net_device *netdev = pdata->netdev;
48331 struct netdev_queue *txq;
48332@@ -1211,7 +1211,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48333 return -ERANGE;
48334 }
48335
48336- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48337+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48338
48339 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48340
48341@@ -1360,7 +1360,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48342 static int xgbe_open(struct net_device *netdev)
48343 {
48344 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48345- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48346+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48347 int ret;
48348
48349 DBGPR("-->xgbe_open\n");
48350@@ -1432,7 +1432,7 @@ err_phy_init:
48351 static int xgbe_close(struct net_device *netdev)
48352 {
48353 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48354- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48355+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48356
48357 DBGPR("-->xgbe_close\n");
48358
48359@@ -1460,8 +1460,8 @@ static int xgbe_close(struct net_device *netdev)
48360 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48361 {
48362 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48363- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48364- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48365+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48366+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48367 struct xgbe_channel *channel;
48368 struct xgbe_ring *ring;
48369 struct xgbe_packet_data *packet;
48370@@ -1529,7 +1529,7 @@ tx_netdev_return:
48371 static void xgbe_set_rx_mode(struct net_device *netdev)
48372 {
48373 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48374- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48375+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48376
48377 DBGPR("-->xgbe_set_rx_mode\n");
48378
48379@@ -1541,7 +1541,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48380 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48381 {
48382 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48383- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48384+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48385 struct sockaddr *saddr = addr;
48386
48387 DBGPR("-->xgbe_set_mac_address\n");
48388@@ -1616,7 +1616,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48389
48390 DBGPR("-->%s\n", __func__);
48391
48392- pdata->hw_if.read_mmc_stats(pdata);
48393+ pdata->hw_if->read_mmc_stats(pdata);
48394
48395 s->rx_packets = pstats->rxframecount_gb;
48396 s->rx_bytes = pstats->rxoctetcount_gb;
48397@@ -1643,7 +1643,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48398 u16 vid)
48399 {
48400 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48401- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48402+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48403
48404 DBGPR("-->%s\n", __func__);
48405
48406@@ -1659,7 +1659,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48407 u16 vid)
48408 {
48409 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48410- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48411+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48412
48413 DBGPR("-->%s\n", __func__);
48414
48415@@ -1725,7 +1725,7 @@ static int xgbe_set_features(struct net_device *netdev,
48416 netdev_features_t features)
48417 {
48418 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48419- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48420+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48421 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48422 int ret = 0;
48423
48424@@ -1791,8 +1791,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48425 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48426 {
48427 struct xgbe_prv_data *pdata = channel->pdata;
48428- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48429- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48430+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48431+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48432 struct xgbe_ring *ring = channel->rx_ring;
48433 struct xgbe_ring_data *rdata;
48434
48435@@ -1847,8 +1847,8 @@ static struct sk_buff *xgbe_create_skb(struct napi_struct *napi,
48436 static int xgbe_tx_poll(struct xgbe_channel *channel)
48437 {
48438 struct xgbe_prv_data *pdata = channel->pdata;
48439- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48440- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48441+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48442+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48443 struct xgbe_ring *ring = channel->tx_ring;
48444 struct xgbe_ring_data *rdata;
48445 struct xgbe_ring_desc *rdesc;
48446@@ -1913,7 +1913,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48447 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48448 {
48449 struct xgbe_prv_data *pdata = channel->pdata;
48450- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48451+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48452 struct xgbe_ring *ring = channel->rx_ring;
48453 struct xgbe_ring_data *rdata;
48454 struct xgbe_packet_data *packet;
48455diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48456index 5f149e8..6736bf4 100644
48457--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48458+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48459@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48460
48461 DBGPR("-->%s\n", __func__);
48462
48463- pdata->hw_if.read_mmc_stats(pdata);
48464+ pdata->hw_if->read_mmc_stats(pdata);
48465 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48466 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48467 *data++ = *(u64 *)stat;
48468@@ -396,7 +396,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48469 struct ethtool_coalesce *ec)
48470 {
48471 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48472- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48473+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48474 unsigned int rx_frames, rx_riwt, rx_usecs;
48475 unsigned int tx_frames;
48476
48477@@ -521,7 +521,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48478 const u8 *key, const u8 hfunc)
48479 {
48480 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48481- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48482+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48483 unsigned int ret;
48484
48485 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48486diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48487index 7149053..889c5492 100644
48488--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48489+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48490@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48491 DBGPR("<--xgbe_default_config\n");
48492 }
48493
48494-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48495-{
48496- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48497- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48498-}
48499-
48500 #ifdef CONFIG_ACPI
48501 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48502 {
48503@@ -387,9 +381,8 @@ static int xgbe_probe(struct platform_device *pdev)
48504 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48505
48506 /* Set all the function pointers */
48507- xgbe_init_all_fptrs(pdata);
48508- hw_if = &pdata->hw_if;
48509- desc_if = &pdata->desc_if;
48510+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48511+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48512
48513 /* Issue software reset to device */
48514 hw_if->exit(pdata);
48515diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48516index 59e267f..0842a88 100644
48517--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48518+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48519@@ -126,7 +126,7 @@
48520 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48521 {
48522 struct xgbe_prv_data *pdata = mii->priv;
48523- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48524+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48525 int mmd_data;
48526
48527 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48528@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48529 u16 mmd_val)
48530 {
48531 struct xgbe_prv_data *pdata = mii->priv;
48532- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48533+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48534 int mmd_data = mmd_val;
48535
48536 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48537diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48538index b03e4f5..78e4cc4 100644
48539--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48540+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48541@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48542 tstamp_cc);
48543 u64 nsec;
48544
48545- nsec = pdata->hw_if.get_tstamp_time(pdata);
48546+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48547
48548 return nsec;
48549 }
48550@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48551
48552 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48553
48554- pdata->hw_if.update_tstamp_addend(pdata, addend);
48555+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48556
48557 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48558
48559diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48560index e62dfa2..7df28d5 100644
48561--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48562+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48563@@ -673,8 +673,8 @@ struct xgbe_prv_data {
48564 int dev_irq;
48565 unsigned int per_channel_irq;
48566
48567- struct xgbe_hw_if hw_if;
48568- struct xgbe_desc_if desc_if;
48569+ struct xgbe_hw_if *hw_if;
48570+ struct xgbe_desc_if *desc_if;
48571
48572 /* AXI DMA settings */
48573 unsigned int coherent;
48574@@ -797,6 +797,9 @@ struct xgbe_prv_data {
48575 #endif
48576 };
48577
48578+extern struct xgbe_hw_if default_xgbe_hw_if;
48579+extern struct xgbe_desc_if default_xgbe_desc_if;
48580+
48581 /* Function prototypes*/
48582
48583 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48584diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
48585index 783543a..a472348 100644
48586--- a/drivers/net/ethernet/broadcom/bcmsysport.c
48587+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
48588@@ -1721,7 +1721,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
48589 macaddr = of_get_mac_address(dn);
48590 if (!macaddr || !is_valid_ether_addr(macaddr)) {
48591 dev_warn(&pdev->dev, "using random Ethernet MAC\n");
48592- random_ether_addr(dev->dev_addr);
48593+ eth_hw_addr_random(dev);
48594 } else {
48595 ether_addr_copy(dev->dev_addr, macaddr);
48596 }
48597diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48598index d7a7175..7011194 100644
48599--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48600+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48601@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48602 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48603 {
48604 /* RX_MODE controlling object */
48605- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48606+ bnx2x_init_rx_mode_obj(bp);
48607
48608 /* multicast configuration controlling object */
48609 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48610diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48611index 07cdf9b..b08ecc7 100644
48612--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48613+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48614@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48615 return rc;
48616 }
48617
48618-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48619- struct bnx2x_rx_mode_obj *o)
48620+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48621 {
48622 if (CHIP_IS_E1x(bp)) {
48623- o->wait_comp = bnx2x_empty_rx_mode_wait;
48624- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48625+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48626+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48627 } else {
48628- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48629- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48630+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48631+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48632 }
48633 }
48634
48635diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48636index 86baecb..ff3bb46 100644
48637--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48638+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48639@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48640
48641 /********************* RX MODE ****************/
48642
48643-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48644- struct bnx2x_rx_mode_obj *o);
48645+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48646
48647 /**
48648 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48649diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48650index 31c9f82..e65e986 100644
48651--- a/drivers/net/ethernet/broadcom/tg3.h
48652+++ b/drivers/net/ethernet/broadcom/tg3.h
48653@@ -150,6 +150,7 @@
48654 #define CHIPREV_ID_5750_A0 0x4000
48655 #define CHIPREV_ID_5750_A1 0x4001
48656 #define CHIPREV_ID_5750_A3 0x4003
48657+#define CHIPREV_ID_5750_C1 0x4201
48658 #define CHIPREV_ID_5750_C2 0x4202
48659 #define CHIPREV_ID_5752_A0_HW 0x5000
48660 #define CHIPREV_ID_5752_A0 0x6000
48661diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48662index deb8da6..45d473b 100644
48663--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48664+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48665@@ -1694,10 +1694,10 @@ bna_cb_ioceth_reset(void *arg)
48666 }
48667
48668 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48669- bna_cb_ioceth_enable,
48670- bna_cb_ioceth_disable,
48671- bna_cb_ioceth_hbfail,
48672- bna_cb_ioceth_reset
48673+ .enable_cbfn = bna_cb_ioceth_enable,
48674+ .disable_cbfn = bna_cb_ioceth_disable,
48675+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48676+ .reset_cbfn = bna_cb_ioceth_reset
48677 };
48678
48679 static void bna_attr_init(struct bna_ioceth *ioceth)
48680diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48681index 8cffcdf..aadf043 100644
48682--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48683+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48684@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48685 */
48686 struct l2t_skb_cb {
48687 arp_failure_handler_func arp_failure_handler;
48688-};
48689+} __no_const;
48690
48691 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48692
48693diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48694index badff18..e15c4ec 100644
48695--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48696+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48697@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48698 for (i=0; i<ETH_ALEN; i++) {
48699 tmp.addr[i] = dev->dev_addr[i];
48700 }
48701- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48702+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48703 break;
48704
48705 case DE4X5_SET_HWADDR: /* Set the hardware address */
48706@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48707 spin_lock_irqsave(&lp->lock, flags);
48708 memcpy(&statbuf, &lp->pktStats, ioc->len);
48709 spin_unlock_irqrestore(&lp->lock, flags);
48710- if (copy_to_user(ioc->data, &statbuf, ioc->len))
48711+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48712 return -EFAULT;
48713 break;
48714 }
48715diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48716index e43cc8a..f1cf67c 100644
48717--- a/drivers/net/ethernet/emulex/benet/be_main.c
48718+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48719@@ -539,7 +539,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48720
48721 if (wrapped)
48722 newacc += 65536;
48723- ACCESS_ONCE(*acc) = newacc;
48724+ ACCESS_ONCE_RW(*acc) = newacc;
48725 }
48726
48727 static void populate_erx_stats(struct be_adapter *adapter,
48728diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48729index 6d0c5d5..55be363 100644
48730--- a/drivers/net/ethernet/faraday/ftgmac100.c
48731+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48732@@ -30,6 +30,8 @@
48733 #include <linux/netdevice.h>
48734 #include <linux/phy.h>
48735 #include <linux/platform_device.h>
48736+#include <linux/interrupt.h>
48737+#include <linux/irqreturn.h>
48738 #include <net/ip.h>
48739
48740 #include "ftgmac100.h"
48741diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48742index dce5f7b..2433466 100644
48743--- a/drivers/net/ethernet/faraday/ftmac100.c
48744+++ b/drivers/net/ethernet/faraday/ftmac100.c
48745@@ -31,6 +31,8 @@
48746 #include <linux/module.h>
48747 #include <linux/netdevice.h>
48748 #include <linux/platform_device.h>
48749+#include <linux/interrupt.h>
48750+#include <linux/irqreturn.h>
48751
48752 #include "ftmac100.h"
48753
48754diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48755index a92b772..250fe69 100644
48756--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48757+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48758@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48759 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48760
48761 /* Update the base adjustement value. */
48762- ACCESS_ONCE(pf->ptp_base_adj) = incval;
48763+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48764 smp_mb(); /* Force the above update. */
48765 }
48766
48767diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48768index e5ba040..d47531c 100644
48769--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48770+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48771@@ -782,7 +782,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48772 }
48773
48774 /* update the base incval used to calculate frequency adjustment */
48775- ACCESS_ONCE(adapter->base_incval) = incval;
48776+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
48777 smp_mb();
48778
48779 /* need lock to prevent incorrect read while modifying cyclecounter */
48780diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
48781index 74d0389..086ac03 100644
48782--- a/drivers/net/ethernet/marvell/mvneta.c
48783+++ b/drivers/net/ethernet/marvell/mvneta.c
48784@@ -1462,7 +1462,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48785 struct mvneta_rx_queue *rxq)
48786 {
48787 struct net_device *dev = pp->dev;
48788- int rx_done, rx_filled;
48789+ int rx_done;
48790 u32 rcvd_pkts = 0;
48791 u32 rcvd_bytes = 0;
48792
48793@@ -1473,7 +1473,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48794 rx_todo = rx_done;
48795
48796 rx_done = 0;
48797- rx_filled = 0;
48798
48799 /* Fairness NAPI loop */
48800 while (rx_done < rx_todo) {
48801@@ -1484,7 +1483,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48802 int rx_bytes, err;
48803
48804 rx_done++;
48805- rx_filled++;
48806 rx_status = rx_desc->status;
48807 rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE);
48808 data = (unsigned char *)rx_desc->buf_cookie;
48809@@ -1524,6 +1522,14 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48810 continue;
48811 }
48812
48813+ /* Refill processing */
48814+ err = mvneta_rx_refill(pp, rx_desc);
48815+ if (err) {
48816+ netdev_err(dev, "Linux processing - Can't refill\n");
48817+ rxq->missed++;
48818+ goto err_drop_frame;
48819+ }
48820+
48821 skb = build_skb(data, pp->frag_size > PAGE_SIZE ? 0 : pp->frag_size);
48822 if (!skb)
48823 goto err_drop_frame;
48824@@ -1543,14 +1549,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48825 mvneta_rx_csum(pp, rx_status, skb);
48826
48827 napi_gro_receive(&pp->napi, skb);
48828-
48829- /* Refill processing */
48830- err = mvneta_rx_refill(pp, rx_desc);
48831- if (err) {
48832- netdev_err(dev, "Linux processing - Can't refill\n");
48833- rxq->missed++;
48834- rx_filled--;
48835- }
48836 }
48837
48838 if (rcvd_pkts) {
48839@@ -1563,7 +1561,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48840 }
48841
48842 /* Update rxq management counters */
48843- mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_filled);
48844+ mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_done);
48845
48846 return rx_done;
48847 }
48848diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48849index c10d98f..72914c6 100644
48850--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48851+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48852@@ -475,8 +475,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48853 wmb();
48854
48855 /* we want to dirty this cache line once */
48856- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48857- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48858+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48859+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48860
48861 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48862
48863diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48864index 6223930..975033d 100644
48865--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48866+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48867@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48868 struct __vxge_hw_fifo *fifo;
48869 struct vxge_hw_fifo_config *config;
48870 u32 txdl_size, txdl_per_memblock;
48871- struct vxge_hw_mempool_cbs fifo_mp_callback;
48872+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48873+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48874+ };
48875+
48876 struct __vxge_hw_virtualpath *vpath;
48877
48878 if ((vp == NULL) || (attr == NULL)) {
48879@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48880 goto exit;
48881 }
48882
48883- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48884-
48885 fifo->mempool =
48886 __vxge_hw_mempool_create(vpath->hldev,
48887 fifo->config->memblock_size,
48888diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48889index 33669c2..674c39a 100644
48890--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48891+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48892@@ -1415,7 +1415,7 @@ static int qlcnic_83xx_copy_fw_file(struct qlcnic_adapter *adapter)
48893 if (fw->size & 0xF) {
48894 addr = dest + size;
48895 for (i = 0; i < (fw->size & 0xF); i++)
48896- data[i] = temp[size + i];
48897+ data[i] = ((u8 *)temp)[size + i];
48898 for (; i < 16; i++)
48899 data[i] = 0;
48900 ret = qlcnic_ms_mem_write128(adapter, addr,
48901@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48902 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48903 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48904 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48905- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48906+ pax_open_kernel();
48907+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48908+ pax_close_kernel();
48909 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48910 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48911 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48912diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48913index be7d7a6..a8983f8 100644
48914--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48915+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48916@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48917 case QLCNIC_NON_PRIV_FUNC:
48918 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48919 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48920- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48921+ pax_open_kernel();
48922+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48923+ pax_close_kernel();
48924 break;
48925 case QLCNIC_PRIV_FUNC:
48926 ahw->op_mode = QLCNIC_PRIV_FUNC;
48927 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48928- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48929+ pax_open_kernel();
48930+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48931+ pax_close_kernel();
48932 break;
48933 case QLCNIC_MGMT_FUNC:
48934 ahw->op_mode = QLCNIC_MGMT_FUNC;
48935 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48936- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48937+ pax_open_kernel();
48938+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48939+ pax_close_kernel();
48940 break;
48941 default:
48942 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48943diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48944index 332bb8a..e6adcd1 100644
48945--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48946+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48947@@ -1285,7 +1285,7 @@ flash_temp:
48948 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48949 {
48950 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48951- static const struct qlcnic_dump_operations *fw_dump_ops;
48952+ const struct qlcnic_dump_operations *fw_dump_ops;
48953 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48954 u32 entry_offset, dump, no_entries, buf_offset = 0;
48955 int i, k, ops_cnt, ops_index, dump_size = 0;
48956diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48957index 3df51fa..e9b517f 100644
48958--- a/drivers/net/ethernet/realtek/r8169.c
48959+++ b/drivers/net/ethernet/realtek/r8169.c
48960@@ -788,22 +788,22 @@ struct rtl8169_private {
48961 struct mdio_ops {
48962 void (*write)(struct rtl8169_private *, int, int);
48963 int (*read)(struct rtl8169_private *, int);
48964- } mdio_ops;
48965+ } __no_const mdio_ops;
48966
48967 struct pll_power_ops {
48968 void (*down)(struct rtl8169_private *);
48969 void (*up)(struct rtl8169_private *);
48970- } pll_power_ops;
48971+ } __no_const pll_power_ops;
48972
48973 struct jumbo_ops {
48974 void (*enable)(struct rtl8169_private *);
48975 void (*disable)(struct rtl8169_private *);
48976- } jumbo_ops;
48977+ } __no_const jumbo_ops;
48978
48979 struct csi_ops {
48980 void (*write)(struct rtl8169_private *, int, int);
48981 u32 (*read)(struct rtl8169_private *, int);
48982- } csi_ops;
48983+ } __no_const csi_ops;
48984
48985 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48986 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48987diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48988index a2e9aee..af41a0e 100644
48989--- a/drivers/net/ethernet/sfc/ptp.c
48990+++ b/drivers/net/ethernet/sfc/ptp.c
48991@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48992 ptp->start.dma_addr);
48993
48994 /* Clear flag that signals MC ready */
48995- ACCESS_ONCE(*start) = 0;
48996+ ACCESS_ONCE_RW(*start) = 0;
48997 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48998 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48999 EFX_BUG_ON_PARANOID(rc);
49000diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49001index 08c483b..2c4a553 100644
49002--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49003+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49004@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
49005
49006 writel(value, ioaddr + MMC_CNTRL);
49007
49008- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49009- MMC_CNTRL, value);
49010+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49011+// MMC_CNTRL, value);
49012 }
49013
49014 /* To mask all all interrupts.*/
49015diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
49016index de28504..7f1c1cd 100644
49017--- a/drivers/net/ethernet/via/via-rhine.c
49018+++ b/drivers/net/ethernet/via/via-rhine.c
49019@@ -2525,7 +2525,7 @@ static struct platform_driver rhine_driver_platform = {
49020 }
49021 };
49022
49023-static struct dmi_system_id rhine_dmi_table[] __initdata = {
49024+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
49025 {
49026 .ident = "EPIA-M",
49027 .matches = {
49028diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49029index 41071d3..6e362e1 100644
49030--- a/drivers/net/hyperv/hyperv_net.h
49031+++ b/drivers/net/hyperv/hyperv_net.h
49032@@ -176,7 +176,7 @@ struct rndis_device {
49033 enum rndis_device_state state;
49034 bool link_state;
49035 bool link_change;
49036- atomic_t new_req_id;
49037+ atomic_unchecked_t new_req_id;
49038
49039 spinlock_t request_lock;
49040 struct list_head req_list;
49041diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49042index 9118cea..1a8e06a 100644
49043--- a/drivers/net/hyperv/rndis_filter.c
49044+++ b/drivers/net/hyperv/rndis_filter.c
49045@@ -100,7 +100,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49046 * template
49047 */
49048 set = &rndis_msg->msg.set_req;
49049- set->req_id = atomic_inc_return(&dev->new_req_id);
49050+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49051
49052 /* Add to the request list */
49053 spin_lock_irqsave(&dev->request_lock, flags);
49054@@ -923,7 +923,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49055
49056 /* Setup the rndis set */
49057 halt = &request->request_msg.msg.halt_req;
49058- halt->req_id = atomic_inc_return(&dev->new_req_id);
49059+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49060
49061 /* Ignore return since this msg is optional. */
49062 rndis_filter_send_request(dev, request);
49063diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49064index 94570aa..1a798e1 100644
49065--- a/drivers/net/ifb.c
49066+++ b/drivers/net/ifb.c
49067@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49068 return 0;
49069 }
49070
49071-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49072+static struct rtnl_link_ops ifb_link_ops = {
49073 .kind = "ifb",
49074 .priv_size = sizeof(struct ifb_private),
49075 .setup = ifb_setup,
49076diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
49077index 54549a6..0799442 100644
49078--- a/drivers/net/ipvlan/ipvlan.h
49079+++ b/drivers/net/ipvlan/ipvlan.h
49080@@ -102,6 +102,11 @@ static inline struct ipvl_port *ipvlan_port_get_rcu(const struct net_device *d)
49081 return rcu_dereference(d->rx_handler_data);
49082 }
49083
49084+static inline struct ipvl_port *ipvlan_port_get_rcu_bh(const struct net_device *d)
49085+{
49086+ return rcu_dereference_bh(d->rx_handler_data);
49087+}
49088+
49089 static inline struct ipvl_port *ipvlan_port_get_rtnl(const struct net_device *d)
49090 {
49091 return rtnl_dereference(d->rx_handler_data);
49092diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
49093index c30b5c3..b349dad 100644
49094--- a/drivers/net/ipvlan/ipvlan_core.c
49095+++ b/drivers/net/ipvlan/ipvlan_core.c
49096@@ -507,7 +507,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
49097 int ipvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
49098 {
49099 struct ipvl_dev *ipvlan = netdev_priv(dev);
49100- struct ipvl_port *port = ipvlan_port_get_rcu(ipvlan->phy_dev);
49101+ struct ipvl_port *port = ipvlan_port_get_rcu_bh(ipvlan->phy_dev);
49102
49103 if (!port)
49104 goto out;
49105diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49106index 9f59f17..52cb38f 100644
49107--- a/drivers/net/macvlan.c
49108+++ b/drivers/net/macvlan.c
49109@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49110 free_nskb:
49111 kfree_skb(nskb);
49112 err:
49113- atomic_long_inc(&skb->dev->rx_dropped);
49114+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49115 }
49116
49117 static void macvlan_flush_sources(struct macvlan_port *port,
49118@@ -1480,13 +1480,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49119 int macvlan_link_register(struct rtnl_link_ops *ops)
49120 {
49121 /* common fields */
49122- ops->priv_size = sizeof(struct macvlan_dev);
49123- ops->validate = macvlan_validate;
49124- ops->maxtype = IFLA_MACVLAN_MAX;
49125- ops->policy = macvlan_policy;
49126- ops->changelink = macvlan_changelink;
49127- ops->get_size = macvlan_get_size;
49128- ops->fill_info = macvlan_fill_info;
49129+ pax_open_kernel();
49130+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49131+ *(void **)&ops->validate = macvlan_validate;
49132+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49133+ *(const void **)&ops->policy = macvlan_policy;
49134+ *(void **)&ops->changelink = macvlan_changelink;
49135+ *(void **)&ops->get_size = macvlan_get_size;
49136+ *(void **)&ops->fill_info = macvlan_fill_info;
49137+ pax_close_kernel();
49138
49139 return rtnl_link_register(ops);
49140 };
49141@@ -1572,7 +1574,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49142 return NOTIFY_DONE;
49143 }
49144
49145-static struct notifier_block macvlan_notifier_block __read_mostly = {
49146+static struct notifier_block macvlan_notifier_block = {
49147 .notifier_call = macvlan_device_event,
49148 };
49149
49150diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49151index 8c350c5..30fdc98 100644
49152--- a/drivers/net/macvtap.c
49153+++ b/drivers/net/macvtap.c
49154@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49155 dev->tx_queue_len = TUN_READQ_SIZE;
49156 }
49157
49158-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49159+static struct rtnl_link_ops macvtap_link_ops = {
49160 .kind = "macvtap",
49161 .setup = macvtap_setup,
49162 .newlink = macvtap_newlink,
49163@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49164
49165 ret = 0;
49166 u = q->flags;
49167- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49168+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49169 put_user(u, &ifr->ifr_flags))
49170 ret = -EFAULT;
49171 macvtap_put_vlan(vlan);
49172@@ -1214,7 +1214,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49173 return NOTIFY_DONE;
49174 }
49175
49176-static struct notifier_block macvtap_notifier_block __read_mostly = {
49177+static struct notifier_block macvtap_notifier_block = {
49178 .notifier_call = macvtap_device_event,
49179 };
49180
49181@@ -1268,6 +1268,7 @@ static void macvtap_exit(void)
49182 class_unregister(macvtap_class);
49183 cdev_del(&macvtap_cdev);
49184 unregister_chrdev_region(macvtap_major, MACVTAP_NUM_DEVS);
49185+ idr_destroy(&minor_idr);
49186 }
49187 module_exit(macvtap_exit);
49188
49189diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49190index 34924df..a747360 100644
49191--- a/drivers/net/nlmon.c
49192+++ b/drivers/net/nlmon.c
49193@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49194 return 0;
49195 }
49196
49197-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49198+static struct rtnl_link_ops nlmon_link_ops = {
49199 .kind = "nlmon",
49200 .priv_size = sizeof(struct nlmon),
49201 .setup = nlmon_setup,
49202diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49203index d551df6..fa4c2df 100644
49204--- a/drivers/net/phy/phy_device.c
49205+++ b/drivers/net/phy/phy_device.c
49206@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49207 * zero on success.
49208 *
49209 */
49210-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49211+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49212 struct phy_c45_device_ids *c45_ids) {
49213 int phy_reg;
49214 int i, reg_addr;
49215@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49216 * its return value is in turn returned.
49217 *
49218 */
49219-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49220+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49221 bool is_c45, struct phy_c45_device_ids *c45_ids)
49222 {
49223 int phy_reg;
49224@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49225 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49226 {
49227 struct phy_c45_device_ids c45_ids = {0};
49228- u32 phy_id = 0;
49229+ int phy_id = 0;
49230 int r;
49231
49232 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49233diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49234index 9d15566..5ad4ef6 100644
49235--- a/drivers/net/ppp/ppp_generic.c
49236+++ b/drivers/net/ppp/ppp_generic.c
49237@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49238 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49239 struct ppp_stats stats;
49240 struct ppp_comp_stats cstats;
49241- char *vers;
49242
49243 switch (cmd) {
49244 case SIOCGPPPSTATS:
49245@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49246 break;
49247
49248 case SIOCGPPPVER:
49249- vers = PPP_VERSION;
49250- if (copy_to_user(addr, vers, strlen(vers) + 1))
49251+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49252 break;
49253 err = 0;
49254 break;
49255diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49256index 079f7ad..b2a2bfa7 100644
49257--- a/drivers/net/slip/slhc.c
49258+++ b/drivers/net/slip/slhc.c
49259@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49260 register struct tcphdr *thp;
49261 register struct iphdr *ip;
49262 register struct cstate *cs;
49263- int len, hdrlen;
49264+ long len, hdrlen;
49265 unsigned char *cp = icp;
49266
49267 /* We've got a compressed packet; read the change byte */
49268diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49269index 6928448..e30c57f 100644
49270--- a/drivers/net/team/team.c
49271+++ b/drivers/net/team/team.c
49272@@ -2103,7 +2103,7 @@ static unsigned int team_get_num_rx_queues(void)
49273 return TEAM_DEFAULT_NUM_RX_QUEUES;
49274 }
49275
49276-static struct rtnl_link_ops team_link_ops __read_mostly = {
49277+static struct rtnl_link_ops team_link_ops = {
49278 .kind = DRV_NAME,
49279 .priv_size = sizeof(struct team),
49280 .setup = team_setup,
49281@@ -2893,7 +2893,7 @@ static int team_device_event(struct notifier_block *unused,
49282 return NOTIFY_DONE;
49283 }
49284
49285-static struct notifier_block team_notifier_block __read_mostly = {
49286+static struct notifier_block team_notifier_block = {
49287 .notifier_call = team_device_event,
49288 };
49289
49290diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49291index e470ae5..e812f5e 100644
49292--- a/drivers/net/tun.c
49293+++ b/drivers/net/tun.c
49294@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49295 return -EINVAL;
49296 }
49297
49298-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49299+static struct rtnl_link_ops tun_link_ops = {
49300 .kind = DRV_NAME,
49301 .priv_size = sizeof(struct tun_struct),
49302 .setup = tun_setup,
49303@@ -1828,7 +1828,7 @@ unlock:
49304 }
49305
49306 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49307- unsigned long arg, int ifreq_len)
49308+ unsigned long arg, size_t ifreq_len)
49309 {
49310 struct tun_file *tfile = file->private_data;
49311 struct tun_struct *tun;
49312@@ -1842,6 +1842,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49313 int le;
49314 int ret;
49315
49316+ if (ifreq_len > sizeof ifr)
49317+ return -EFAULT;
49318+
49319 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49320 if (copy_from_user(&ifr, argp, ifreq_len))
49321 return -EFAULT;
49322diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49323index 111d907..1ee643e 100644
49324--- a/drivers/net/usb/hso.c
49325+++ b/drivers/net/usb/hso.c
49326@@ -70,7 +70,7 @@
49327 #include <asm/byteorder.h>
49328 #include <linux/serial_core.h>
49329 #include <linux/serial.h>
49330-
49331+#include <asm/local.h>
49332
49333 #define MOD_AUTHOR "Option Wireless"
49334 #define MOD_DESCRIPTION "USB High Speed Option driver"
49335@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49336 struct urb *urb;
49337
49338 urb = serial->rx_urb[0];
49339- if (serial->port.count > 0) {
49340+ if (atomic_read(&serial->port.count) > 0) {
49341 count = put_rxbuf_data(urb, serial);
49342 if (count == -1)
49343 return;
49344@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49345 DUMP1(urb->transfer_buffer, urb->actual_length);
49346
49347 /* Anyone listening? */
49348- if (serial->port.count == 0)
49349+ if (atomic_read(&serial->port.count) == 0)
49350 return;
49351
49352 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49353@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49354 tty_port_tty_set(&serial->port, tty);
49355
49356 /* check for port already opened, if not set the termios */
49357- serial->port.count++;
49358- if (serial->port.count == 1) {
49359+ if (atomic_inc_return(&serial->port.count) == 1) {
49360 serial->rx_state = RX_IDLE;
49361 /* Force default termio settings */
49362 _hso_serial_set_termios(tty, NULL);
49363@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49364 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49365 if (result) {
49366 hso_stop_serial_device(serial->parent);
49367- serial->port.count--;
49368+ atomic_dec(&serial->port.count);
49369 } else {
49370 kref_get(&serial->parent->ref);
49371 }
49372@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49373
49374 /* reset the rts and dtr */
49375 /* do the actual close */
49376- serial->port.count--;
49377+ atomic_dec(&serial->port.count);
49378
49379- if (serial->port.count <= 0) {
49380- serial->port.count = 0;
49381+ if (atomic_read(&serial->port.count) <= 0) {
49382+ atomic_set(&serial->port.count, 0);
49383 tty_port_tty_set(&serial->port, NULL);
49384 if (!usb_gone)
49385 hso_stop_serial_device(serial->parent);
49386@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49387
49388 /* the actual setup */
49389 spin_lock_irqsave(&serial->serial_lock, flags);
49390- if (serial->port.count)
49391+ if (atomic_read(&serial->port.count))
49392 _hso_serial_set_termios(tty, old);
49393 else
49394 tty->termios = *old;
49395@@ -1891,7 +1890,7 @@ static void intr_callback(struct urb *urb)
49396 D1("Pending read interrupt on port %d\n", i);
49397 spin_lock(&serial->serial_lock);
49398 if (serial->rx_state == RX_IDLE &&
49399- serial->port.count > 0) {
49400+ atomic_read(&serial->port.count) > 0) {
49401 /* Setup and send a ctrl req read on
49402 * port i */
49403 if (!serial->rx_urb_filled[0]) {
49404@@ -3058,7 +3057,7 @@ static int hso_resume(struct usb_interface *iface)
49405 /* Start all serial ports */
49406 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49407 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49408- if (dev2ser(serial_table[i])->port.count) {
49409+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49410 result =
49411 hso_start_serial_device(serial_table[i], GFP_NOIO);
49412 hso_kick_transmit(dev2ser(serial_table[i]));
49413diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49414index aafa1a1..f59c651 100644
49415--- a/drivers/net/usb/r8152.c
49416+++ b/drivers/net/usb/r8152.c
49417@@ -602,7 +602,7 @@ struct r8152 {
49418 void (*unload)(struct r8152 *);
49419 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49420 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49421- } rtl_ops;
49422+ } __no_const rtl_ops;
49423
49424 int intr_interval;
49425 u32 saved_wolopts;
49426diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49427index a2515887..6d13233 100644
49428--- a/drivers/net/usb/sierra_net.c
49429+++ b/drivers/net/usb/sierra_net.c
49430@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49431 /* atomic counter partially included in MAC address to make sure 2 devices
49432 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49433 */
49434-static atomic_t iface_counter = ATOMIC_INIT(0);
49435+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49436
49437 /*
49438 * SYNC Timer Delay definition used to set the expiry time
49439@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49440 dev->net->netdev_ops = &sierra_net_device_ops;
49441
49442 /* change MAC addr to include, ifacenum, and to be unique */
49443- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49444+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49445 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49446
49447 /* we will have to manufacture ethernet headers, prepare template */
49448diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49449index 63c7810..a694d2b 100644
49450--- a/drivers/net/virtio_net.c
49451+++ b/drivers/net/virtio_net.c
49452@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49453 #define RECEIVE_AVG_WEIGHT 64
49454
49455 /* Minimum alignment for mergeable packet buffers. */
49456-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49457+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49458
49459 #define VIRTNET_DRIVER_VERSION "1.0.0"
49460
49461@@ -1756,9 +1756,9 @@ static int virtnet_probe(struct virtio_device *vdev)
49462 /* Do we support "hardware" checksums? */
49463 if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) {
49464 /* This opens up the world of extra features. */
49465- dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
49466+ dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG;
49467 if (csum)
49468- dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
49469+ dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG;
49470
49471 if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
49472 dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO
49473diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
49474index 61c0840..92e7f7e 100644
49475--- a/drivers/net/vmxnet3/vmxnet3_drv.c
49476+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
49477@@ -1167,7 +1167,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49478 static const u32 rxprod_reg[2] = {
49479 VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2
49480 };
49481- u32 num_rxd = 0;
49482+ u32 num_pkts = 0;
49483 bool skip_page_frags = false;
49484 struct Vmxnet3_RxCompDesc *rcd;
49485 struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
49486@@ -1185,13 +1185,12 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49487 struct Vmxnet3_RxDesc *rxd;
49488 u32 idx, ring_idx;
49489 struct vmxnet3_cmd_ring *ring = NULL;
49490- if (num_rxd >= quota) {
49491+ if (num_pkts >= quota) {
49492 /* we may stop even before we see the EOP desc of
49493 * the current pkt
49494 */
49495 break;
49496 }
49497- num_rxd++;
49498 BUG_ON(rcd->rqID != rq->qid && rcd->rqID != rq->qid2);
49499 idx = rcd->rxdIdx;
49500 ring_idx = rcd->rqID < adapter->num_rx_queues ? 0 : 1;
49501@@ -1323,6 +1322,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49502 napi_gro_receive(&rq->napi, skb);
49503
49504 ctx->skb = NULL;
49505+ num_pkts++;
49506 }
49507
49508 rcd_done:
49509@@ -1353,7 +1353,7 @@ rcd_done:
49510 &rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp);
49511 }
49512
49513- return num_rxd;
49514+ return num_pkts;
49515 }
49516
49517
49518diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49519index 21a0fbf..055b54f 100644
49520--- a/drivers/net/vxlan.c
49521+++ b/drivers/net/vxlan.c
49522@@ -2878,7 +2878,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49523 return vxlan->net;
49524 }
49525
49526-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49527+static struct rtnl_link_ops vxlan_link_ops = {
49528 .kind = "vxlan",
49529 .maxtype = IFLA_VXLAN_MAX,
49530 .policy = vxlan_policy,
49531@@ -2926,7 +2926,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49532 return NOTIFY_DONE;
49533 }
49534
49535-static struct notifier_block vxlan_notifier_block __read_mostly = {
49536+static struct notifier_block vxlan_notifier_block = {
49537 .notifier_call = vxlan_lowerdev_event,
49538 };
49539
49540diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49541index 5920c99..ff2e4a5 100644
49542--- a/drivers/net/wan/lmc/lmc_media.c
49543+++ b/drivers/net/wan/lmc/lmc_media.c
49544@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49545 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49546
49547 lmc_media_t lmc_ds3_media = {
49548- lmc_ds3_init, /* special media init stuff */
49549- lmc_ds3_default, /* reset to default state */
49550- lmc_ds3_set_status, /* reset status to state provided */
49551- lmc_dummy_set_1, /* set clock source */
49552- lmc_dummy_set2_1, /* set line speed */
49553- lmc_ds3_set_100ft, /* set cable length */
49554- lmc_ds3_set_scram, /* set scrambler */
49555- lmc_ds3_get_link_status, /* get link status */
49556- lmc_dummy_set_1, /* set link status */
49557- lmc_ds3_set_crc_length, /* set CRC length */
49558- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49559- lmc_ds3_watchdog
49560+ .init = lmc_ds3_init, /* special media init stuff */
49561+ .defaults = lmc_ds3_default, /* reset to default state */
49562+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49563+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49564+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49565+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49566+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49567+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49568+ .set_link_status = lmc_dummy_set_1, /* set link status */
49569+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49570+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49571+ .watchdog = lmc_ds3_watchdog
49572 };
49573
49574 lmc_media_t lmc_hssi_media = {
49575- lmc_hssi_init, /* special media init stuff */
49576- lmc_hssi_default, /* reset to default state */
49577- lmc_hssi_set_status, /* reset status to state provided */
49578- lmc_hssi_set_clock, /* set clock source */
49579- lmc_dummy_set2_1, /* set line speed */
49580- lmc_dummy_set_1, /* set cable length */
49581- lmc_dummy_set_1, /* set scrambler */
49582- lmc_hssi_get_link_status, /* get link status */
49583- lmc_hssi_set_link_status, /* set link status */
49584- lmc_hssi_set_crc_length, /* set CRC length */
49585- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49586- lmc_hssi_watchdog
49587+ .init = lmc_hssi_init, /* special media init stuff */
49588+ .defaults = lmc_hssi_default, /* reset to default state */
49589+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49590+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49591+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49592+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49593+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49594+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49595+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49596+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49597+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49598+ .watchdog = lmc_hssi_watchdog
49599 };
49600
49601-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49602- lmc_ssi_default, /* reset to default state */
49603- lmc_ssi_set_status, /* reset status to state provided */
49604- lmc_ssi_set_clock, /* set clock source */
49605- lmc_ssi_set_speed, /* set line speed */
49606- lmc_dummy_set_1, /* set cable length */
49607- lmc_dummy_set_1, /* set scrambler */
49608- lmc_ssi_get_link_status, /* get link status */
49609- lmc_ssi_set_link_status, /* set link status */
49610- lmc_ssi_set_crc_length, /* set CRC length */
49611- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49612- lmc_ssi_watchdog
49613+lmc_media_t lmc_ssi_media = {
49614+ .init = lmc_ssi_init, /* special media init stuff */
49615+ .defaults = lmc_ssi_default, /* reset to default state */
49616+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49617+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49618+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49619+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49620+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49621+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49622+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49623+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49624+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49625+ .watchdog = lmc_ssi_watchdog
49626 };
49627
49628 lmc_media_t lmc_t1_media = {
49629- lmc_t1_init, /* special media init stuff */
49630- lmc_t1_default, /* reset to default state */
49631- lmc_t1_set_status, /* reset status to state provided */
49632- lmc_t1_set_clock, /* set clock source */
49633- lmc_dummy_set2_1, /* set line speed */
49634- lmc_dummy_set_1, /* set cable length */
49635- lmc_dummy_set_1, /* set scrambler */
49636- lmc_t1_get_link_status, /* get link status */
49637- lmc_dummy_set_1, /* set link status */
49638- lmc_t1_set_crc_length, /* set CRC length */
49639- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49640- lmc_t1_watchdog
49641+ .init = lmc_t1_init, /* special media init stuff */
49642+ .defaults = lmc_t1_default, /* reset to default state */
49643+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49644+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49645+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49646+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49647+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49648+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49649+ .set_link_status = lmc_dummy_set_1, /* set link status */
49650+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49651+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49652+ .watchdog = lmc_t1_watchdog
49653 };
49654
49655 static void
49656diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49657index feacc3b..5bac0de 100644
49658--- a/drivers/net/wan/z85230.c
49659+++ b/drivers/net/wan/z85230.c
49660@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49661
49662 struct z8530_irqhandler z8530_sync =
49663 {
49664- z8530_rx,
49665- z8530_tx,
49666- z8530_status
49667+ .rx = z8530_rx,
49668+ .tx = z8530_tx,
49669+ .status = z8530_status
49670 };
49671
49672 EXPORT_SYMBOL(z8530_sync);
49673@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49674 }
49675
49676 static struct z8530_irqhandler z8530_dma_sync = {
49677- z8530_dma_rx,
49678- z8530_dma_tx,
49679- z8530_dma_status
49680+ .rx = z8530_dma_rx,
49681+ .tx = z8530_dma_tx,
49682+ .status = z8530_dma_status
49683 };
49684
49685 static struct z8530_irqhandler z8530_txdma_sync = {
49686- z8530_rx,
49687- z8530_dma_tx,
49688- z8530_dma_status
49689+ .rx = z8530_rx,
49690+ .tx = z8530_dma_tx,
49691+ .status = z8530_dma_status
49692 };
49693
49694 /**
49695@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49696
49697 struct z8530_irqhandler z8530_nop=
49698 {
49699- z8530_rx_clear,
49700- z8530_tx_clear,
49701- z8530_status_clear
49702+ .rx = z8530_rx_clear,
49703+ .tx = z8530_tx_clear,
49704+ .status = z8530_status_clear
49705 };
49706
49707
49708diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49709index 0b60295..b8bfa5b 100644
49710--- a/drivers/net/wimax/i2400m/rx.c
49711+++ b/drivers/net/wimax/i2400m/rx.c
49712@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49713 if (i2400m->rx_roq == NULL)
49714 goto error_roq_alloc;
49715
49716- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49717+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49718 GFP_KERNEL);
49719 if (rd == NULL) {
49720 result = -ENOMEM;
49721diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49722index d0c97c2..108f59b 100644
49723--- a/drivers/net/wireless/airo.c
49724+++ b/drivers/net/wireless/airo.c
49725@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49726 struct airo_info *ai = dev->ml_priv;
49727 int ridcode;
49728 int enabled;
49729- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49730+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49731 unsigned char *iobuf;
49732
49733 /* Only super-user can write RIDs */
49734diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49735index 49219c5..3625441 100644
49736--- a/drivers/net/wireless/at76c50x-usb.c
49737+++ b/drivers/net/wireless/at76c50x-usb.c
49738@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49739 }
49740
49741 /* Convert timeout from the DFU status to jiffies */
49742-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49743+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49744 {
49745 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49746 | (s->poll_timeout[1] << 8)
49747diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49748index 2fd9e18..3f55bdd 100644
49749--- a/drivers/net/wireless/ath/ath10k/htc.c
49750+++ b/drivers/net/wireless/ath/ath10k/htc.c
49751@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49752 /* registered target arrival callback from the HIF layer */
49753 int ath10k_htc_init(struct ath10k *ar)
49754 {
49755- struct ath10k_hif_cb htc_callbacks;
49756+ static struct ath10k_hif_cb htc_callbacks = {
49757+ .rx_completion = ath10k_htc_rx_completion_handler,
49758+ .tx_completion = ath10k_htc_tx_completion_handler,
49759+ };
49760 struct ath10k_htc_ep *ep = NULL;
49761 struct ath10k_htc *htc = &ar->htc;
49762
49763@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
49764 ath10k_htc_reset_endpoint_states(htc);
49765
49766 /* setup HIF layer callbacks */
49767- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49768- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49769 htc->ar = ar;
49770
49771 /* Get HIF default pipe for HTC message exchange */
49772diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49773index 527179c..a890150 100644
49774--- a/drivers/net/wireless/ath/ath10k/htc.h
49775+++ b/drivers/net/wireless/ath/ath10k/htc.h
49776@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49777
49778 struct ath10k_htc_ops {
49779 void (*target_send_suspend_complete)(struct ath10k *ar);
49780-};
49781+} __no_const;
49782
49783 struct ath10k_htc_ep_ops {
49784 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49785 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49786 void (*ep_tx_credits)(struct ath10k *);
49787-};
49788+} __no_const;
49789
49790 /* service connection information */
49791 struct ath10k_htc_svc_conn_req {
49792diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49793index f816909..e56cd8b 100644
49794--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49795+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49796@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49797 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49798 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49799
49800- ACCESS_ONCE(ads->ds_link) = i->link;
49801- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49802+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49803+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49804
49805 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49806 ctl6 = SM(i->keytype, AR_EncrType);
49807@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49808
49809 if ((i->is_first || i->is_last) &&
49810 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49811- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49812+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49813 | set11nTries(i->rates, 1)
49814 | set11nTries(i->rates, 2)
49815 | set11nTries(i->rates, 3)
49816 | (i->dur_update ? AR_DurUpdateEna : 0)
49817 | SM(0, AR_BurstDur);
49818
49819- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49820+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49821 | set11nRate(i->rates, 1)
49822 | set11nRate(i->rates, 2)
49823 | set11nRate(i->rates, 3);
49824 } else {
49825- ACCESS_ONCE(ads->ds_ctl2) = 0;
49826- ACCESS_ONCE(ads->ds_ctl3) = 0;
49827+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49828+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49829 }
49830
49831 if (!i->is_first) {
49832- ACCESS_ONCE(ads->ds_ctl0) = 0;
49833- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49834- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49835+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49836+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49837+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49838 return;
49839 }
49840
49841@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49842 break;
49843 }
49844
49845- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49846+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49847 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49848 | SM(i->txpower[0], AR_XmitPower0)
49849 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49850@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49851 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
49852 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
49853
49854- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49855- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49856+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49857+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49858
49859 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
49860 return;
49861
49862- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49863+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49864 | set11nPktDurRTSCTS(i->rates, 1);
49865
49866- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49867+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49868 | set11nPktDurRTSCTS(i->rates, 3);
49869
49870- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49871+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49872 | set11nRateFlags(i->rates, 1)
49873 | set11nRateFlags(i->rates, 2)
49874 | set11nRateFlags(i->rates, 3)
49875 | SM(i->rtscts_rate, AR_RTSCTSRate);
49876
49877- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49878- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49879- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49880+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49881+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49882+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49883 }
49884
49885 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
49886diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49887index da84b70..83e4978 100644
49888--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49889+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49890@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49891 (i->qcu << AR_TxQcuNum_S) | desc_len;
49892
49893 checksum += val;
49894- ACCESS_ONCE(ads->info) = val;
49895+ ACCESS_ONCE_RW(ads->info) = val;
49896
49897 checksum += i->link;
49898- ACCESS_ONCE(ads->link) = i->link;
49899+ ACCESS_ONCE_RW(ads->link) = i->link;
49900
49901 checksum += i->buf_addr[0];
49902- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49903+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49904 checksum += i->buf_addr[1];
49905- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
49906+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
49907 checksum += i->buf_addr[2];
49908- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
49909+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
49910 checksum += i->buf_addr[3];
49911- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
49912+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
49913
49914 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49915- ACCESS_ONCE(ads->ctl3) = val;
49916+ ACCESS_ONCE_RW(ads->ctl3) = val;
49917 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49918- ACCESS_ONCE(ads->ctl5) = val;
49919+ ACCESS_ONCE_RW(ads->ctl5) = val;
49920 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49921- ACCESS_ONCE(ads->ctl7) = val;
49922+ ACCESS_ONCE_RW(ads->ctl7) = val;
49923 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49924- ACCESS_ONCE(ads->ctl9) = val;
49925+ ACCESS_ONCE_RW(ads->ctl9) = val;
49926
49927 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49928- ACCESS_ONCE(ads->ctl10) = checksum;
49929+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
49930
49931 if (i->is_first || i->is_last) {
49932- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49933+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49934 | set11nTries(i->rates, 1)
49935 | set11nTries(i->rates, 2)
49936 | set11nTries(i->rates, 3)
49937 | (i->dur_update ? AR_DurUpdateEna : 0)
49938 | SM(0, AR_BurstDur);
49939
49940- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49941+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49942 | set11nRate(i->rates, 1)
49943 | set11nRate(i->rates, 2)
49944 | set11nRate(i->rates, 3);
49945 } else {
49946- ACCESS_ONCE(ads->ctl13) = 0;
49947- ACCESS_ONCE(ads->ctl14) = 0;
49948+ ACCESS_ONCE_RW(ads->ctl13) = 0;
49949+ ACCESS_ONCE_RW(ads->ctl14) = 0;
49950 }
49951
49952 ads->ctl20 = 0;
49953@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49954
49955 ctl17 = SM(i->keytype, AR_EncrType);
49956 if (!i->is_first) {
49957- ACCESS_ONCE(ads->ctl11) = 0;
49958- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49959- ACCESS_ONCE(ads->ctl15) = 0;
49960- ACCESS_ONCE(ads->ctl16) = 0;
49961- ACCESS_ONCE(ads->ctl17) = ctl17;
49962- ACCESS_ONCE(ads->ctl18) = 0;
49963- ACCESS_ONCE(ads->ctl19) = 0;
49964+ ACCESS_ONCE_RW(ads->ctl11) = 0;
49965+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49966+ ACCESS_ONCE_RW(ads->ctl15) = 0;
49967+ ACCESS_ONCE_RW(ads->ctl16) = 0;
49968+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49969+ ACCESS_ONCE_RW(ads->ctl18) = 0;
49970+ ACCESS_ONCE_RW(ads->ctl19) = 0;
49971 return;
49972 }
49973
49974- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49975+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49976 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49977 | SM(i->txpower[0], AR_XmitPower0)
49978 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49979@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49980 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49981 ctl12 |= SM(val, AR_PAPRDChainMask);
49982
49983- ACCESS_ONCE(ads->ctl12) = ctl12;
49984- ACCESS_ONCE(ads->ctl17) = ctl17;
49985+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49986+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49987
49988- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49989+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49990 | set11nPktDurRTSCTS(i->rates, 1);
49991
49992- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49993+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49994 | set11nPktDurRTSCTS(i->rates, 3);
49995
49996- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49997+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49998 | set11nRateFlags(i->rates, 1)
49999 | set11nRateFlags(i->rates, 2)
50000 | set11nRateFlags(i->rates, 3)
50001 | SM(i->rtscts_rate, AR_RTSCTSRate);
50002
50003- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
50004+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
50005
50006- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50007- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50008- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50009+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50010+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50011+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50012 }
50013
50014 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
50015diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
50016index c1d2d03..08352db 100644
50017--- a/drivers/net/wireless/ath/ath9k/hw.h
50018+++ b/drivers/net/wireless/ath/ath9k/hw.h
50019@@ -671,7 +671,7 @@ struct ath_hw_private_ops {
50020 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50021 bool (*is_aic_enabled)(struct ath_hw *ah);
50022 #endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
50023-};
50024+} __no_const;
50025
50026 /**
50027 * struct ath_spec_scan - parameters for Atheros spectral scan
50028@@ -747,7 +747,7 @@ struct ath_hw_ops {
50029 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50030 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50031 #endif
50032-};
50033+} __no_const;
50034
50035 struct ath_nf_limits {
50036 s16 max;
50037diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50038index d5f2fbf..0740c8b 100644
50039--- a/drivers/net/wireless/ath/ath9k/main.c
50040+++ b/drivers/net/wireless/ath/ath9k/main.c
50041@@ -2575,16 +2575,18 @@ void ath9k_fill_chanctx_ops(void)
50042 if (!ath9k_is_chanctx_enabled())
50043 return;
50044
50045- ath9k_ops.hw_scan = ath9k_hw_scan;
50046- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50047- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50048- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50049- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50050- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50051- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50052- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50053- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50054- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50055+ pax_open_kernel();
50056+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50057+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50058+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50059+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50060+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50061+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50062+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50063+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50064+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50065+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50066+ pax_close_kernel();
50067 }
50068
50069 #endif
50070diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50071index 058a9f2..d5cb1ba 100644
50072--- a/drivers/net/wireless/b43/phy_lp.c
50073+++ b/drivers/net/wireless/b43/phy_lp.c
50074@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50075 {
50076 struct ssb_bus *bus = dev->dev->sdev->bus;
50077
50078- static const struct b206x_channel *chandata = NULL;
50079+ const struct b206x_channel *chandata = NULL;
50080 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50081 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50082 u16 old_comm15, scale;
50083diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50084index e566580..2c218ca 100644
50085--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50086+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50087@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50088 */
50089 if (il3945_mod_params.disable_hw_scan) {
50090 D_INFO("Disabling hw_scan\n");
50091- il3945_mac_ops.hw_scan = NULL;
50092+ pax_open_kernel();
50093+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50094+ pax_close_kernel();
50095 }
50096
50097 D_INFO("*** LOAD DRIVER ***\n");
50098diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50099index 0ffb6ff..c0b7f0e 100644
50100--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50101+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50102@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50103 {
50104 struct iwl_priv *priv = file->private_data;
50105 char buf[64];
50106- int buf_size;
50107+ size_t buf_size;
50108 u32 offset, len;
50109
50110 memset(buf, 0, sizeof(buf));
50111@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50112 struct iwl_priv *priv = file->private_data;
50113
50114 char buf[8];
50115- int buf_size;
50116+ size_t buf_size;
50117 u32 reset_flag;
50118
50119 memset(buf, 0, sizeof(buf));
50120@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50121 {
50122 struct iwl_priv *priv = file->private_data;
50123 char buf[8];
50124- int buf_size;
50125+ size_t buf_size;
50126 int ht40;
50127
50128 memset(buf, 0, sizeof(buf));
50129@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50130 {
50131 struct iwl_priv *priv = file->private_data;
50132 char buf[8];
50133- int buf_size;
50134+ size_t buf_size;
50135 int value;
50136
50137 memset(buf, 0, sizeof(buf));
50138@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50139 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50140 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50141
50142-static const char *fmt_value = " %-30s %10u\n";
50143-static const char *fmt_hex = " %-30s 0x%02X\n";
50144-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50145-static const char *fmt_header =
50146+static const char fmt_value[] = " %-30s %10u\n";
50147+static const char fmt_hex[] = " %-30s 0x%02X\n";
50148+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50149+static const char fmt_header[] =
50150 "%-32s current cumulative delta max\n";
50151
50152 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50153@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50154 {
50155 struct iwl_priv *priv = file->private_data;
50156 char buf[8];
50157- int buf_size;
50158+ size_t buf_size;
50159 int clear;
50160
50161 memset(buf, 0, sizeof(buf));
50162@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50163 {
50164 struct iwl_priv *priv = file->private_data;
50165 char buf[8];
50166- int buf_size;
50167+ size_t buf_size;
50168 int trace;
50169
50170 memset(buf, 0, sizeof(buf));
50171@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50172 {
50173 struct iwl_priv *priv = file->private_data;
50174 char buf[8];
50175- int buf_size;
50176+ size_t buf_size;
50177 int missed;
50178
50179 memset(buf, 0, sizeof(buf));
50180@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50181
50182 struct iwl_priv *priv = file->private_data;
50183 char buf[8];
50184- int buf_size;
50185+ size_t buf_size;
50186 int plcp;
50187
50188 memset(buf, 0, sizeof(buf));
50189@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50190
50191 struct iwl_priv *priv = file->private_data;
50192 char buf[8];
50193- int buf_size;
50194+ size_t buf_size;
50195 int flush;
50196
50197 memset(buf, 0, sizeof(buf));
50198@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50199
50200 struct iwl_priv *priv = file->private_data;
50201 char buf[8];
50202- int buf_size;
50203+ size_t buf_size;
50204 int rts;
50205
50206 if (!priv->cfg->ht_params)
50207@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50208 {
50209 struct iwl_priv *priv = file->private_data;
50210 char buf[8];
50211- int buf_size;
50212+ size_t buf_size;
50213
50214 memset(buf, 0, sizeof(buf));
50215 buf_size = min(count, sizeof(buf) - 1);
50216@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50217 struct iwl_priv *priv = file->private_data;
50218 u32 event_log_flag;
50219 char buf[8];
50220- int buf_size;
50221+ size_t buf_size;
50222
50223 /* check that the interface is up */
50224 if (!iwl_is_ready(priv))
50225@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50226 struct iwl_priv *priv = file->private_data;
50227 char buf[8];
50228 u32 calib_disabled;
50229- int buf_size;
50230+ size_t buf_size;
50231
50232 memset(buf, 0, sizeof(buf));
50233 buf_size = min(count, sizeof(buf) - 1);
50234diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50235index 37e6a6f..b3b0369 100644
50236--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50237+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50238@@ -1919,7 +1919,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50239 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50240
50241 char buf[8];
50242- int buf_size;
50243+ size_t buf_size;
50244 u32 reset_flag;
50245
50246 memset(buf, 0, sizeof(buf));
50247@@ -1940,7 +1940,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50248 {
50249 struct iwl_trans *trans = file->private_data;
50250 char buf[8];
50251- int buf_size;
50252+ size_t buf_size;
50253 int csr;
50254
50255 memset(buf, 0, sizeof(buf));
50256diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50257index d5c0a1a..d056b20 100644
50258--- a/drivers/net/wireless/mac80211_hwsim.c
50259+++ b/drivers/net/wireless/mac80211_hwsim.c
50260@@ -3149,20 +3149,20 @@ static int __init init_mac80211_hwsim(void)
50261 if (channels < 1)
50262 return -EINVAL;
50263
50264- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50265- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50266- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50267- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50268- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50269- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50270- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50271- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50272- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50273- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50274- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50275- mac80211_hwsim_assign_vif_chanctx;
50276- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50277- mac80211_hwsim_unassign_vif_chanctx;
50278+ pax_open_kernel();
50279+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50280+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50281+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50282+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50283+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50284+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50285+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50286+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50287+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50288+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50289+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50290+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50291+ pax_close_kernel();
50292
50293 spin_lock_init(&hwsim_radio_lock);
50294 INIT_LIST_HEAD(&hwsim_radios);
50295diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50296index d72ff8e..c209a45 100644
50297--- a/drivers/net/wireless/rndis_wlan.c
50298+++ b/drivers/net/wireless/rndis_wlan.c
50299@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50300
50301 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50302
50303- if (rts_threshold < 0 || rts_threshold > 2347)
50304+ if (rts_threshold > 2347)
50305 rts_threshold = 2347;
50306
50307 tmp = cpu_to_le32(rts_threshold);
50308diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50309index 9bb398b..b0cc047 100644
50310--- a/drivers/net/wireless/rt2x00/rt2x00.h
50311+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50312@@ -375,7 +375,7 @@ struct rt2x00_intf {
50313 * for hardware which doesn't support hardware
50314 * sequence counting.
50315 */
50316- atomic_t seqno;
50317+ atomic_unchecked_t seqno;
50318 };
50319
50320 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50321diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50322index 68b620b..92ecd9e 100644
50323--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50324+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50325@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50326 * sequence counter given by mac80211.
50327 */
50328 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50329- seqno = atomic_add_return(0x10, &intf->seqno);
50330+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50331 else
50332- seqno = atomic_read(&intf->seqno);
50333+ seqno = atomic_read_unchecked(&intf->seqno);
50334
50335 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50336 hdr->seq_ctrl |= cpu_to_le16(seqno);
50337diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50338index b661f896..ddf7d2b 100644
50339--- a/drivers/net/wireless/ti/wl1251/sdio.c
50340+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50341@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50342
50343 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50344
50345- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50346- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50347+ pax_open_kernel();
50348+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50349+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50350+ pax_close_kernel();
50351
50352 wl1251_info("using dedicated interrupt line");
50353 } else {
50354- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50355- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50356+ pax_open_kernel();
50357+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50358+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50359+ pax_close_kernel();
50360
50361 wl1251_info("using SDIO interrupt");
50362 }
50363diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50364index af0fe2e..d04986b 100644
50365--- a/drivers/net/wireless/ti/wl12xx/main.c
50366+++ b/drivers/net/wireless/ti/wl12xx/main.c
50367@@ -655,7 +655,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50368 sizeof(wl->conf.mem));
50369
50370 /* read data preparation is only needed by wl127x */
50371- wl->ops->prepare_read = wl127x_prepare_read;
50372+ pax_open_kernel();
50373+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50374+ pax_close_kernel();
50375
50376 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50377 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50378@@ -680,7 +682,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50379 sizeof(wl->conf.mem));
50380
50381 /* read data preparation is only needed by wl127x */
50382- wl->ops->prepare_read = wl127x_prepare_read;
50383+ pax_open_kernel();
50384+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50385+ pax_close_kernel();
50386
50387 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50388 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50389diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50390index 717c4f5..a813aeb 100644
50391--- a/drivers/net/wireless/ti/wl18xx/main.c
50392+++ b/drivers/net/wireless/ti/wl18xx/main.c
50393@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50394 }
50395
50396 if (!checksum_param) {
50397- wl18xx_ops.set_rx_csum = NULL;
50398- wl18xx_ops.init_vif = NULL;
50399+ pax_open_kernel();
50400+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50401+ *(void **)&wl18xx_ops.init_vif = NULL;
50402+ pax_close_kernel();
50403 }
50404
50405 /* Enable 11a Band only if we have 5G antennas */
50406diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50407index a912dc0..a8225ba 100644
50408--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50409+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50410@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50411 {
50412 struct zd_usb *usb = urb->context;
50413 struct zd_usb_interrupt *intr = &usb->intr;
50414- int len;
50415+ unsigned int len;
50416 u16 int_num;
50417
50418 ZD_ASSERT(in_interrupt());
50419diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
50420index 0d25943..0866c5d 100644
50421--- a/drivers/net/xen-netback/netback.c
50422+++ b/drivers/net/xen-netback/netback.c
50423@@ -1571,13 +1571,13 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
50424 smp_rmb();
50425
50426 while (dc != dp) {
50427- BUG_ON(gop - queue->tx_unmap_ops > MAX_PENDING_REQS);
50428+ BUG_ON(gop - queue->tx_unmap_ops >= MAX_PENDING_REQS);
50429 pending_idx =
50430 queue->dealloc_ring[pending_index(dc++)];
50431
50432- pending_idx_release[gop-queue->tx_unmap_ops] =
50433+ pending_idx_release[gop - queue->tx_unmap_ops] =
50434 pending_idx;
50435- queue->pages_to_unmap[gop-queue->tx_unmap_ops] =
50436+ queue->pages_to_unmap[gop - queue->tx_unmap_ops] =
50437 queue->mmap_pages[pending_idx];
50438 gnttab_set_unmap_op(gop,
50439 idx_to_kaddr(queue, pending_idx),
50440diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50441index ce2e2cf..f81e500 100644
50442--- a/drivers/nfc/nfcwilink.c
50443+++ b/drivers/nfc/nfcwilink.c
50444@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50445
50446 static int nfcwilink_probe(struct platform_device *pdev)
50447 {
50448- static struct nfcwilink *drv;
50449+ struct nfcwilink *drv;
50450 int rc;
50451 __u32 protocols;
50452
50453diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50454index d251f72..0512865 100644
50455--- a/drivers/nfc/st21nfca/st21nfca.c
50456+++ b/drivers/nfc/st21nfca/st21nfca.c
50457@@ -148,14 +148,14 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50458 ST21NFCA_DEVICE_MGNT_GATE,
50459 ST21NFCA_DEVICE_MGNT_PIPE);
50460 if (r < 0)
50461- goto free_info;
50462+ return r;
50463
50464 /* Get pipe list */
50465 r = nfc_hci_send_cmd(hdev, ST21NFCA_DEVICE_MGNT_GATE,
50466 ST21NFCA_DM_GETINFO, pipe_list, sizeof(pipe_list),
50467 &skb_pipe_list);
50468 if (r < 0)
50469- goto free_info;
50470+ return r;
50471
50472 /* Complete the existing gate_pipe table */
50473 for (i = 0; i < skb_pipe_list->len; i++) {
50474@@ -181,6 +181,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50475 info->src_host_id != ST21NFCA_ESE_HOST_ID) {
50476 pr_err("Unexpected apdu_reader pipe on host %x\n",
50477 info->src_host_id);
50478+ kfree_skb(skb_pipe_info);
50479 continue;
50480 }
50481
50482@@ -200,6 +201,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50483 hdev->pipes[st21nfca_gates[j].pipe].dest_host =
50484 info->src_host_id;
50485 }
50486+ kfree_skb(skb_pipe_info);
50487 }
50488
50489 /*
50490@@ -214,13 +216,12 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50491 st21nfca_gates[i].gate,
50492 st21nfca_gates[i].pipe);
50493 if (r < 0)
50494- goto free_info;
50495+ goto free_list;
50496 }
50497 }
50498
50499 memcpy(hdev->init_data.gates, st21nfca_gates, sizeof(st21nfca_gates));
50500-free_info:
50501- kfree_skb(skb_pipe_info);
50502+free_list:
50503 kfree_skb(skb_pipe_list);
50504 return r;
50505 }
50506diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50507index cde35c5d01..2dbfdbbf 100644
50508--- a/drivers/of/fdt.c
50509+++ b/drivers/of/fdt.c
50510@@ -1136,7 +1136,9 @@ static int __init of_fdt_raw_init(void)
50511 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50512 return 0;
50513 }
50514- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50515+ pax_open_kernel();
50516+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50517+ pax_close_kernel();
50518 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50519 }
50520 late_initcall(of_fdt_raw_init);
50521diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50522index 82f7000..d6d0447 100644
50523--- a/drivers/oprofile/buffer_sync.c
50524+++ b/drivers/oprofile/buffer_sync.c
50525@@ -345,7 +345,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50526 if (cookie == NO_COOKIE)
50527 offset = pc;
50528 if (cookie == INVALID_COOKIE) {
50529- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50530+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50531 offset = pc;
50532 }
50533 if (cookie != last_cookie) {
50534@@ -389,14 +389,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50535 /* add userspace sample */
50536
50537 if (!mm) {
50538- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50539+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50540 return 0;
50541 }
50542
50543 cookie = lookup_dcookie(mm, s->eip, &offset);
50544
50545 if (cookie == INVALID_COOKIE) {
50546- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50547+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50548 return 0;
50549 }
50550
50551@@ -554,7 +554,7 @@ void sync_buffer(int cpu)
50552 /* ignore backtraces if failed to add a sample */
50553 if (state == sb_bt_start) {
50554 state = sb_bt_ignore;
50555- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50556+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50557 }
50558 }
50559 release_mm(mm);
50560diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50561index c0cc4e7..44d4e54 100644
50562--- a/drivers/oprofile/event_buffer.c
50563+++ b/drivers/oprofile/event_buffer.c
50564@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50565 }
50566
50567 if (buffer_pos == buffer_size) {
50568- atomic_inc(&oprofile_stats.event_lost_overflow);
50569+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50570 return;
50571 }
50572
50573diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50574index ed2c3ec..deda85a 100644
50575--- a/drivers/oprofile/oprof.c
50576+++ b/drivers/oprofile/oprof.c
50577@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50578 if (oprofile_ops.switch_events())
50579 return;
50580
50581- atomic_inc(&oprofile_stats.multiplex_counter);
50582+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50583 start_switch_worker();
50584 }
50585
50586diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50587index ee2cfce..7f8f699 100644
50588--- a/drivers/oprofile/oprofile_files.c
50589+++ b/drivers/oprofile/oprofile_files.c
50590@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50591
50592 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50593
50594-static ssize_t timeout_read(struct file *file, char __user *buf,
50595+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50596 size_t count, loff_t *offset)
50597 {
50598 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50599diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50600index 59659ce..6c860a0 100644
50601--- a/drivers/oprofile/oprofile_stats.c
50602+++ b/drivers/oprofile/oprofile_stats.c
50603@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50604 cpu_buf->sample_invalid_eip = 0;
50605 }
50606
50607- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50608- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50609- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50610- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50611- atomic_set(&oprofile_stats.multiplex_counter, 0);
50612+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50613+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50614+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50615+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50616+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50617 }
50618
50619
50620diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50621index 1fc622b..8c48fc3 100644
50622--- a/drivers/oprofile/oprofile_stats.h
50623+++ b/drivers/oprofile/oprofile_stats.h
50624@@ -13,11 +13,11 @@
50625 #include <linux/atomic.h>
50626
50627 struct oprofile_stat_struct {
50628- atomic_t sample_lost_no_mm;
50629- atomic_t sample_lost_no_mapping;
50630- atomic_t bt_lost_no_mapping;
50631- atomic_t event_lost_overflow;
50632- atomic_t multiplex_counter;
50633+ atomic_unchecked_t sample_lost_no_mm;
50634+ atomic_unchecked_t sample_lost_no_mapping;
50635+ atomic_unchecked_t bt_lost_no_mapping;
50636+ atomic_unchecked_t event_lost_overflow;
50637+ atomic_unchecked_t multiplex_counter;
50638 };
50639
50640 extern struct oprofile_stat_struct oprofile_stats;
50641diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50642index dd92c5e..dfc04b5 100644
50643--- a/drivers/oprofile/oprofilefs.c
50644+++ b/drivers/oprofile/oprofilefs.c
50645@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50646
50647 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50648 {
50649- atomic_t *val = file->private_data;
50650- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50651+ atomic_unchecked_t *val = file->private_data;
50652+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50653 }
50654
50655
50656@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50657
50658
50659 int oprofilefs_create_ro_atomic(struct dentry *root,
50660- char const *name, atomic_t *val)
50661+ char const *name, atomic_unchecked_t *val)
50662 {
50663 return __oprofilefs_create_file(root, name,
50664 &atomic_ro_fops, 0444, val);
50665diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50666index bdef916..88c7dee 100644
50667--- a/drivers/oprofile/timer_int.c
50668+++ b/drivers/oprofile/timer_int.c
50669@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50670 return NOTIFY_OK;
50671 }
50672
50673-static struct notifier_block __refdata oprofile_cpu_notifier = {
50674+static struct notifier_block oprofile_cpu_notifier = {
50675 .notifier_call = oprofile_cpu_notify,
50676 };
50677
50678diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50679index 3b47080..6cd05dd 100644
50680--- a/drivers/parport/procfs.c
50681+++ b/drivers/parport/procfs.c
50682@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50683
50684 *ppos += len;
50685
50686- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50687+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50688 }
50689
50690 #ifdef CONFIG_PARPORT_1284
50691@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50692
50693 *ppos += len;
50694
50695- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50696+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50697 }
50698 #endif /* IEEE1284.3 support. */
50699
50700diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50701index ba46e58..90cfc24 100644
50702--- a/drivers/pci/host/pci-host-generic.c
50703+++ b/drivers/pci/host/pci-host-generic.c
50704@@ -26,9 +26,9 @@
50705 #include <linux/platform_device.h>
50706
50707 struct gen_pci_cfg_bus_ops {
50708+ struct pci_ops ops;
50709 u32 bus_shift;
50710- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50711-};
50712+} __do_const;
50713
50714 struct gen_pci_cfg_windows {
50715 struct resource res;
50716@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50717 }
50718
50719 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50720+ .ops = {
50721+ .map_bus = gen_pci_map_cfg_bus_cam,
50722+ .read = pci_generic_config_read,
50723+ .write = pci_generic_config_write,
50724+ },
50725 .bus_shift = 16,
50726- .map_bus = gen_pci_map_cfg_bus_cam,
50727 };
50728
50729 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50730@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50731 }
50732
50733 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50734+ .ops = {
50735+ .map_bus = gen_pci_map_cfg_bus_ecam,
50736+ .read = pci_generic_config_read,
50737+ .write = pci_generic_config_write,
50738+ },
50739 .bus_shift = 20,
50740- .map_bus = gen_pci_map_cfg_bus_ecam,
50741-};
50742-
50743-static struct pci_ops gen_pci_ops = {
50744- .read = pci_generic_config_read,
50745- .write = pci_generic_config_write,
50746 };
50747
50748 static const struct of_device_id gen_pci_of_match[] = {
50749@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50750 .private_data = (void **)&pci,
50751 .setup = gen_pci_setup,
50752 .map_irq = of_irq_parse_and_map_pci,
50753- .ops = &gen_pci_ops,
50754 };
50755
50756 if (!pci)
50757@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50758
50759 of_id = of_match_node(gen_pci_of_match, np);
50760 pci->cfg.ops = of_id->data;
50761- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50762+ hw.ops = &pci->cfg.ops->ops;
50763 pci->host.dev.parent = dev;
50764 INIT_LIST_HEAD(&pci->host.windows);
50765 INIT_LIST_HEAD(&pci->resources);
50766diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50767index 6ca2399..68d866b 100644
50768--- a/drivers/pci/hotplug/acpiphp_ibm.c
50769+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50770@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50771 goto init_cleanup;
50772 }
50773
50774- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50775+ pax_open_kernel();
50776+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50777+ pax_close_kernel();
50778 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50779
50780 return retval;
50781diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50782index 66b7bbe..26bee78 100644
50783--- a/drivers/pci/hotplug/cpcihp_generic.c
50784+++ b/drivers/pci/hotplug/cpcihp_generic.c
50785@@ -73,7 +73,6 @@ static u16 port;
50786 static unsigned int enum_bit;
50787 static u8 enum_mask;
50788
50789-static struct cpci_hp_controller_ops generic_hpc_ops;
50790 static struct cpci_hp_controller generic_hpc;
50791
50792 static int __init validate_parameters(void)
50793@@ -139,6 +138,10 @@ static int query_enum(void)
50794 return ((value & enum_mask) == enum_mask);
50795 }
50796
50797+static struct cpci_hp_controller_ops generic_hpc_ops = {
50798+ .query_enum = query_enum,
50799+};
50800+
50801 static int __init cpcihp_generic_init(void)
50802 {
50803 int status;
50804@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50805 pci_dev_put(dev);
50806
50807 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50808- generic_hpc_ops.query_enum = query_enum;
50809 generic_hpc.ops = &generic_hpc_ops;
50810
50811 status = cpci_hp_register_controller(&generic_hpc);
50812diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50813index 7ecf34e..effed62 100644
50814--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50815+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50816@@ -59,7 +59,6 @@
50817 /* local variables */
50818 static bool debug;
50819 static bool poll;
50820-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50821 static struct cpci_hp_controller zt5550_hpc;
50822
50823 /* Primary cPCI bus bridge device */
50824@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50825 return 0;
50826 }
50827
50828+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50829+ .query_enum = zt5550_hc_query_enum,
50830+};
50831+
50832 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50833 {
50834 int status;
50835@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
50836 dbg("returned from zt5550_hc_config");
50837
50838 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
50839- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
50840 zt5550_hpc.ops = &zt5550_hpc_ops;
50841 if (!poll) {
50842 zt5550_hpc.irq = hc_dev->irq;
50843 zt5550_hpc.irq_flags = IRQF_SHARED;
50844 zt5550_hpc.dev_id = hc_dev;
50845
50846- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50847- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50848- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50849+ pax_open_kernel();
50850+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50851+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50852+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50853+ pax_open_kernel();
50854 } else {
50855 info("using ENUM# polling mode");
50856 }
50857diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
50858index 1e08ff8c..3cd145f 100644
50859--- a/drivers/pci/hotplug/cpqphp_nvram.c
50860+++ b/drivers/pci/hotplug/cpqphp_nvram.c
50861@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
50862
50863 void compaq_nvram_init (void __iomem *rom_start)
50864 {
50865+#ifndef CONFIG_PAX_KERNEXEC
50866 if (rom_start)
50867 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
50868+#endif
50869
50870 dbg("int15 entry = %p\n", compaq_int15_entry_point);
50871
50872diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
50873index 56d8486..f26113f 100644
50874--- a/drivers/pci/hotplug/pci_hotplug_core.c
50875+++ b/drivers/pci/hotplug/pci_hotplug_core.c
50876@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
50877 return -EINVAL;
50878 }
50879
50880- slot->ops->owner = owner;
50881- slot->ops->mod_name = mod_name;
50882+ pax_open_kernel();
50883+ *(struct module **)&slot->ops->owner = owner;
50884+ *(const char **)&slot->ops->mod_name = mod_name;
50885+ pax_close_kernel();
50886
50887 mutex_lock(&pci_hp_mutex);
50888 /*
50889diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
50890index 07aa722..84514b4 100644
50891--- a/drivers/pci/hotplug/pciehp_core.c
50892+++ b/drivers/pci/hotplug/pciehp_core.c
50893@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
50894 struct slot *slot = ctrl->slot;
50895 struct hotplug_slot *hotplug = NULL;
50896 struct hotplug_slot_info *info = NULL;
50897- struct hotplug_slot_ops *ops = NULL;
50898+ hotplug_slot_ops_no_const *ops = NULL;
50899 char name[SLOT_NAME_SIZE];
50900 int retval = -ENOMEM;
50901
50902diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
50903index c3e7dfc..cbd9625 100644
50904--- a/drivers/pci/msi.c
50905+++ b/drivers/pci/msi.c
50906@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
50907 {
50908 struct attribute **msi_attrs;
50909 struct attribute *msi_attr;
50910- struct device_attribute *msi_dev_attr;
50911- struct attribute_group *msi_irq_group;
50912+ device_attribute_no_const *msi_dev_attr;
50913+ attribute_group_no_const *msi_irq_group;
50914 const struct attribute_group **msi_irq_groups;
50915 struct msi_desc *entry;
50916 int ret = -ENOMEM;
50917@@ -573,7 +573,7 @@ error_attrs:
50918 count = 0;
50919 msi_attr = msi_attrs[count];
50920 while (msi_attr) {
50921- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
50922+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
50923 kfree(msi_attr->name);
50924 kfree(msi_dev_attr);
50925 ++count;
50926diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
50927index 312f23a..d21181c 100644
50928--- a/drivers/pci/pci-sysfs.c
50929+++ b/drivers/pci/pci-sysfs.c
50930@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
50931 {
50932 /* allocate attribute structure, piggyback attribute name */
50933 int name_len = write_combine ? 13 : 10;
50934- struct bin_attribute *res_attr;
50935+ bin_attribute_no_const *res_attr;
50936 int retval;
50937
50938 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
50939@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
50940 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
50941 {
50942 int retval;
50943- struct bin_attribute *attr;
50944+ bin_attribute_no_const *attr;
50945
50946 /* If the device has VPD, try to expose it in sysfs. */
50947 if (dev->vpd) {
50948@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
50949 {
50950 int retval;
50951 int rom_size = 0;
50952- struct bin_attribute *attr;
50953+ bin_attribute_no_const *attr;
50954
50955 if (!sysfs_initialized)
50956 return -EACCES;
50957diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
50958index 9bd762c2..6fb9504 100644
50959--- a/drivers/pci/pci.h
50960+++ b/drivers/pci/pci.h
50961@@ -99,7 +99,7 @@ struct pci_vpd_ops {
50962 struct pci_vpd {
50963 unsigned int len;
50964 const struct pci_vpd_ops *ops;
50965- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
50966+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
50967 };
50968
50969 int pci_vpd_pci22_init(struct pci_dev *dev);
50970diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
50971index 7d4fcdc..2f6d8f8 100644
50972--- a/drivers/pci/pcie/aspm.c
50973+++ b/drivers/pci/pcie/aspm.c
50974@@ -27,9 +27,9 @@
50975 #define MODULE_PARAM_PREFIX "pcie_aspm."
50976
50977 /* Note: those are not register definitions */
50978-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
50979-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
50980-#define ASPM_STATE_L1 (4) /* L1 state */
50981+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
50982+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
50983+#define ASPM_STATE_L1 (4U) /* L1 state */
50984 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
50985 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
50986
50987diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
50988index be35da2..ec16cdb 100644
50989--- a/drivers/pci/pcie/portdrv_pci.c
50990+++ b/drivers/pci/pcie/portdrv_pci.c
50991@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
50992 return 0;
50993 }
50994
50995-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
50996+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
50997 /*
50998 * Boxes that should not use MSI for PCIe PME signaling.
50999 */
51000diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
51001index c911857..56f3f9d 100644
51002--- a/drivers/pci/probe.c
51003+++ b/drivers/pci/probe.c
51004@@ -176,7 +176,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
51005 u16 orig_cmd;
51006 struct pci_bus_region region, inverted_region;
51007
51008- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
51009+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
51010
51011 /* No printks while decoding is disabled! */
51012 if (!dev->mmio_always_on) {
51013diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
51014index 3f155e7..0f4b1f0 100644
51015--- a/drivers/pci/proc.c
51016+++ b/drivers/pci/proc.c
51017@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
51018 static int __init pci_proc_init(void)
51019 {
51020 struct pci_dev *dev = NULL;
51021+
51022+#ifdef CONFIG_GRKERNSEC_PROC_ADD
51023+#ifdef CONFIG_GRKERNSEC_PROC_USER
51024+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
51025+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51026+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51027+#endif
51028+#else
51029 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51030+#endif
51031 proc_create("devices", 0, proc_bus_pci_dir,
51032 &proc_bus_pci_dev_operations);
51033 proc_initialized = 1;
51034diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51035index 3474920..acc9581 100644
51036--- a/drivers/platform/chrome/chromeos_pstore.c
51037+++ b/drivers/platform/chrome/chromeos_pstore.c
51038@@ -13,7 +13,7 @@
51039 #include <linux/platform_device.h>
51040 #include <linux/pstore_ram.h>
51041
51042-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51043+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51044 {
51045 /*
51046 * Today all Chromebooks/boxes ship with Google_* as version and
51047diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51048index 1e1e594..8fe59c5 100644
51049--- a/drivers/platform/x86/alienware-wmi.c
51050+++ b/drivers/platform/x86/alienware-wmi.c
51051@@ -150,7 +150,7 @@ struct wmax_led_args {
51052 } __packed;
51053
51054 static struct platform_device *platform_device;
51055-static struct device_attribute *zone_dev_attrs;
51056+static device_attribute_no_const *zone_dev_attrs;
51057 static struct attribute **zone_attrs;
51058 static struct platform_zone *zone_data;
51059
51060@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51061 }
51062 };
51063
51064-static struct attribute_group zone_attribute_group = {
51065+static attribute_group_no_const zone_attribute_group = {
51066 .name = "rgb_zones",
51067 };
51068
51069diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51070index 7543a56..367ca8ed 100644
51071--- a/drivers/platform/x86/asus-wmi.c
51072+++ b/drivers/platform/x86/asus-wmi.c
51073@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51074 int err;
51075 u32 retval = -1;
51076
51077+#ifdef CONFIG_GRKERNSEC_KMEM
51078+ return -EPERM;
51079+#endif
51080+
51081 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51082
51083 if (err < 0)
51084@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51085 int err;
51086 u32 retval = -1;
51087
51088+#ifdef CONFIG_GRKERNSEC_KMEM
51089+ return -EPERM;
51090+#endif
51091+
51092 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51093 &retval);
51094
51095@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51096 union acpi_object *obj;
51097 acpi_status status;
51098
51099+#ifdef CONFIG_GRKERNSEC_KMEM
51100+ return -EPERM;
51101+#endif
51102+
51103 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51104 1, asus->debug.method_id,
51105 &input, &output);
51106diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51107index b4e9447..9dc6ec34 100644
51108--- a/drivers/platform/x86/compal-laptop.c
51109+++ b/drivers/platform/x86/compal-laptop.c
51110@@ -765,7 +765,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51111 return 1;
51112 }
51113
51114-static struct dmi_system_id __initdata compal_dmi_table[] = {
51115+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51116 {
51117 .ident = "FL90/IFL90",
51118 .matches = {
51119diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51120index 458e6c9..089aee7 100644
51121--- a/drivers/platform/x86/hdaps.c
51122+++ b/drivers/platform/x86/hdaps.c
51123@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51124 "ThinkPad T42p", so the order of the entries matters.
51125 If your ThinkPad is not recognized, please update to latest
51126 BIOS. This is especially the case for some R52 ThinkPads. */
51127-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51128+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51129 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51130 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51131 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51132diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51133index 97c2be1..2ee50ce 100644
51134--- a/drivers/platform/x86/ibm_rtl.c
51135+++ b/drivers/platform/x86/ibm_rtl.c
51136@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51137 }
51138
51139
51140-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51141+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51142 { \
51143 .matches = { \
51144 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51145diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51146index 8037c8b..f88445c 100644
51147--- a/drivers/platform/x86/intel_oaktrail.c
51148+++ b/drivers/platform/x86/intel_oaktrail.c
51149@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51150 return 0;
51151 }
51152
51153-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51154+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51155 {
51156 .ident = "OakTrail platform",
51157 .matches = {
51158diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51159index 0859877..59d596d 100644
51160--- a/drivers/platform/x86/msi-laptop.c
51161+++ b/drivers/platform/x86/msi-laptop.c
51162@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51163 return 1;
51164 }
51165
51166-static struct dmi_system_id __initdata msi_dmi_table[] = {
51167+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51168 {
51169 .ident = "MSI S270",
51170 .matches = {
51171@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51172
51173 if (!quirks->ec_read_only) {
51174 /* allow userland write sysfs file */
51175- dev_attr_bluetooth.store = store_bluetooth;
51176- dev_attr_wlan.store = store_wlan;
51177- dev_attr_threeg.store = store_threeg;
51178- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51179- dev_attr_wlan.attr.mode |= S_IWUSR;
51180- dev_attr_threeg.attr.mode |= S_IWUSR;
51181+ pax_open_kernel();
51182+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51183+ *(void **)&dev_attr_wlan.store = store_wlan;
51184+ *(void **)&dev_attr_threeg.store = store_threeg;
51185+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51186+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51187+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51188+ pax_close_kernel();
51189 }
51190
51191 /* disable hardware control by fn key */
51192diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51193index 6d2bac0..ec2b029 100644
51194--- a/drivers/platform/x86/msi-wmi.c
51195+++ b/drivers/platform/x86/msi-wmi.c
51196@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51197 static void msi_wmi_notify(u32 value, void *context)
51198 {
51199 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51200- static struct key_entry *key;
51201+ struct key_entry *key;
51202 union acpi_object *obj;
51203 acpi_status status;
51204
51205diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51206index 9e701b2..c68a7b5 100644
51207--- a/drivers/platform/x86/samsung-laptop.c
51208+++ b/drivers/platform/x86/samsung-laptop.c
51209@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51210 return 0;
51211 }
51212
51213-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51214+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51215 {
51216 .matches = {
51217 DMI_MATCH(DMI_SYS_VENDOR,
51218diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51219index e6aac72..e11ff24 100644
51220--- a/drivers/platform/x86/samsung-q10.c
51221+++ b/drivers/platform/x86/samsung-q10.c
51222@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51223 return 1;
51224 }
51225
51226-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51227+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51228 {
51229 .ident = "Samsung Q10",
51230 .matches = {
51231diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51232index e51c1e7..71bb385 100644
51233--- a/drivers/platform/x86/sony-laptop.c
51234+++ b/drivers/platform/x86/sony-laptop.c
51235@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51236 }
51237
51238 /* High speed charging function */
51239-static struct device_attribute *hsc_handle;
51240+static device_attribute_no_const *hsc_handle;
51241
51242 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51243 struct device_attribute *attr,
51244@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51245 }
51246
51247 /* low battery function */
51248-static struct device_attribute *lowbatt_handle;
51249+static device_attribute_no_const *lowbatt_handle;
51250
51251 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51252 struct device_attribute *attr,
51253@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51254 }
51255
51256 /* fan speed function */
51257-static struct device_attribute *fan_handle, *hsf_handle;
51258+static device_attribute_no_const *fan_handle, *hsf_handle;
51259
51260 static ssize_t sony_nc_hsfan_store(struct device *dev,
51261 struct device_attribute *attr,
51262@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51263 }
51264
51265 /* USB charge function */
51266-static struct device_attribute *uc_handle;
51267+static device_attribute_no_const *uc_handle;
51268
51269 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51270 struct device_attribute *attr,
51271@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51272 }
51273
51274 /* Panel ID function */
51275-static struct device_attribute *panel_handle;
51276+static device_attribute_no_const *panel_handle;
51277
51278 static ssize_t sony_nc_panelid_show(struct device *dev,
51279 struct device_attribute *attr, char *buffer)
51280@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51281 }
51282
51283 /* smart connect function */
51284-static struct device_attribute *sc_handle;
51285+static device_attribute_no_const *sc_handle;
51286
51287 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51288 struct device_attribute *attr,
51289@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51290 .drv.pm = &sony_pic_pm,
51291 };
51292
51293-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51294+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51295 {
51296 .ident = "Sony Vaio",
51297 .matches = {
51298diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51299index 28f3281..171d8c3 100644
51300--- a/drivers/platform/x86/thinkpad_acpi.c
51301+++ b/drivers/platform/x86/thinkpad_acpi.c
51302@@ -2459,10 +2459,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51303 && !tp_features.bright_unkfw)
51304 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51305 }
51306+}
51307
51308 #undef TPACPI_COMPARE_KEY
51309 #undef TPACPI_MAY_SEND_KEY
51310-}
51311
51312 /*
51313 * Polling driver
51314diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51315index 438d4c7..ca8a2fb 100644
51316--- a/drivers/pnp/pnpbios/bioscalls.c
51317+++ b/drivers/pnp/pnpbios/bioscalls.c
51318@@ -59,7 +59,7 @@ do { \
51319 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51320 } while(0)
51321
51322-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51323+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51324 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51325
51326 /*
51327@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51328
51329 cpu = get_cpu();
51330 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51331+
51332+ pax_open_kernel();
51333 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51334+ pax_close_kernel();
51335
51336 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51337 spin_lock_irqsave(&pnp_bios_lock, flags);
51338@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51339 :"memory");
51340 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51341
51342+ pax_open_kernel();
51343 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51344+ pax_close_kernel();
51345+
51346 put_cpu();
51347
51348 /* If we get here and this is set then the PnP BIOS faulted on us. */
51349@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51350 return status;
51351 }
51352
51353-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51354+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51355 {
51356 int i;
51357
51358@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51359 pnp_bios_callpoint.offset = header->fields.pm16offset;
51360 pnp_bios_callpoint.segment = PNP_CS16;
51361
51362+ pax_open_kernel();
51363+
51364 for_each_possible_cpu(i) {
51365 struct desc_struct *gdt = get_cpu_gdt_table(i);
51366 if (!gdt)
51367@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51368 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51369 (unsigned long)__va(header->fields.pm16dseg));
51370 }
51371+
51372+ pax_close_kernel();
51373 }
51374diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51375index facd43b..b291260 100644
51376--- a/drivers/pnp/pnpbios/core.c
51377+++ b/drivers/pnp/pnpbios/core.c
51378@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51379 return 0;
51380 }
51381
51382-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51383+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51384 { /* PnPBIOS GPF on boot */
51385 .callback = exploding_pnp_bios,
51386 .ident = "Higraded P14H",
51387diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51388index dfe1ee8..67e820c 100644
51389--- a/drivers/power/pda_power.c
51390+++ b/drivers/power/pda_power.c
51391@@ -38,7 +38,11 @@ static struct power_supply *pda_psy_ac, *pda_psy_usb;
51392
51393 #if IS_ENABLED(CONFIG_USB_PHY)
51394 static struct usb_phy *transceiver;
51395-static struct notifier_block otg_nb;
51396+static int otg_handle_notification(struct notifier_block *nb,
51397+ unsigned long event, void *unused);
51398+static struct notifier_block otg_nb = {
51399+ .notifier_call = otg_handle_notification
51400+};
51401 #endif
51402
51403 static struct regulator *ac_draw;
51404@@ -373,7 +377,6 @@ static int pda_power_probe(struct platform_device *pdev)
51405
51406 #if IS_ENABLED(CONFIG_USB_PHY)
51407 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51408- otg_nb.notifier_call = otg_handle_notification;
51409 ret = usb_register_notifier(transceiver, &otg_nb);
51410 if (ret) {
51411 dev_err(dev, "failure to register otg notifier\n");
51412diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51413index cc439fd..8fa30df 100644
51414--- a/drivers/power/power_supply.h
51415+++ b/drivers/power/power_supply.h
51416@@ -16,12 +16,12 @@ struct power_supply;
51417
51418 #ifdef CONFIG_SYSFS
51419
51420-extern void power_supply_init_attrs(struct device_type *dev_type);
51421+extern void power_supply_init_attrs(void);
51422 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51423
51424 #else
51425
51426-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51427+static inline void power_supply_init_attrs(void) {}
51428 #define power_supply_uevent NULL
51429
51430 #endif /* CONFIG_SYSFS */
51431diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51432index 4bc0c7f..198c99d 100644
51433--- a/drivers/power/power_supply_core.c
51434+++ b/drivers/power/power_supply_core.c
51435@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51436 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51437 EXPORT_SYMBOL_GPL(power_supply_notifier);
51438
51439-static struct device_type power_supply_dev_type;
51440+extern const struct attribute_group *power_supply_attr_groups[];
51441+static struct device_type power_supply_dev_type = {
51442+ .groups = power_supply_attr_groups,
51443+};
51444
51445 #define POWER_SUPPLY_DEFERRED_REGISTER_TIME msecs_to_jiffies(10)
51446
51447@@ -921,7 +924,7 @@ static int __init power_supply_class_init(void)
51448 return PTR_ERR(power_supply_class);
51449
51450 power_supply_class->dev_uevent = power_supply_uevent;
51451- power_supply_init_attrs(&power_supply_dev_type);
51452+ power_supply_init_attrs();
51453
51454 return 0;
51455 }
51456diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51457index 9134e3d..45eee1e 100644
51458--- a/drivers/power/power_supply_sysfs.c
51459+++ b/drivers/power/power_supply_sysfs.c
51460@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51461 .is_visible = power_supply_attr_is_visible,
51462 };
51463
51464-static const struct attribute_group *power_supply_attr_groups[] = {
51465+const struct attribute_group *power_supply_attr_groups[] = {
51466 &power_supply_attr_group,
51467 NULL,
51468 };
51469
51470-void power_supply_init_attrs(struct device_type *dev_type)
51471+void power_supply_init_attrs(void)
51472 {
51473 int i;
51474
51475- dev_type->groups = power_supply_attr_groups;
51476-
51477 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51478 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51479 }
51480diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51481index 84419af..268ede8 100644
51482--- a/drivers/powercap/powercap_sys.c
51483+++ b/drivers/powercap/powercap_sys.c
51484@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51485 struct device_attribute name_attr;
51486 };
51487
51488+static ssize_t show_constraint_name(struct device *dev,
51489+ struct device_attribute *dev_attr,
51490+ char *buf);
51491+
51492 static struct powercap_constraint_attr
51493- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51494+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51495+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51496+ .power_limit_attr = {
51497+ .attr = {
51498+ .name = NULL,
51499+ .mode = S_IWUSR | S_IRUGO
51500+ },
51501+ .show = show_constraint_power_limit_uw,
51502+ .store = store_constraint_power_limit_uw
51503+ },
51504+
51505+ .time_window_attr = {
51506+ .attr = {
51507+ .name = NULL,
51508+ .mode = S_IWUSR | S_IRUGO
51509+ },
51510+ .show = show_constraint_time_window_us,
51511+ .store = store_constraint_time_window_us
51512+ },
51513+
51514+ .max_power_attr = {
51515+ .attr = {
51516+ .name = NULL,
51517+ .mode = S_IRUGO
51518+ },
51519+ .show = show_constraint_max_power_uw,
51520+ .store = NULL
51521+ },
51522+
51523+ .min_power_attr = {
51524+ .attr = {
51525+ .name = NULL,
51526+ .mode = S_IRUGO
51527+ },
51528+ .show = show_constraint_min_power_uw,
51529+ .store = NULL
51530+ },
51531+
51532+ .max_time_window_attr = {
51533+ .attr = {
51534+ .name = NULL,
51535+ .mode = S_IRUGO
51536+ },
51537+ .show = show_constraint_max_time_window_us,
51538+ .store = NULL
51539+ },
51540+
51541+ .min_time_window_attr = {
51542+ .attr = {
51543+ .name = NULL,
51544+ .mode = S_IRUGO
51545+ },
51546+ .show = show_constraint_min_time_window_us,
51547+ .store = NULL
51548+ },
51549+
51550+ .name_attr = {
51551+ .attr = {
51552+ .name = NULL,
51553+ .mode = S_IRUGO
51554+ },
51555+ .show = show_constraint_name,
51556+ .store = NULL
51557+ }
51558+ }
51559+};
51560
51561 /* A list of powercap control_types */
51562 static LIST_HEAD(powercap_cntrl_list);
51563@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51564 }
51565
51566 static int create_constraint_attribute(int id, const char *name,
51567- int mode,
51568- struct device_attribute *dev_attr,
51569- ssize_t (*show)(struct device *,
51570- struct device_attribute *, char *),
51571- ssize_t (*store)(struct device *,
51572- struct device_attribute *,
51573- const char *, size_t)
51574- )
51575+ struct device_attribute *dev_attr)
51576 {
51577+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51578
51579- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51580- id, name);
51581- if (!dev_attr->attr.name)
51582+ if (!name)
51583 return -ENOMEM;
51584- dev_attr->attr.mode = mode;
51585- dev_attr->show = show;
51586- dev_attr->store = store;
51587+
51588+ pax_open_kernel();
51589+ *(const char **)&dev_attr->attr.name = name;
51590+ pax_close_kernel();
51591
51592 return 0;
51593 }
51594@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51595
51596 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51597 ret = create_constraint_attribute(i, "power_limit_uw",
51598- S_IWUSR | S_IRUGO,
51599- &constraint_attrs[i].power_limit_attr,
51600- show_constraint_power_limit_uw,
51601- store_constraint_power_limit_uw);
51602+ &constraint_attrs[i].power_limit_attr);
51603 if (ret)
51604 goto err_alloc;
51605 ret = create_constraint_attribute(i, "time_window_us",
51606- S_IWUSR | S_IRUGO,
51607- &constraint_attrs[i].time_window_attr,
51608- show_constraint_time_window_us,
51609- store_constraint_time_window_us);
51610+ &constraint_attrs[i].time_window_attr);
51611 if (ret)
51612 goto err_alloc;
51613- ret = create_constraint_attribute(i, "name", S_IRUGO,
51614- &constraint_attrs[i].name_attr,
51615- show_constraint_name,
51616- NULL);
51617+ ret = create_constraint_attribute(i, "name",
51618+ &constraint_attrs[i].name_attr);
51619 if (ret)
51620 goto err_alloc;
51621- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51622- &constraint_attrs[i].max_power_attr,
51623- show_constraint_max_power_uw,
51624- NULL);
51625+ ret = create_constraint_attribute(i, "max_power_uw",
51626+ &constraint_attrs[i].max_power_attr);
51627 if (ret)
51628 goto err_alloc;
51629- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51630- &constraint_attrs[i].min_power_attr,
51631- show_constraint_min_power_uw,
51632- NULL);
51633+ ret = create_constraint_attribute(i, "min_power_uw",
51634+ &constraint_attrs[i].min_power_attr);
51635 if (ret)
51636 goto err_alloc;
51637 ret = create_constraint_attribute(i, "max_time_window_us",
51638- S_IRUGO,
51639- &constraint_attrs[i].max_time_window_attr,
51640- show_constraint_max_time_window_us,
51641- NULL);
51642+ &constraint_attrs[i].max_time_window_attr);
51643 if (ret)
51644 goto err_alloc;
51645 ret = create_constraint_attribute(i, "min_time_window_us",
51646- S_IRUGO,
51647- &constraint_attrs[i].min_time_window_attr,
51648- show_constraint_min_time_window_us,
51649- NULL);
51650+ &constraint_attrs[i].min_time_window_attr);
51651 if (ret)
51652 goto err_alloc;
51653
51654@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51655 power_zone->zone_dev_attrs[count++] =
51656 &dev_attr_max_energy_range_uj.attr;
51657 if (power_zone->ops->get_energy_uj) {
51658+ pax_open_kernel();
51659 if (power_zone->ops->reset_energy_uj)
51660- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51661+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51662 else
51663- dev_attr_energy_uj.attr.mode = S_IRUGO;
51664+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51665+ pax_close_kernel();
51666 power_zone->zone_dev_attrs[count++] =
51667 &dev_attr_energy_uj.attr;
51668 }
51669diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51670index 9c5d414..c7900ce 100644
51671--- a/drivers/ptp/ptp_private.h
51672+++ b/drivers/ptp/ptp_private.h
51673@@ -51,7 +51,7 @@ struct ptp_clock {
51674 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51675 wait_queue_head_t tsev_wq;
51676 int defunct; /* tells readers to go away when clock is being removed */
51677- struct device_attribute *pin_dev_attr;
51678+ device_attribute_no_const *pin_dev_attr;
51679 struct attribute **pin_attr;
51680 struct attribute_group pin_attr_group;
51681 };
51682diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51683index 302e626..12579af 100644
51684--- a/drivers/ptp/ptp_sysfs.c
51685+++ b/drivers/ptp/ptp_sysfs.c
51686@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51687 goto no_pin_attr;
51688
51689 for (i = 0; i < n_pins; i++) {
51690- struct device_attribute *da = &ptp->pin_dev_attr[i];
51691+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51692 sysfs_attr_init(&da->attr);
51693 da->attr.name = info->pin_config[i].name;
51694 da->attr.mode = 0644;
51695diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51696index 8a28116..05b0ad5 100644
51697--- a/drivers/regulator/core.c
51698+++ b/drivers/regulator/core.c
51699@@ -3603,7 +3603,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51700 const struct regulation_constraints *constraints = NULL;
51701 const struct regulator_init_data *init_data;
51702 struct regulator_config *config = NULL;
51703- static atomic_t regulator_no = ATOMIC_INIT(-1);
51704+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51705 struct regulator_dev *rdev;
51706 struct device *dev;
51707 int ret, i;
51708@@ -3686,7 +3686,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51709 rdev->dev.class = &regulator_class;
51710 rdev->dev.parent = dev;
51711 dev_set_name(&rdev->dev, "regulator.%lu",
51712- (unsigned long) atomic_inc_return(&regulator_no));
51713+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51714 ret = device_register(&rdev->dev);
51715 if (ret != 0) {
51716 put_device(&rdev->dev);
51717diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51718index 4071d74..260b15a 100644
51719--- a/drivers/regulator/max8660.c
51720+++ b/drivers/regulator/max8660.c
51721@@ -423,8 +423,10 @@ static int max8660_probe(struct i2c_client *client,
51722 max8660->shadow_regs[MAX8660_OVER1] = 5;
51723 } else {
51724 /* Otherwise devices can be toggled via software */
51725- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51726- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51727+ pax_open_kernel();
51728+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51729+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51730+ pax_close_kernel();
51731 }
51732
51733 /*
51734diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51735index c3d55c2..0dddfe6 100644
51736--- a/drivers/regulator/max8973-regulator.c
51737+++ b/drivers/regulator/max8973-regulator.c
51738@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51739 if (!pdata || !pdata->enable_ext_control) {
51740 max->desc.enable_reg = MAX8973_VOUT;
51741 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51742- max->ops.enable = regulator_enable_regmap;
51743- max->ops.disable = regulator_disable_regmap;
51744- max->ops.is_enabled = regulator_is_enabled_regmap;
51745+ pax_open_kernel();
51746+ *(void **)&max->ops.enable = regulator_enable_regmap;
51747+ *(void **)&max->ops.disable = regulator_disable_regmap;
51748+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51749+ pax_close_kernel();
51750 }
51751
51752 if (pdata) {
51753diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51754index 0d17c92..a29f627 100644
51755--- a/drivers/regulator/mc13892-regulator.c
51756+++ b/drivers/regulator/mc13892-regulator.c
51757@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51758 mc13xxx_unlock(mc13892);
51759
51760 /* update mc13892_vcam ops */
51761- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51762+ pax_open_kernel();
51763+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51764 sizeof(struct regulator_ops));
51765- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51766- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51767+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51768+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51769+ pax_close_kernel();
51770 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51771
51772 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51773diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51774index a82556a0..e842923 100644
51775--- a/drivers/rtc/rtc-cmos.c
51776+++ b/drivers/rtc/rtc-cmos.c
51777@@ -793,7 +793,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51778 hpet_rtc_timer_init();
51779
51780 /* export at least the first block of NVRAM */
51781- nvram.size = address_space - NVRAM_OFFSET;
51782+ pax_open_kernel();
51783+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51784+ pax_close_kernel();
51785 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51786 if (retval < 0) {
51787 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51788diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51789index 799c34b..8e9786a 100644
51790--- a/drivers/rtc/rtc-dev.c
51791+++ b/drivers/rtc/rtc-dev.c
51792@@ -16,6 +16,7 @@
51793 #include <linux/module.h>
51794 #include <linux/rtc.h>
51795 #include <linux/sched.h>
51796+#include <linux/grsecurity.h>
51797 #include "rtc-core.h"
51798
51799 static dev_t rtc_devt;
51800@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51801 if (copy_from_user(&tm, uarg, sizeof(tm)))
51802 return -EFAULT;
51803
51804+ gr_log_timechange();
51805+
51806 return rtc_set_time(rtc, &tm);
51807
51808 case RTC_PIE_ON:
51809diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51810index 4ffabb3..1f87fca 100644
51811--- a/drivers/rtc/rtc-ds1307.c
51812+++ b/drivers/rtc/rtc-ds1307.c
51813@@ -107,7 +107,7 @@ struct ds1307 {
51814 u8 offset; /* register's offset */
51815 u8 regs[11];
51816 u16 nvram_offset;
51817- struct bin_attribute *nvram;
51818+ bin_attribute_no_const *nvram;
51819 enum ds_type type;
51820 unsigned long flags;
51821 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51822diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51823index 90abb5b..e0bf6dd 100644
51824--- a/drivers/rtc/rtc-m48t59.c
51825+++ b/drivers/rtc/rtc-m48t59.c
51826@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
51827 if (IS_ERR(m48t59->rtc))
51828 return PTR_ERR(m48t59->rtc);
51829
51830- m48t59_nvram_attr.size = pdata->offset;
51831+ pax_open_kernel();
51832+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
51833+ pax_close_kernel();
51834
51835 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
51836 if (ret)
51837diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
51838index 3a2da4c..e88493c 100644
51839--- a/drivers/rtc/rtc-test.c
51840+++ b/drivers/rtc/rtc-test.c
51841@@ -112,8 +112,10 @@ static int test_probe(struct platform_device *plat_dev)
51842 struct rtc_device *rtc;
51843
51844 if (test_mmss64) {
51845- test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
51846- test_rtc_ops.set_mmss = NULL;
51847+ pax_open_kernel();
51848+ *(void **)&test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
51849+ *(void **)&test_rtc_ops.set_mmss = NULL;
51850+ pax_close_kernel();
51851 }
51852
51853 rtc = devm_rtc_device_register(&plat_dev->dev, "test",
51854diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
51855index 1f74760..8e00a89 100644
51856--- a/drivers/scsi/be2iscsi/be_main.c
51857+++ b/drivers/scsi/be2iscsi/be_main.c
51858@@ -3165,7 +3165,7 @@ be_sgl_create_contiguous(void *virtual_address,
51859 {
51860 WARN_ON(!virtual_address);
51861 WARN_ON(!physical_address);
51862- WARN_ON(!length > 0);
51863+ WARN_ON(!length);
51864 WARN_ON(!sgl);
51865
51866 sgl->va = virtual_address;
51867diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
51868index e693af6..2e525b6 100644
51869--- a/drivers/scsi/bfa/bfa_fcpim.h
51870+++ b/drivers/scsi/bfa/bfa_fcpim.h
51871@@ -36,7 +36,7 @@ struct bfa_iotag_s {
51872
51873 struct bfa_itn_s {
51874 bfa_isr_func_t isr;
51875-};
51876+} __no_const;
51877
51878 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
51879 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
51880diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
51881index 0f19455..ef7adb5 100644
51882--- a/drivers/scsi/bfa/bfa_fcs.c
51883+++ b/drivers/scsi/bfa/bfa_fcs.c
51884@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
51885 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
51886
51887 static struct bfa_fcs_mod_s fcs_modules[] = {
51888- { bfa_fcs_port_attach, NULL, NULL },
51889- { bfa_fcs_uf_attach, NULL, NULL },
51890- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
51891- bfa_fcs_fabric_modexit },
51892+ {
51893+ .attach = bfa_fcs_port_attach,
51894+ .modinit = NULL,
51895+ .modexit = NULL
51896+ },
51897+ {
51898+ .attach = bfa_fcs_uf_attach,
51899+ .modinit = NULL,
51900+ .modexit = NULL
51901+ },
51902+ {
51903+ .attach = bfa_fcs_fabric_attach,
51904+ .modinit = bfa_fcs_fabric_modinit,
51905+ .modexit = bfa_fcs_fabric_modexit
51906+ },
51907 };
51908
51909 /*
51910diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
51911index ff75ef8..2dfe00a 100644
51912--- a/drivers/scsi/bfa/bfa_fcs_lport.c
51913+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
51914@@ -89,15 +89,26 @@ static struct {
51915 void (*offline) (struct bfa_fcs_lport_s *port);
51916 } __port_action[] = {
51917 {
51918- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
51919- bfa_fcs_lport_unknown_offline}, {
51920- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
51921- bfa_fcs_lport_fab_offline}, {
51922- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
51923- bfa_fcs_lport_n2n_offline}, {
51924- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
51925- bfa_fcs_lport_loop_offline},
51926- };
51927+ .init = bfa_fcs_lport_unknown_init,
51928+ .online = bfa_fcs_lport_unknown_online,
51929+ .offline = bfa_fcs_lport_unknown_offline
51930+ },
51931+ {
51932+ .init = bfa_fcs_lport_fab_init,
51933+ .online = bfa_fcs_lport_fab_online,
51934+ .offline = bfa_fcs_lport_fab_offline
51935+ },
51936+ {
51937+ .init = bfa_fcs_lport_n2n_init,
51938+ .online = bfa_fcs_lport_n2n_online,
51939+ .offline = bfa_fcs_lport_n2n_offline
51940+ },
51941+ {
51942+ .init = bfa_fcs_lport_loop_init,
51943+ .online = bfa_fcs_lport_loop_online,
51944+ .offline = bfa_fcs_lport_loop_offline
51945+ },
51946+};
51947
51948 /*
51949 * fcs_port_sm FCS logical port state machine
51950diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
51951index a38aafa0..fe8f03b 100644
51952--- a/drivers/scsi/bfa/bfa_ioc.h
51953+++ b/drivers/scsi/bfa/bfa_ioc.h
51954@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
51955 bfa_ioc_disable_cbfn_t disable_cbfn;
51956 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
51957 bfa_ioc_reset_cbfn_t reset_cbfn;
51958-};
51959+} __no_const;
51960
51961 /*
51962 * IOC event notification mechanism.
51963@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
51964 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
51965 enum bfi_ioc_state fwstate);
51966 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
51967-};
51968+} __no_const;
51969
51970 /*
51971 * Queue element to wait for room in request queue. FIFO order is
51972diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
51973index a14c784..6de6790 100644
51974--- a/drivers/scsi/bfa/bfa_modules.h
51975+++ b/drivers/scsi/bfa/bfa_modules.h
51976@@ -78,12 +78,12 @@ enum {
51977 \
51978 extern struct bfa_module_s hal_mod_ ## __mod; \
51979 struct bfa_module_s hal_mod_ ## __mod = { \
51980- bfa_ ## __mod ## _meminfo, \
51981- bfa_ ## __mod ## _attach, \
51982- bfa_ ## __mod ## _detach, \
51983- bfa_ ## __mod ## _start, \
51984- bfa_ ## __mod ## _stop, \
51985- bfa_ ## __mod ## _iocdisable, \
51986+ .meminfo = bfa_ ## __mod ## _meminfo, \
51987+ .attach = bfa_ ## __mod ## _attach, \
51988+ .detach = bfa_ ## __mod ## _detach, \
51989+ .start = bfa_ ## __mod ## _start, \
51990+ .stop = bfa_ ## __mod ## _stop, \
51991+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
51992 }
51993
51994 #define BFA_CACHELINE_SZ (256)
51995diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
51996index 045c4e1..13de803 100644
51997--- a/drivers/scsi/fcoe/fcoe_sysfs.c
51998+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
51999@@ -33,8 +33,8 @@
52000 */
52001 #include "libfcoe.h"
52002
52003-static atomic_t ctlr_num;
52004-static atomic_t fcf_num;
52005+static atomic_unchecked_t ctlr_num;
52006+static atomic_unchecked_t fcf_num;
52007
52008 /*
52009 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
52010@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
52011 if (!ctlr)
52012 goto out;
52013
52014- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
52015+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
52016 ctlr->f = f;
52017 ctlr->mode = FIP_CONN_TYPE_FABRIC;
52018 INIT_LIST_HEAD(&ctlr->fcfs);
52019@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
52020 fcf->dev.parent = &ctlr->dev;
52021 fcf->dev.bus = &fcoe_bus_type;
52022 fcf->dev.type = &fcoe_fcf_device_type;
52023- fcf->id = atomic_inc_return(&fcf_num) - 1;
52024+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
52025 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52026
52027 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52028@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52029 {
52030 int error;
52031
52032- atomic_set(&ctlr_num, 0);
52033- atomic_set(&fcf_num, 0);
52034+ atomic_set_unchecked(&ctlr_num, 0);
52035+ atomic_set_unchecked(&fcf_num, 0);
52036
52037 error = bus_register(&fcoe_bus_type);
52038 if (error)
52039diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52040index 8bb173e..20236b4 100644
52041--- a/drivers/scsi/hosts.c
52042+++ b/drivers/scsi/hosts.c
52043@@ -42,7 +42,7 @@
52044 #include "scsi_logging.h"
52045
52046
52047-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52048+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52049
52050
52051 static void scsi_host_cls_release(struct device *dev)
52052@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52053 * subtract one because we increment first then return, but we need to
52054 * know what the next host number was before increment
52055 */
52056- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52057+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52058 shost->dma_channel = 0xff;
52059
52060 /* These three are default values which can be overridden */
52061diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52062index 8eab107..599cd79 100644
52063--- a/drivers/scsi/hpsa.c
52064+++ b/drivers/scsi/hpsa.c
52065@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52066 struct reply_queue_buffer *rq = &h->reply_queue[q];
52067
52068 if (h->transMethod & CFGTBL_Trans_io_accel1)
52069- return h->access.command_completed(h, q);
52070+ return h->access->command_completed(h, q);
52071
52072 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52073- return h->access.command_completed(h, q);
52074+ return h->access->command_completed(h, q);
52075
52076 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52077 a = rq->head[rq->current_entry];
52078@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52079 break;
52080 default:
52081 set_performant_mode(h, c);
52082- h->access.submit_command(h, c);
52083+ h->access->submit_command(h, c);
52084 }
52085 }
52086
52087@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52088
52089 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52090 {
52091- return h->access.command_completed(h, q);
52092+ return h->access->command_completed(h, q);
52093 }
52094
52095 static inline bool interrupt_pending(struct ctlr_info *h)
52096 {
52097- return h->access.intr_pending(h);
52098+ return h->access->intr_pending(h);
52099 }
52100
52101 static inline long interrupt_not_for_us(struct ctlr_info *h)
52102 {
52103- return (h->access.intr_pending(h) == 0) ||
52104+ return (h->access->intr_pending(h) == 0) ||
52105 (h->interrupts_enabled == 0);
52106 }
52107
52108@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52109 if (prod_index < 0)
52110 return prod_index;
52111 h->product_name = products[prod_index].product_name;
52112- h->access = *(products[prod_index].access);
52113+ h->access = products[prod_index].access;
52114
52115 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52116 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52117@@ -6647,7 +6647,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52118 unsigned long flags;
52119 u32 lockup_detected;
52120
52121- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52122+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52123 spin_lock_irqsave(&h->lock, flags);
52124 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52125 if (!lockup_detected) {
52126@@ -6922,7 +6922,7 @@ reinit_after_soft_reset:
52127 }
52128
52129 /* make sure the board interrupts are off */
52130- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52131+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52132
52133 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52134 goto clean2;
52135@@ -6958,7 +6958,7 @@ reinit_after_soft_reset:
52136 * fake ones to scoop up any residual completions.
52137 */
52138 spin_lock_irqsave(&h->lock, flags);
52139- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52140+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52141 spin_unlock_irqrestore(&h->lock, flags);
52142 hpsa_free_irqs(h);
52143 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52144@@ -6977,9 +6977,9 @@ reinit_after_soft_reset:
52145 dev_info(&h->pdev->dev, "Board READY.\n");
52146 dev_info(&h->pdev->dev,
52147 "Waiting for stale completions to drain.\n");
52148- h->access.set_intr_mask(h, HPSA_INTR_ON);
52149+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52150 msleep(10000);
52151- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52152+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52153
52154 rc = controller_reset_failed(h->cfgtable);
52155 if (rc)
52156@@ -7004,7 +7004,7 @@ reinit_after_soft_reset:
52157
52158
52159 /* Turn the interrupts on so we can service requests */
52160- h->access.set_intr_mask(h, HPSA_INTR_ON);
52161+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52162
52163 hpsa_hba_inquiry(h);
52164 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52165@@ -7077,7 +7077,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52166 * To write all data in the battery backed cache to disks
52167 */
52168 hpsa_flush_cache(h);
52169- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52170+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52171 hpsa_free_irqs_and_disable_msix(h);
52172 }
52173
52174@@ -7198,7 +7198,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52175 CFGTBL_Trans_enable_directed_msix |
52176 (trans_support & (CFGTBL_Trans_io_accel1 |
52177 CFGTBL_Trans_io_accel2));
52178- struct access_method access = SA5_performant_access;
52179+ struct access_method *access = &SA5_performant_access;
52180
52181 /* This is a bit complicated. There are 8 registers on
52182 * the controller which we write to to tell it 8 different
52183@@ -7240,7 +7240,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52184 * perform the superfluous readl() after each command submission.
52185 */
52186 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52187- access = SA5_performant_access_no_read;
52188+ access = &SA5_performant_access_no_read;
52189
52190 /* Controller spec: zero out this buffer. */
52191 for (i = 0; i < h->nreply_queues; i++)
52192@@ -7270,12 +7270,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52193 * enable outbound interrupt coalescing in accelerator mode;
52194 */
52195 if (trans_support & CFGTBL_Trans_io_accel1) {
52196- access = SA5_ioaccel_mode1_access;
52197+ access = &SA5_ioaccel_mode1_access;
52198 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52199 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52200 } else {
52201 if (trans_support & CFGTBL_Trans_io_accel2) {
52202- access = SA5_ioaccel_mode2_access;
52203+ access = &SA5_ioaccel_mode2_access;
52204 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52205 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52206 }
52207diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52208index 6577130..955f9a4 100644
52209--- a/drivers/scsi/hpsa.h
52210+++ b/drivers/scsi/hpsa.h
52211@@ -143,7 +143,7 @@ struct ctlr_info {
52212 unsigned int msix_vector;
52213 unsigned int msi_vector;
52214 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52215- struct access_method access;
52216+ struct access_method *access;
52217 char hba_mode_enabled;
52218
52219 /* queue and queue Info */
52220@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52221 }
52222
52223 static struct access_method SA5_access = {
52224- SA5_submit_command,
52225- SA5_intr_mask,
52226- SA5_intr_pending,
52227- SA5_completed,
52228+ .submit_command = SA5_submit_command,
52229+ .set_intr_mask = SA5_intr_mask,
52230+ .intr_pending = SA5_intr_pending,
52231+ .command_completed = SA5_completed,
52232 };
52233
52234 static struct access_method SA5_ioaccel_mode1_access = {
52235- SA5_submit_command,
52236- SA5_performant_intr_mask,
52237- SA5_ioaccel_mode1_intr_pending,
52238- SA5_ioaccel_mode1_completed,
52239+ .submit_command = SA5_submit_command,
52240+ .set_intr_mask = SA5_performant_intr_mask,
52241+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52242+ .command_completed = SA5_ioaccel_mode1_completed,
52243 };
52244
52245 static struct access_method SA5_ioaccel_mode2_access = {
52246- SA5_submit_command_ioaccel2,
52247- SA5_performant_intr_mask,
52248- SA5_performant_intr_pending,
52249- SA5_performant_completed,
52250+ .submit_command = SA5_submit_command_ioaccel2,
52251+ .set_intr_mask = SA5_performant_intr_mask,
52252+ .intr_pending = SA5_performant_intr_pending,
52253+ .command_completed = SA5_performant_completed,
52254 };
52255
52256 static struct access_method SA5_performant_access = {
52257- SA5_submit_command,
52258- SA5_performant_intr_mask,
52259- SA5_performant_intr_pending,
52260- SA5_performant_completed,
52261+ .submit_command = SA5_submit_command,
52262+ .set_intr_mask = SA5_performant_intr_mask,
52263+ .intr_pending = SA5_performant_intr_pending,
52264+ .command_completed = SA5_performant_completed,
52265 };
52266
52267 static struct access_method SA5_performant_access_no_read = {
52268- SA5_submit_command_no_read,
52269- SA5_performant_intr_mask,
52270- SA5_performant_intr_pending,
52271- SA5_performant_completed,
52272+ .submit_command = SA5_submit_command_no_read,
52273+ .set_intr_mask = SA5_performant_intr_mask,
52274+ .intr_pending = SA5_performant_intr_pending,
52275+ .command_completed = SA5_performant_completed,
52276 };
52277
52278 struct board_type {
52279diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52280index 1b3a094..068e683 100644
52281--- a/drivers/scsi/libfc/fc_exch.c
52282+++ b/drivers/scsi/libfc/fc_exch.c
52283@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52284 u16 pool_max_index;
52285
52286 struct {
52287- atomic_t no_free_exch;
52288- atomic_t no_free_exch_xid;
52289- atomic_t xid_not_found;
52290- atomic_t xid_busy;
52291- atomic_t seq_not_found;
52292- atomic_t non_bls_resp;
52293+ atomic_unchecked_t no_free_exch;
52294+ atomic_unchecked_t no_free_exch_xid;
52295+ atomic_unchecked_t xid_not_found;
52296+ atomic_unchecked_t xid_busy;
52297+ atomic_unchecked_t seq_not_found;
52298+ atomic_unchecked_t non_bls_resp;
52299 } stats;
52300 };
52301
52302@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52303 /* allocate memory for exchange */
52304 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52305 if (!ep) {
52306- atomic_inc(&mp->stats.no_free_exch);
52307+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52308 goto out;
52309 }
52310 memset(ep, 0, sizeof(*ep));
52311@@ -874,7 +874,7 @@ out:
52312 return ep;
52313 err:
52314 spin_unlock_bh(&pool->lock);
52315- atomic_inc(&mp->stats.no_free_exch_xid);
52316+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52317 mempool_free(ep, mp->ep_pool);
52318 return NULL;
52319 }
52320@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52321 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52322 ep = fc_exch_find(mp, xid);
52323 if (!ep) {
52324- atomic_inc(&mp->stats.xid_not_found);
52325+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52326 reject = FC_RJT_OX_ID;
52327 goto out;
52328 }
52329@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52330 ep = fc_exch_find(mp, xid);
52331 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52332 if (ep) {
52333- atomic_inc(&mp->stats.xid_busy);
52334+ atomic_inc_unchecked(&mp->stats.xid_busy);
52335 reject = FC_RJT_RX_ID;
52336 goto rel;
52337 }
52338@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52339 }
52340 xid = ep->xid; /* get our XID */
52341 } else if (!ep) {
52342- atomic_inc(&mp->stats.xid_not_found);
52343+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52344 reject = FC_RJT_RX_ID; /* XID not found */
52345 goto out;
52346 }
52347@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52348 } else {
52349 sp = &ep->seq;
52350 if (sp->id != fh->fh_seq_id) {
52351- atomic_inc(&mp->stats.seq_not_found);
52352+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52353 if (f_ctl & FC_FC_END_SEQ) {
52354 /*
52355 * Update sequence_id based on incoming last
52356@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52357
52358 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52359 if (!ep) {
52360- atomic_inc(&mp->stats.xid_not_found);
52361+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52362 goto out;
52363 }
52364 if (ep->esb_stat & ESB_ST_COMPLETE) {
52365- atomic_inc(&mp->stats.xid_not_found);
52366+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52367 goto rel;
52368 }
52369 if (ep->rxid == FC_XID_UNKNOWN)
52370 ep->rxid = ntohs(fh->fh_rx_id);
52371 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52372- atomic_inc(&mp->stats.xid_not_found);
52373+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52374 goto rel;
52375 }
52376 if (ep->did != ntoh24(fh->fh_s_id) &&
52377 ep->did != FC_FID_FLOGI) {
52378- atomic_inc(&mp->stats.xid_not_found);
52379+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52380 goto rel;
52381 }
52382 sof = fr_sof(fp);
52383@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52384 sp->ssb_stat |= SSB_ST_RESP;
52385 sp->id = fh->fh_seq_id;
52386 } else if (sp->id != fh->fh_seq_id) {
52387- atomic_inc(&mp->stats.seq_not_found);
52388+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52389 goto rel;
52390 }
52391
52392@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52393 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52394
52395 if (!sp)
52396- atomic_inc(&mp->stats.xid_not_found);
52397+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52398 else
52399- atomic_inc(&mp->stats.non_bls_resp);
52400+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52401
52402 fc_frame_free(fp);
52403 }
52404@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52405
52406 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52407 mp = ema->mp;
52408- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52409+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52410 st->fc_no_free_exch_xid +=
52411- atomic_read(&mp->stats.no_free_exch_xid);
52412- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52413- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52414- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52415- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52416+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52417+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52418+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52419+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52420+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52421 }
52422 }
52423 EXPORT_SYMBOL(fc_exch_update_stats);
52424diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52425index 9c706d8..d3e3ed2 100644
52426--- a/drivers/scsi/libsas/sas_ata.c
52427+++ b/drivers/scsi/libsas/sas_ata.c
52428@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52429 .postreset = ata_std_postreset,
52430 .error_handler = ata_std_error_handler,
52431 .post_internal_cmd = sas_ata_post_internal,
52432- .qc_defer = ata_std_qc_defer,
52433+ .qc_defer = ata_std_qc_defer,
52434 .qc_prep = ata_noop_qc_prep,
52435 .qc_issue = sas_ata_qc_issue,
52436 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52437diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52438index 9b81a34..a9b7b8c 100644
52439--- a/drivers/scsi/lpfc/lpfc.h
52440+++ b/drivers/scsi/lpfc/lpfc.h
52441@@ -433,7 +433,7 @@ struct lpfc_vport {
52442 struct dentry *debug_nodelist;
52443 struct dentry *vport_debugfs_root;
52444 struct lpfc_debugfs_trc *disc_trc;
52445- atomic_t disc_trc_cnt;
52446+ atomic_unchecked_t disc_trc_cnt;
52447 #endif
52448 uint8_t stat_data_enabled;
52449 uint8_t stat_data_blocked;
52450@@ -883,8 +883,8 @@ struct lpfc_hba {
52451 struct timer_list fabric_block_timer;
52452 unsigned long bit_flags;
52453 #define FABRIC_COMANDS_BLOCKED 0
52454- atomic_t num_rsrc_err;
52455- atomic_t num_cmd_success;
52456+ atomic_unchecked_t num_rsrc_err;
52457+ atomic_unchecked_t num_cmd_success;
52458 unsigned long last_rsrc_error_time;
52459 unsigned long last_ramp_down_time;
52460 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52461@@ -919,7 +919,7 @@ struct lpfc_hba {
52462
52463 struct dentry *debug_slow_ring_trc;
52464 struct lpfc_debugfs_trc *slow_ring_trc;
52465- atomic_t slow_ring_trc_cnt;
52466+ atomic_unchecked_t slow_ring_trc_cnt;
52467 /* iDiag debugfs sub-directory */
52468 struct dentry *idiag_root;
52469 struct dentry *idiag_pci_cfg;
52470diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52471index 513edcb..805c6a8 100644
52472--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52473+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52474@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52475
52476 #include <linux/debugfs.h>
52477
52478-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52479+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52480 static unsigned long lpfc_debugfs_start_time = 0L;
52481
52482 /* iDiag */
52483@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52484 lpfc_debugfs_enable = 0;
52485
52486 len = 0;
52487- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52488+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52489 (lpfc_debugfs_max_disc_trc - 1);
52490 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52491 dtp = vport->disc_trc + i;
52492@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52493 lpfc_debugfs_enable = 0;
52494
52495 len = 0;
52496- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52497+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52498 (lpfc_debugfs_max_slow_ring_trc - 1);
52499 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52500 dtp = phba->slow_ring_trc + i;
52501@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52502 !vport || !vport->disc_trc)
52503 return;
52504
52505- index = atomic_inc_return(&vport->disc_trc_cnt) &
52506+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52507 (lpfc_debugfs_max_disc_trc - 1);
52508 dtp = vport->disc_trc + index;
52509 dtp->fmt = fmt;
52510 dtp->data1 = data1;
52511 dtp->data2 = data2;
52512 dtp->data3 = data3;
52513- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52514+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52515 dtp->jif = jiffies;
52516 #endif
52517 return;
52518@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52519 !phba || !phba->slow_ring_trc)
52520 return;
52521
52522- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52523+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52524 (lpfc_debugfs_max_slow_ring_trc - 1);
52525 dtp = phba->slow_ring_trc + index;
52526 dtp->fmt = fmt;
52527 dtp->data1 = data1;
52528 dtp->data2 = data2;
52529 dtp->data3 = data3;
52530- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52531+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52532 dtp->jif = jiffies;
52533 #endif
52534 return;
52535@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52536 "slow_ring buffer\n");
52537 goto debug_failed;
52538 }
52539- atomic_set(&phba->slow_ring_trc_cnt, 0);
52540+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52541 memset(phba->slow_ring_trc, 0,
52542 (sizeof(struct lpfc_debugfs_trc) *
52543 lpfc_debugfs_max_slow_ring_trc));
52544@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52545 "buffer\n");
52546 goto debug_failed;
52547 }
52548- atomic_set(&vport->disc_trc_cnt, 0);
52549+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52550
52551 snprintf(name, sizeof(name), "discovery_trace");
52552 vport->debug_disc_trc =
52553diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52554index e8c8c1e..5f2e11c 100644
52555--- a/drivers/scsi/lpfc/lpfc_init.c
52556+++ b/drivers/scsi/lpfc/lpfc_init.c
52557@@ -11406,8 +11406,10 @@ lpfc_init(void)
52558 "misc_register returned with status %d", error);
52559
52560 if (lpfc_enable_npiv) {
52561- lpfc_transport_functions.vport_create = lpfc_vport_create;
52562- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52563+ pax_open_kernel();
52564+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52565+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52566+ pax_close_kernel();
52567 }
52568 lpfc_transport_template =
52569 fc_attach_transport(&lpfc_transport_functions);
52570diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52571index c140f99..11b2505 100644
52572--- a/drivers/scsi/lpfc/lpfc_scsi.c
52573+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52574@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52575 unsigned long expires;
52576
52577 spin_lock_irqsave(&phba->hbalock, flags);
52578- atomic_inc(&phba->num_rsrc_err);
52579+ atomic_inc_unchecked(&phba->num_rsrc_err);
52580 phba->last_rsrc_error_time = jiffies;
52581
52582 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52583@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52584 unsigned long num_rsrc_err, num_cmd_success;
52585 int i;
52586
52587- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52588- num_cmd_success = atomic_read(&phba->num_cmd_success);
52589+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52590+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52591
52592 /*
52593 * The error and success command counters are global per
52594@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52595 }
52596 }
52597 lpfc_destroy_vport_work_array(phba, vports);
52598- atomic_set(&phba->num_rsrc_err, 0);
52599- atomic_set(&phba->num_cmd_success, 0);
52600+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52601+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52602 }
52603
52604 /**
52605diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52606index 3f26147..ee8efd1 100644
52607--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52608+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52609@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52610 {
52611 struct scsi_device *sdev = to_scsi_device(dev);
52612 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52613- static struct _raid_device *raid_device;
52614+ struct _raid_device *raid_device;
52615 unsigned long flags;
52616 Mpi2RaidVolPage0_t vol_pg0;
52617 Mpi2ConfigReply_t mpi_reply;
52618@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52619 {
52620 struct scsi_device *sdev = to_scsi_device(dev);
52621 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52622- static struct _raid_device *raid_device;
52623+ struct _raid_device *raid_device;
52624 unsigned long flags;
52625 Mpi2RaidVolPage0_t vol_pg0;
52626 Mpi2ConfigReply_t mpi_reply;
52627@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52628 Mpi2EventDataIrOperationStatus_t *event_data =
52629 (Mpi2EventDataIrOperationStatus_t *)
52630 fw_event->event_data;
52631- static struct _raid_device *raid_device;
52632+ struct _raid_device *raid_device;
52633 unsigned long flags;
52634 u16 handle;
52635
52636@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52637 u64 sas_address;
52638 struct _sas_device *sas_device;
52639 struct _sas_node *expander_device;
52640- static struct _raid_device *raid_device;
52641+ struct _raid_device *raid_device;
52642 u8 retry_count;
52643 unsigned long flags;
52644
52645diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52646index ed31d8c..ab856b3 100644
52647--- a/drivers/scsi/pmcraid.c
52648+++ b/drivers/scsi/pmcraid.c
52649@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52650 res->scsi_dev = scsi_dev;
52651 scsi_dev->hostdata = res;
52652 res->change_detected = 0;
52653- atomic_set(&res->read_failures, 0);
52654- atomic_set(&res->write_failures, 0);
52655+ atomic_set_unchecked(&res->read_failures, 0);
52656+ atomic_set_unchecked(&res->write_failures, 0);
52657 rc = 0;
52658 }
52659 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52660@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52661
52662 /* If this was a SCSI read/write command keep count of errors */
52663 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52664- atomic_inc(&res->read_failures);
52665+ atomic_inc_unchecked(&res->read_failures);
52666 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52667- atomic_inc(&res->write_failures);
52668+ atomic_inc_unchecked(&res->write_failures);
52669
52670 if (!RES_IS_GSCSI(res->cfg_entry) &&
52671 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52672@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52673 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52674 * hrrq_id assigned here in queuecommand
52675 */
52676- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52677+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52678 pinstance->num_hrrq;
52679 cmd->cmd_done = pmcraid_io_done;
52680
52681@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52682 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52683 * hrrq_id assigned here in queuecommand
52684 */
52685- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52686+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52687 pinstance->num_hrrq;
52688
52689 if (request_size) {
52690@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52691
52692 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52693 /* add resources only after host is added into system */
52694- if (!atomic_read(&pinstance->expose_resources))
52695+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52696 return;
52697
52698 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52699@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52700 init_waitqueue_head(&pinstance->reset_wait_q);
52701
52702 atomic_set(&pinstance->outstanding_cmds, 0);
52703- atomic_set(&pinstance->last_message_id, 0);
52704- atomic_set(&pinstance->expose_resources, 0);
52705+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52706+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52707
52708 INIT_LIST_HEAD(&pinstance->free_res_q);
52709 INIT_LIST_HEAD(&pinstance->used_res_q);
52710@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52711 /* Schedule worker thread to handle CCN and take care of adding and
52712 * removing devices to OS
52713 */
52714- atomic_set(&pinstance->expose_resources, 1);
52715+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52716 schedule_work(&pinstance->worker_q);
52717 return rc;
52718
52719diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52720index e1d150f..6c6df44 100644
52721--- a/drivers/scsi/pmcraid.h
52722+++ b/drivers/scsi/pmcraid.h
52723@@ -748,7 +748,7 @@ struct pmcraid_instance {
52724 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52725
52726 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52727- atomic_t last_message_id;
52728+ atomic_unchecked_t last_message_id;
52729
52730 /* configuration table */
52731 struct pmcraid_config_table *cfg_table;
52732@@ -777,7 +777,7 @@ struct pmcraid_instance {
52733 atomic_t outstanding_cmds;
52734
52735 /* should add/delete resources to mid-layer now ?*/
52736- atomic_t expose_resources;
52737+ atomic_unchecked_t expose_resources;
52738
52739
52740
52741@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52742 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52743 };
52744 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52745- atomic_t read_failures; /* count of failed READ commands */
52746- atomic_t write_failures; /* count of failed WRITE commands */
52747+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52748+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52749
52750 /* To indicate add/delete/modify during CCN */
52751 u8 change_detected;
52752diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52753index 82b92c4..3178171 100644
52754--- a/drivers/scsi/qla2xxx/qla_attr.c
52755+++ b/drivers/scsi/qla2xxx/qla_attr.c
52756@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52757 return 0;
52758 }
52759
52760-struct fc_function_template qla2xxx_transport_functions = {
52761+fc_function_template_no_const qla2xxx_transport_functions = {
52762
52763 .show_host_node_name = 1,
52764 .show_host_port_name = 1,
52765@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52766 .bsg_timeout = qla24xx_bsg_timeout,
52767 };
52768
52769-struct fc_function_template qla2xxx_transport_vport_functions = {
52770+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52771
52772 .show_host_node_name = 1,
52773 .show_host_port_name = 1,
52774diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52775index 7686bfe..4710893 100644
52776--- a/drivers/scsi/qla2xxx/qla_gbl.h
52777+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52778@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52779 struct device_attribute;
52780 extern struct device_attribute *qla2x00_host_attrs[];
52781 struct fc_function_template;
52782-extern struct fc_function_template qla2xxx_transport_functions;
52783-extern struct fc_function_template qla2xxx_transport_vport_functions;
52784+extern fc_function_template_no_const qla2xxx_transport_functions;
52785+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52786 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52787 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52788 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52789diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52790index 7462dd7..5b64c24 100644
52791--- a/drivers/scsi/qla2xxx/qla_os.c
52792+++ b/drivers/scsi/qla2xxx/qla_os.c
52793@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52794 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52795 /* Ok, a 64bit DMA mask is applicable. */
52796 ha->flags.enable_64bit_addressing = 1;
52797- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52798- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52799+ pax_open_kernel();
52800+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52801+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52802+ pax_close_kernel();
52803 return;
52804 }
52805 }
52806diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52807index 8f6d0fb..1b21097 100644
52808--- a/drivers/scsi/qla4xxx/ql4_def.h
52809+++ b/drivers/scsi/qla4xxx/ql4_def.h
52810@@ -305,7 +305,7 @@ struct ddb_entry {
52811 * (4000 only) */
52812 atomic_t relogin_timer; /* Max Time to wait for
52813 * relogin to complete */
52814- atomic_t relogin_retry_count; /* Num of times relogin has been
52815+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52816 * retried */
52817 uint32_t default_time2wait; /* Default Min time between
52818 * relogins (+aens) */
52819diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52820index 6d25879..3031a9f 100644
52821--- a/drivers/scsi/qla4xxx/ql4_os.c
52822+++ b/drivers/scsi/qla4xxx/ql4_os.c
52823@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52824 */
52825 if (!iscsi_is_session_online(cls_sess)) {
52826 /* Reset retry relogin timer */
52827- atomic_inc(&ddb_entry->relogin_retry_count);
52828+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52829 DEBUG2(ql4_printk(KERN_INFO, ha,
52830 "%s: index[%d] relogin timed out-retrying"
52831 " relogin (%d), retry (%d)\n", __func__,
52832 ddb_entry->fw_ddb_index,
52833- atomic_read(&ddb_entry->relogin_retry_count),
52834+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52835 ddb_entry->default_time2wait + 4));
52836 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52837 atomic_set(&ddb_entry->retry_relogin_timer,
52838@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52839
52840 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52841 atomic_set(&ddb_entry->relogin_timer, 0);
52842- atomic_set(&ddb_entry->relogin_retry_count, 0);
52843+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52844 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52845 ddb_entry->default_relogin_timeout =
52846 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52847diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
52848index 3833bf5..95feaf1 100644
52849--- a/drivers/scsi/scsi.c
52850+++ b/drivers/scsi/scsi.c
52851@@ -637,7 +637,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
52852
52853 good_bytes = scsi_bufflen(cmd);
52854 if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
52855- int old_good_bytes = good_bytes;
52856+ unsigned int old_good_bytes = good_bytes;
52857 drv = scsi_cmd_to_driver(cmd);
52858 if (drv->done)
52859 good_bytes = drv->done(cmd);
52860diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
52861index 448ebda..9bd345f 100644
52862--- a/drivers/scsi/scsi_lib.c
52863+++ b/drivers/scsi/scsi_lib.c
52864@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
52865 shost = sdev->host;
52866 scsi_init_cmd_errh(cmd);
52867 cmd->result = DID_NO_CONNECT << 16;
52868- atomic_inc(&cmd->device->iorequest_cnt);
52869+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52870
52871 /*
52872 * SCSI request completion path will do scsi_device_unbusy(),
52873@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
52874
52875 INIT_LIST_HEAD(&cmd->eh_entry);
52876
52877- atomic_inc(&cmd->device->iodone_cnt);
52878+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
52879 if (cmd->result)
52880- atomic_inc(&cmd->device->ioerr_cnt);
52881+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
52882
52883 disposition = scsi_decide_disposition(cmd);
52884 if (disposition != SUCCESS &&
52885@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
52886 struct Scsi_Host *host = cmd->device->host;
52887 int rtn = 0;
52888
52889- atomic_inc(&cmd->device->iorequest_cnt);
52890+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52891
52892 /* check if the device is still usable */
52893 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
52894diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
52895index 9ad4116..4e736fc 100644
52896--- a/drivers/scsi/scsi_sysfs.c
52897+++ b/drivers/scsi/scsi_sysfs.c
52898@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
52899 char *buf) \
52900 { \
52901 struct scsi_device *sdev = to_scsi_device(dev); \
52902- unsigned long long count = atomic_read(&sdev->field); \
52903+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
52904 return snprintf(buf, 20, "0x%llx\n", count); \
52905 } \
52906 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
52907diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
52908index 24eaaf6..de30ec9 100644
52909--- a/drivers/scsi/scsi_transport_fc.c
52910+++ b/drivers/scsi/scsi_transport_fc.c
52911@@ -502,7 +502,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
52912 * Netlink Infrastructure
52913 */
52914
52915-static atomic_t fc_event_seq;
52916+static atomic_unchecked_t fc_event_seq;
52917
52918 /**
52919 * fc_get_event_number - Obtain the next sequential FC event number
52920@@ -515,7 +515,7 @@ static atomic_t fc_event_seq;
52921 u32
52922 fc_get_event_number(void)
52923 {
52924- return atomic_add_return(1, &fc_event_seq);
52925+ return atomic_add_return_unchecked(1, &fc_event_seq);
52926 }
52927 EXPORT_SYMBOL(fc_get_event_number);
52928
52929@@ -659,7 +659,7 @@ static __init int fc_transport_init(void)
52930 {
52931 int error;
52932
52933- atomic_set(&fc_event_seq, 0);
52934+ atomic_set_unchecked(&fc_event_seq, 0);
52935
52936 error = transport_class_register(&fc_host_class);
52937 if (error)
52938@@ -849,7 +849,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
52939 char *cp;
52940
52941 *val = simple_strtoul(buf, &cp, 0);
52942- if ((*cp && (*cp != '\n')) || (*val < 0))
52943+ if (*cp && (*cp != '\n'))
52944 return -EINVAL;
52945 /*
52946 * Check for overflow; dev_loss_tmo is u32
52947diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
52948index 67d43e3..8cee73c 100644
52949--- a/drivers/scsi/scsi_transport_iscsi.c
52950+++ b/drivers/scsi/scsi_transport_iscsi.c
52951@@ -79,7 +79,7 @@ struct iscsi_internal {
52952 struct transport_container session_cont;
52953 };
52954
52955-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
52956+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
52957 static struct workqueue_struct *iscsi_eh_timer_workq;
52958
52959 static DEFINE_IDA(iscsi_sess_ida);
52960@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
52961 int err;
52962
52963 ihost = shost->shost_data;
52964- session->sid = atomic_add_return(1, &iscsi_session_nr);
52965+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
52966
52967 if (target_id == ISCSI_MAX_TARGET) {
52968 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
52969@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
52970 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
52971 ISCSI_TRANSPORT_VERSION);
52972
52973- atomic_set(&iscsi_session_nr, 0);
52974+ atomic_set_unchecked(&iscsi_session_nr, 0);
52975
52976 err = class_register(&iscsi_transport_class);
52977 if (err)
52978diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
52979index f115f67..b80b2c1 100644
52980--- a/drivers/scsi/scsi_transport_srp.c
52981+++ b/drivers/scsi/scsi_transport_srp.c
52982@@ -35,7 +35,7 @@
52983 #include "scsi_priv.h"
52984
52985 struct srp_host_attrs {
52986- atomic_t next_port_id;
52987+ atomic_unchecked_t next_port_id;
52988 };
52989 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
52990
52991@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
52992 struct Scsi_Host *shost = dev_to_shost(dev);
52993 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
52994
52995- atomic_set(&srp_host->next_port_id, 0);
52996+ atomic_set_unchecked(&srp_host->next_port_id, 0);
52997 return 0;
52998 }
52999
53000@@ -744,7 +744,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
53001 rport_fast_io_fail_timedout);
53002 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
53003
53004- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
53005+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
53006 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
53007
53008 transport_setup_device(&rport->dev);
53009diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
53010index 7f9d65f..e856438 100644
53011--- a/drivers/scsi/sd.c
53012+++ b/drivers/scsi/sd.c
53013@@ -111,7 +111,7 @@ static int sd_resume(struct device *);
53014 static void sd_rescan(struct device *);
53015 static int sd_init_command(struct scsi_cmnd *SCpnt);
53016 static void sd_uninit_command(struct scsi_cmnd *SCpnt);
53017-static int sd_done(struct scsi_cmnd *);
53018+static unsigned int sd_done(struct scsi_cmnd *);
53019 static int sd_eh_action(struct scsi_cmnd *, int);
53020 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
53021 static void scsi_disk_release(struct device *cdev);
53022@@ -1646,7 +1646,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
53023 *
53024 * Note: potentially run from within an ISR. Must not block.
53025 **/
53026-static int sd_done(struct scsi_cmnd *SCpnt)
53027+static unsigned int sd_done(struct scsi_cmnd *SCpnt)
53028 {
53029 int result = SCpnt->result;
53030 unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
53031@@ -2973,7 +2973,7 @@ static int sd_probe(struct device *dev)
53032 sdkp->disk = gd;
53033 sdkp->index = index;
53034 atomic_set(&sdkp->openers, 0);
53035- atomic_set(&sdkp->device->ioerr_cnt, 0);
53036+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53037
53038 if (!sdp->request_queue->rq_timeout) {
53039 if (sdp->type != TYPE_MOD)
53040diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53041index 9d7b7db..33ecc51 100644
53042--- a/drivers/scsi/sg.c
53043+++ b/drivers/scsi/sg.c
53044@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53045 sdp->disk->disk_name,
53046 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53047 NULL,
53048- (char *)arg);
53049+ (char __user *)arg);
53050 case BLKTRACESTART:
53051 return blk_trace_startstop(sdp->device->request_queue, 1);
53052 case BLKTRACESTOP:
53053diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
53054index 8bd54a6..58fa0d6 100644
53055--- a/drivers/scsi/sr.c
53056+++ b/drivers/scsi/sr.c
53057@@ -80,7 +80,7 @@ static DEFINE_MUTEX(sr_mutex);
53058 static int sr_probe(struct device *);
53059 static int sr_remove(struct device *);
53060 static int sr_init_command(struct scsi_cmnd *SCpnt);
53061-static int sr_done(struct scsi_cmnd *);
53062+static unsigned int sr_done(struct scsi_cmnd *);
53063 static int sr_runtime_suspend(struct device *dev);
53064
53065 static struct dev_pm_ops sr_pm_ops = {
53066@@ -312,13 +312,13 @@ do_tur:
53067 * It will be notified on the end of a SCSI read / write, and will take one
53068 * of several actions based on success or failure.
53069 */
53070-static int sr_done(struct scsi_cmnd *SCpnt)
53071+static unsigned int sr_done(struct scsi_cmnd *SCpnt)
53072 {
53073 int result = SCpnt->result;
53074- int this_count = scsi_bufflen(SCpnt);
53075- int good_bytes = (result == 0 ? this_count : 0);
53076- int block_sectors = 0;
53077- long error_sector;
53078+ unsigned int this_count = scsi_bufflen(SCpnt);
53079+ unsigned int good_bytes = (result == 0 ? this_count : 0);
53080+ unsigned int block_sectors = 0;
53081+ sector_t error_sector;
53082 struct scsi_cd *cd = scsi_cd(SCpnt->request->rq_disk);
53083
53084 #ifdef DEBUG
53085@@ -351,9 +351,12 @@ static int sr_done(struct scsi_cmnd *SCpnt)
53086 if (cd->device->sector_size == 2048)
53087 error_sector <<= 2;
53088 error_sector &= ~(block_sectors - 1);
53089- good_bytes = (error_sector -
53090- blk_rq_pos(SCpnt->request)) << 9;
53091- if (good_bytes < 0 || good_bytes >= this_count)
53092+ if (error_sector >= blk_rq_pos(SCpnt->request)) {
53093+ good_bytes = (error_sector -
53094+ blk_rq_pos(SCpnt->request)) << 9;
53095+ if (good_bytes >= this_count)
53096+ good_bytes = 0;
53097+ } else
53098 good_bytes = 0;
53099 /*
53100 * The SCSI specification allows for the value
53101diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53102index c0d660f..24a5854 100644
53103--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53104+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53105@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53106 return i;
53107 }
53108
53109-static struct bin_attribute fuse_bin_attr = {
53110+static bin_attribute_no_const fuse_bin_attr = {
53111 .attr = { .name = "fuse", .mode = S_IRUGO, },
53112 .read = fuse_read,
53113 };
53114diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53115index d35c1a1..eda08dc 100644
53116--- a/drivers/spi/spi.c
53117+++ b/drivers/spi/spi.c
53118@@ -2206,7 +2206,7 @@ int spi_bus_unlock(struct spi_master *master)
53119 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53120
53121 /* portable code must never pass more than 32 bytes */
53122-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53123+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53124
53125 static u8 *buf;
53126
53127diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53128index b41429f..2de5373 100644
53129--- a/drivers/staging/android/timed_output.c
53130+++ b/drivers/staging/android/timed_output.c
53131@@ -25,7 +25,7 @@
53132 #include "timed_output.h"
53133
53134 static struct class *timed_output_class;
53135-static atomic_t device_count;
53136+static atomic_unchecked_t device_count;
53137
53138 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53139 char *buf)
53140@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53141 timed_output_class = class_create(THIS_MODULE, "timed_output");
53142 if (IS_ERR(timed_output_class))
53143 return PTR_ERR(timed_output_class);
53144- atomic_set(&device_count, 0);
53145+ atomic_set_unchecked(&device_count, 0);
53146 timed_output_class->dev_groups = timed_output_groups;
53147 }
53148
53149@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53150 if (ret < 0)
53151 return ret;
53152
53153- tdev->index = atomic_inc_return(&device_count);
53154+ tdev->index = atomic_inc_return_unchecked(&device_count);
53155 tdev->dev = device_create(timed_output_class, NULL,
53156 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53157 if (IS_ERR(tdev->dev))
53158diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53159index e78ddbe..ac437c0 100644
53160--- a/drivers/staging/comedi/comedi_fops.c
53161+++ b/drivers/staging/comedi/comedi_fops.c
53162@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53163 }
53164 cfp->last_attached = dev->attached;
53165 cfp->last_detach_count = dev->detach_count;
53166- ACCESS_ONCE(cfp->read_subdev) = read_s;
53167- ACCESS_ONCE(cfp->write_subdev) = write_s;
53168+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53169+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53170 }
53171
53172 static void comedi_file_check(struct file *file)
53173@@ -1951,7 +1951,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53174 !(s_old->async->cmd.flags & CMDF_WRITE))
53175 return -EBUSY;
53176
53177- ACCESS_ONCE(cfp->read_subdev) = s_new;
53178+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53179 return 0;
53180 }
53181
53182@@ -1993,7 +1993,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53183 (s_old->async->cmd.flags & CMDF_WRITE))
53184 return -EBUSY;
53185
53186- ACCESS_ONCE(cfp->write_subdev) = s_new;
53187+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53188 return 0;
53189 }
53190
53191diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53192index 53b748b..a5ae0b3 100644
53193--- a/drivers/staging/fbtft/fbtft-core.c
53194+++ b/drivers/staging/fbtft/fbtft-core.c
53195@@ -680,7 +680,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53196 {
53197 struct fb_info *info;
53198 struct fbtft_par *par;
53199- struct fb_ops *fbops = NULL;
53200+ fb_ops_no_const *fbops = NULL;
53201 struct fb_deferred_io *fbdefio = NULL;
53202 struct fbtft_platform_data *pdata = dev->platform_data;
53203 u8 *vmem = NULL;
53204diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53205index 9fd98cb..a9cf912 100644
53206--- a/drivers/staging/fbtft/fbtft.h
53207+++ b/drivers/staging/fbtft/fbtft.h
53208@@ -106,7 +106,7 @@ struct fbtft_ops {
53209
53210 int (*set_var)(struct fbtft_par *par);
53211 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53212-};
53213+} __no_const;
53214
53215 /**
53216 * struct fbtft_display - Describes the display properties
53217diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53218index 001348c..cfaac8a 100644
53219--- a/drivers/staging/gdm724x/gdm_tty.c
53220+++ b/drivers/staging/gdm724x/gdm_tty.c
53221@@ -44,7 +44,7 @@
53222 #define gdm_tty_send_control(n, r, v, d, l) (\
53223 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53224
53225-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53226+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53227
53228 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53229 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53230diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53231index d23c3c2..eb63c81 100644
53232--- a/drivers/staging/i2o/i2o.h
53233+++ b/drivers/staging/i2o/i2o.h
53234@@ -565,7 +565,7 @@ struct i2o_controller {
53235 struct i2o_device *exec; /* Executive */
53236 #if BITS_PER_LONG == 64
53237 spinlock_t context_list_lock; /* lock for context_list */
53238- atomic_t context_list_counter; /* needed for unique contexts */
53239+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53240 struct list_head context_list; /* list of context id's
53241 and pointers */
53242 #endif
53243diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53244index 780fee3..ca9dcae 100644
53245--- a/drivers/staging/i2o/i2o_proc.c
53246+++ b/drivers/staging/i2o/i2o_proc.c
53247@@ -253,12 +253,6 @@ static char *scsi_devices[] = {
53248 "Array Controller Device"
53249 };
53250
53251-static char *chtostr(char *tmp, u8 *chars, int n)
53252-{
53253- tmp[0] = 0;
53254- return strncat(tmp, (char *)chars, n);
53255-}
53256-
53257 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53258 char *group)
53259 {
53260@@ -711,9 +705,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53261 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53262 {
53263 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53264- static u32 work32[5];
53265- static u8 *work8 = (u8 *) work32;
53266- static u16 *work16 = (u16 *) work32;
53267+ u32 work32[5];
53268+ u8 *work8 = (u8 *) work32;
53269+ u16 *work16 = (u16 *) work32;
53270 int token;
53271 u32 hwcap;
53272
53273@@ -794,7 +788,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53274 } *result;
53275
53276 i2o_exec_execute_ddm_table ddm_table;
53277- char tmp[28 + 1];
53278
53279 result = kmalloc(sizeof(*result), GFP_KERNEL);
53280 if (!result)
53281@@ -829,8 +822,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53282
53283 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53284 seq_printf(seq, "%-#8x", ddm_table.module_id);
53285- seq_printf(seq, "%-29s",
53286- chtostr(tmp, ddm_table.module_name_version, 28));
53287+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53288 seq_printf(seq, "%9d ", ddm_table.data_size);
53289 seq_printf(seq, "%8d", ddm_table.code_size);
53290
53291@@ -897,7 +889,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53292
53293 i2o_driver_result_table *result;
53294 i2o_driver_store_table *dst;
53295- char tmp[28 + 1];
53296
53297 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53298 if (result == NULL)
53299@@ -932,9 +923,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53300
53301 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53302 seq_printf(seq, "%-#8x", dst->module_id);
53303- seq_printf(seq, "%-29s",
53304- chtostr(tmp, dst->module_name_version, 28));
53305- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53306+ seq_printf(seq, "%-.28s", dst->module_name_version);
53307+ seq_printf(seq, "%-.8s", dst->date);
53308 seq_printf(seq, "%8d ", dst->module_size);
53309 seq_printf(seq, "%8d ", dst->mpb_size);
53310 seq_printf(seq, "0x%04x", dst->module_flags);
53311@@ -1250,11 +1240,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53312 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53313 {
53314 struct i2o_device *d = (struct i2o_device *)seq->private;
53315- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53316+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53317 // == (allow) 512d bytes (max)
53318- static u16 *work16 = (u16 *) work32;
53319+ u16 *work16 = (u16 *) work32;
53320 int token;
53321- char tmp[16 + 1];
53322
53323 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53324
53325@@ -1266,14 +1255,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53326 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53327 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53328 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53329- seq_printf(seq, "Vendor info : %s\n",
53330- chtostr(tmp, (u8 *) (work32 + 2), 16));
53331- seq_printf(seq, "Product info : %s\n",
53332- chtostr(tmp, (u8 *) (work32 + 6), 16));
53333- seq_printf(seq, "Description : %s\n",
53334- chtostr(tmp, (u8 *) (work32 + 10), 16));
53335- seq_printf(seq, "Product rev. : %s\n",
53336- chtostr(tmp, (u8 *) (work32 + 14), 8));
53337+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53338+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53339+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53340+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53341
53342 seq_printf(seq, "Serial number : ");
53343 print_serial_number(seq, (u8 *) (work32 + 16),
53344@@ -1310,8 +1295,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53345 u8 pad[256]; // allow up to 256 byte (max) serial number
53346 } result;
53347
53348- char tmp[24 + 1];
53349-
53350 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53351
53352 if (token < 0) {
53353@@ -1320,10 +1303,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53354 }
53355
53356 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53357- seq_printf(seq, "Module name : %s\n",
53358- chtostr(tmp, result.module_name, 24));
53359- seq_printf(seq, "Module revision : %s\n",
53360- chtostr(tmp, result.module_rev, 8));
53361+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53362+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53363
53364 seq_printf(seq, "Serial number : ");
53365 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53366@@ -1347,8 +1328,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53367 u8 instance_number[4];
53368 } result;
53369
53370- char tmp[64 + 1];
53371-
53372 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53373
53374 if (token < 0) {
53375@@ -1356,14 +1335,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53376 return 0;
53377 }
53378
53379- seq_printf(seq, "Device name : %s\n",
53380- chtostr(tmp, result.device_name, 64));
53381- seq_printf(seq, "Service name : %s\n",
53382- chtostr(tmp, result.service_name, 64));
53383- seq_printf(seq, "Physical name : %s\n",
53384- chtostr(tmp, result.physical_location, 64));
53385- seq_printf(seq, "Instance number : %s\n",
53386- chtostr(tmp, result.instance_number, 4));
53387+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53388+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53389+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53390+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53391
53392 return 0;
53393 }
53394@@ -1372,9 +1347,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53395 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53396 {
53397 struct i2o_device *d = (struct i2o_device *)seq->private;
53398- static u32 work32[12];
53399- static u16 *work16 = (u16 *) work32;
53400- static u8 *work8 = (u8 *) work32;
53401+ u32 work32[12];
53402+ u16 *work16 = (u16 *) work32;
53403+ u8 *work8 = (u8 *) work32;
53404 int token;
53405
53406 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53407diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53408index 23bdbe4..4e1f340 100644
53409--- a/drivers/staging/i2o/iop.c
53410+++ b/drivers/staging/i2o/iop.c
53411@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53412
53413 spin_lock_irqsave(&c->context_list_lock, flags);
53414
53415- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53416- atomic_inc(&c->context_list_counter);
53417+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53418+ atomic_inc_unchecked(&c->context_list_counter);
53419
53420- entry->context = atomic_read(&c->context_list_counter);
53421+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53422
53423 list_add(&entry->list, &c->context_list);
53424
53425@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53426
53427 #if BITS_PER_LONG == 64
53428 spin_lock_init(&c->context_list_lock);
53429- atomic_set(&c->context_list_counter, 0);
53430+ atomic_set_unchecked(&c->context_list_counter, 0);
53431 INIT_LIST_HEAD(&c->context_list);
53432 #endif
53433
53434diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
53435index b892f2c..9b4898a 100644
53436--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
53437+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
53438@@ -118,7 +118,7 @@ static int lis3l02dq_get_buffer_element(struct iio_dev *indio_dev,
53439 int scan_count = bitmap_weight(indio_dev->active_scan_mask,
53440 indio_dev->masklength);
53441
53442- rx_array = kcalloc(4, scan_count, GFP_KERNEL);
53443+ rx_array = kcalloc(scan_count, 4, GFP_KERNEL);
53444 if (!rx_array)
53445 return -ENOMEM;
53446 ret = lis3l02dq_read_all(indio_dev, rx_array);
53447diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
53448index d98e229..9c59bc2 100644
53449--- a/drivers/staging/iio/adc/ad7280a.c
53450+++ b/drivers/staging/iio/adc/ad7280a.c
53451@@ -547,8 +547,8 @@ static int ad7280_attr_init(struct ad7280_state *st)
53452 {
53453 int dev, ch, cnt;
53454
53455- st->iio_attr = kcalloc(2, sizeof(*st->iio_attr) *
53456- (st->slave_num + 1) * AD7280A_CELLS_PER_DEV,
53457+ st->iio_attr = kcalloc(sizeof(*st->iio_attr) *
53458+ (st->slave_num + 1) * AD7280A_CELLS_PER_DEV, 2,
53459 GFP_KERNEL);
53460 if (st->iio_attr == NULL)
53461 return -ENOMEM;
53462diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53463index 658f458..0564216 100644
53464--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53465+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53466@@ -487,13 +487,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53467 return 0;
53468 }
53469
53470-sfw_test_client_ops_t brw_test_client;
53471-void brw_init_test_client(void)
53472-{
53473- brw_test_client.tso_init = brw_client_init;
53474- brw_test_client.tso_fini = brw_client_fini;
53475- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53476- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53477+sfw_test_client_ops_t brw_test_client = {
53478+ .tso_init = brw_client_init,
53479+ .tso_fini = brw_client_fini,
53480+ .tso_prep_rpc = brw_client_prep_rpc,
53481+ .tso_done_rpc = brw_client_done_rpc,
53482 };
53483
53484 srpc_service_t brw_test_service;
53485diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53486index a93a90d..c51dde6 100644
53487--- a/drivers/staging/lustre/lnet/selftest/framework.c
53488+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53489@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53490
53491 extern sfw_test_client_ops_t ping_test_client;
53492 extern srpc_service_t ping_test_service;
53493-extern void ping_init_test_client(void);
53494 extern void ping_init_test_service(void);
53495
53496 extern sfw_test_client_ops_t brw_test_client;
53497 extern srpc_service_t brw_test_service;
53498-extern void brw_init_test_client(void);
53499 extern void brw_init_test_service(void);
53500
53501
53502@@ -1675,12 +1673,10 @@ sfw_startup(void)
53503 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53504 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53505
53506- brw_init_test_client();
53507 brw_init_test_service();
53508 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53509 LASSERT(rc == 0);
53510
53511- ping_init_test_client();
53512 ping_init_test_service();
53513 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53514 LASSERT(rc == 0);
53515diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53516index 644069a..83cbd26 100644
53517--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53518+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53519@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53520 return 0;
53521 }
53522
53523-sfw_test_client_ops_t ping_test_client;
53524-void ping_init_test_client(void)
53525-{
53526- ping_test_client.tso_init = ping_client_init;
53527- ping_test_client.tso_fini = ping_client_fini;
53528- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53529- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53530-}
53531+sfw_test_client_ops_t ping_test_client = {
53532+ .tso_init = ping_client_init,
53533+ .tso_fini = ping_client_fini,
53534+ .tso_prep_rpc = ping_client_prep_rpc,
53535+ .tso_done_rpc = ping_client_done_rpc,
53536+};
53537
53538 srpc_service_t ping_test_service;
53539 void ping_init_test_service(void)
53540diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53541index bac9902..0225fe1 100644
53542--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53543+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53544@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53545 ldlm_completion_callback lcs_completion;
53546 ldlm_blocking_callback lcs_blocking;
53547 ldlm_glimpse_callback lcs_glimpse;
53548-};
53549+} __no_const;
53550
53551 /* ldlm_lockd.c */
53552 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53553diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53554index 2a88b80..62e7e5f 100644
53555--- a/drivers/staging/lustre/lustre/include/obd.h
53556+++ b/drivers/staging/lustre/lustre/include/obd.h
53557@@ -1362,7 +1362,7 @@ struct md_ops {
53558 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53559 * wrapper function in include/linux/obd_class.h.
53560 */
53561-};
53562+} __no_const;
53563
53564 struct lsm_operations {
53565 void (*lsm_free)(struct lov_stripe_md *);
53566diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53567index a4c252f..b21acac 100644
53568--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53569+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53570@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53571 int added = (mode == LCK_NL);
53572 int overlaps = 0;
53573 int splitted = 0;
53574- const struct ldlm_callback_suite null_cbs = { NULL };
53575+ const struct ldlm_callback_suite null_cbs = { };
53576
53577 CDEBUG(D_DLMTRACE,
53578 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53579diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53580index f0ee76a..1d01af9 100644
53581--- a/drivers/staging/lustre/lustre/libcfs/module.c
53582+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53583@@ -380,11 +380,11 @@ out:
53584
53585
53586 struct cfs_psdev_ops libcfs_psdev_ops = {
53587- libcfs_psdev_open,
53588- libcfs_psdev_release,
53589- NULL,
53590- NULL,
53591- libcfs_ioctl
53592+ .p_open = libcfs_psdev_open,
53593+ .p_close = libcfs_psdev_release,
53594+ .p_read = NULL,
53595+ .p_write = NULL,
53596+ .p_ioctl = libcfs_ioctl
53597 };
53598
53599 static int init_libcfs_module(void)
53600@@ -631,7 +631,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53601 loff_t *ppos)
53602 {
53603 int rc, max_delay_cs;
53604- struct ctl_table dummy = *table;
53605+ ctl_table_no_const dummy = *table;
53606 long d;
53607
53608 dummy.data = &max_delay_cs;
53609@@ -664,7 +664,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53610 loff_t *ppos)
53611 {
53612 int rc, min_delay_cs;
53613- struct ctl_table dummy = *table;
53614+ ctl_table_no_const dummy = *table;
53615 long d;
53616
53617 dummy.data = &min_delay_cs;
53618@@ -696,7 +696,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53619 void __user *buffer, size_t *lenp, loff_t *ppos)
53620 {
53621 int rc, backoff;
53622- struct ctl_table dummy = *table;
53623+ ctl_table_no_const dummy = *table;
53624
53625 dummy.data = &backoff;
53626 dummy.proc_handler = &proc_dointvec;
53627diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53628index 22667db..8b703b6 100644
53629--- a/drivers/staging/octeon/ethernet-rx.c
53630+++ b/drivers/staging/octeon/ethernet-rx.c
53631@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53632 /* Increment RX stats for virtual ports */
53633 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53634 #ifdef CONFIG_64BIT
53635- atomic64_add(1,
53636+ atomic64_add_unchecked(1,
53637 (atomic64_t *)&priv->stats.rx_packets);
53638- atomic64_add(skb->len,
53639+ atomic64_add_unchecked(skb->len,
53640 (atomic64_t *)&priv->stats.rx_bytes);
53641 #else
53642- atomic_add(1,
53643+ atomic_add_unchecked(1,
53644 (atomic_t *)&priv->stats.rx_packets);
53645- atomic_add(skb->len,
53646+ atomic_add_unchecked(skb->len,
53647 (atomic_t *)&priv->stats.rx_bytes);
53648 #endif
53649 }
53650@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53651 dev->name);
53652 */
53653 #ifdef CONFIG_64BIT
53654- atomic64_add(1,
53655+ atomic64_add_unchecked(1,
53656 (atomic64_t *)&priv->stats.rx_dropped);
53657 #else
53658- atomic_add(1,
53659+ atomic_add_unchecked(1,
53660 (atomic_t *)&priv->stats.rx_dropped);
53661 #endif
53662 dev_kfree_skb_irq(skb);
53663diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53664index fbbe866..2943243 100644
53665--- a/drivers/staging/octeon/ethernet.c
53666+++ b/drivers/staging/octeon/ethernet.c
53667@@ -251,11 +251,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53668 * since the RX tasklet also increments it.
53669 */
53670 #ifdef CONFIG_64BIT
53671- atomic64_add(rx_status.dropped_packets,
53672- (atomic64_t *)&priv->stats.rx_dropped);
53673+ atomic64_add_unchecked(rx_status.dropped_packets,
53674+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53675 #else
53676- atomic_add(rx_status.dropped_packets,
53677- (atomic_t *)&priv->stats.rx_dropped);
53678+ atomic_add_unchecked(rx_status.dropped_packets,
53679+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53680 #endif
53681 }
53682
53683diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53684index 3b476d8..f522d68 100644
53685--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53686+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53687@@ -225,7 +225,7 @@ struct hal_ops {
53688
53689 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53690 void (*hal_reset_security_engine)(struct adapter *adapter);
53691-};
53692+} __no_const;
53693
53694 enum rt_eeprom_type {
53695 EEPROM_93C46,
53696diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53697index 070cc03..6806e37 100644
53698--- a/drivers/staging/rtl8712/rtl871x_io.h
53699+++ b/drivers/staging/rtl8712/rtl871x_io.h
53700@@ -108,7 +108,7 @@ struct _io_ops {
53701 u8 *pmem);
53702 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53703 u8 *pmem);
53704-};
53705+} __no_const;
53706
53707 struct io_req {
53708 struct list_head list;
53709diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
53710index dbbb2f8..5232114 100644
53711--- a/drivers/staging/sm750fb/sm750.c
53712+++ b/drivers/staging/sm750fb/sm750.c
53713@@ -780,6 +780,7 @@ static struct fb_ops lynxfb_ops = {
53714 .fb_set_par = lynxfb_ops_set_par,
53715 .fb_setcolreg = lynxfb_ops_setcolreg,
53716 .fb_blank = lynxfb_ops_blank,
53717+ .fb_pan_display = lynxfb_ops_pan_display,
53718 .fb_fillrect = cfb_fillrect,
53719 .fb_imageblit = cfb_imageblit,
53720 .fb_copyarea = cfb_copyarea,
53721@@ -827,8 +828,10 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53722 par->index = index;
53723 output->channel = &crtc->channel;
53724 sm750fb_set_drv(par);
53725- lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
53726
53727+ pax_open_kernel();
53728+ *(void **)&lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
53729+ pax_close_kernel();
53730
53731 /* set current cursor variable and proc pointer,
53732 * must be set after crtc member initialized */
53733@@ -850,7 +853,9 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53734 crtc->cursor.share = share;
53735 memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
53736 if (!g_hwcursor) {
53737- lynxfb_ops.fb_cursor = NULL;
53738+ pax_open_kernel();
53739+ *(void **)&lynxfb_ops.fb_cursor = NULL;
53740+ pax_close_kernel();
53741 crtc->cursor.disable(&crtc->cursor);
53742 }
53743
53744@@ -858,9 +863,11 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53745 /* set info->fbops, must be set before fb_find_mode */
53746 if (!share->accel_off) {
53747 /* use 2d acceleration */
53748- lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
53749- lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
53750- lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
53751+ pax_open_kernel();
53752+ *(void **)&lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
53753+ *(void **)&lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
53754+ *(void **)&lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
53755+ pax_close_kernel();
53756 }
53757 info->fbops = &lynxfb_ops;
53758
53759diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53760index bd46df9..a0a5274 100644
53761--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53762+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53763@@ -170,7 +170,7 @@ struct visorchipset_busdev_notifiers {
53764 void (*device_resume)(ulong bus_no, ulong dev_no);
53765 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53766 ulong *max_size);
53767-};
53768+} __no_const;
53769
53770 /* These functions live inside visorchipset, and will be called to indicate
53771 * responses to specific events (by code outside of visorchipset).
53772@@ -185,7 +185,7 @@ struct visorchipset_busdev_responders {
53773 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53774 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53775 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53776-};
53777+} __no_const;
53778
53779 /** Register functions (in the bus driver) to get called by visorchipset
53780 * whenever a bus or device appears for which this service partition is
53781diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53782index 18b0f97..9c7716e 100644
53783--- a/drivers/target/sbp/sbp_target.c
53784+++ b/drivers/target/sbp/sbp_target.c
53785@@ -61,7 +61,7 @@ static const u32 sbp_unit_directory_template[] = {
53786
53787 #define SESSION_MAINTENANCE_INTERVAL HZ
53788
53789-static atomic_t login_id = ATOMIC_INIT(0);
53790+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53791
53792 static void session_maintenance_work(struct work_struct *);
53793 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
53794@@ -443,7 +443,7 @@ static void sbp_management_request_login(
53795 login->lun = se_lun;
53796 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
53797 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
53798- login->login_id = atomic_inc_return(&login_id);
53799+ login->login_id = atomic_inc_return_unchecked(&login_id);
53800
53801 login->tgt_agt = sbp_target_agent_register(login);
53802 if (IS_ERR(login->tgt_agt)) {
53803diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
53804index ce5f768..a4f884a 100644
53805--- a/drivers/target/target_core_device.c
53806+++ b/drivers/target/target_core_device.c
53807@@ -1496,7 +1496,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
53808 spin_lock_init(&dev->se_tmr_lock);
53809 spin_lock_init(&dev->qf_cmd_lock);
53810 sema_init(&dev->caw_sem, 1);
53811- atomic_set(&dev->dev_ordered_id, 0);
53812+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
53813 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
53814 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
53815 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
53816diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
53817index 675f2d9..1389429 100644
53818--- a/drivers/target/target_core_transport.c
53819+++ b/drivers/target/target_core_transport.c
53820@@ -1208,7 +1208,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
53821 * Used to determine when ORDERED commands should go from
53822 * Dormant to Active status.
53823 */
53824- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
53825+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
53826 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
53827 cmd->se_ordered_id, cmd->sam_task_attr,
53828 dev->transport->name);
53829diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
53830index 031018e..90981a1 100644
53831--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
53832+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
53833@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
53834 platform_set_drvdata(pdev, priv);
53835
53836 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
53837- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53838- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53839+ pax_open_kernel();
53840+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53841+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53842+ pax_close_kernel();
53843 }
53844 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
53845 priv, &int3400_thermal_ops,
53846diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
53847index 668fb1b..2737bbe 100644
53848--- a/drivers/thermal/of-thermal.c
53849+++ b/drivers/thermal/of-thermal.c
53850@@ -31,6 +31,7 @@
53851 #include <linux/export.h>
53852 #include <linux/string.h>
53853 #include <linux/thermal.h>
53854+#include <linux/mm.h>
53855
53856 #include "thermal_core.h"
53857
53858@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
53859 tz->ops = ops;
53860 tz->sensor_data = data;
53861
53862- tzd->ops->get_temp = of_thermal_get_temp;
53863- tzd->ops->get_trend = of_thermal_get_trend;
53864- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53865+ pax_open_kernel();
53866+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
53867+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
53868+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53869+ pax_close_kernel();
53870 mutex_unlock(&tzd->lock);
53871
53872 return tzd;
53873@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
53874 return;
53875
53876 mutex_lock(&tzd->lock);
53877- tzd->ops->get_temp = NULL;
53878- tzd->ops->get_trend = NULL;
53879- tzd->ops->set_emul_temp = NULL;
53880+ pax_open_kernel();
53881+ *(void **)&tzd->ops->get_temp = NULL;
53882+ *(void **)&tzd->ops->get_trend = NULL;
53883+ *(void **)&tzd->ops->set_emul_temp = NULL;
53884+ pax_close_kernel();
53885
53886 tz->ops = NULL;
53887 tz->sensor_data = NULL;
53888diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
53889index 9ea3d9d..53e8792 100644
53890--- a/drivers/thermal/x86_pkg_temp_thermal.c
53891+++ b/drivers/thermal/x86_pkg_temp_thermal.c
53892@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
53893 return NOTIFY_OK;
53894 }
53895
53896-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
53897+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
53898 .notifier_call = pkg_temp_thermal_cpu_callback,
53899 };
53900
53901diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
53902index fd66f57..48e6376 100644
53903--- a/drivers/tty/cyclades.c
53904+++ b/drivers/tty/cyclades.c
53905@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
53906 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
53907 info->port.count);
53908 #endif
53909- info->port.count++;
53910+ atomic_inc(&info->port.count);
53911 #ifdef CY_DEBUG_COUNT
53912 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
53913- current->pid, info->port.count);
53914+ current->pid, atomic_read(&info->port.count));
53915 #endif
53916
53917 /*
53918@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
53919 for (j = 0; j < cy_card[i].nports; j++) {
53920 info = &cy_card[i].ports[j];
53921
53922- if (info->port.count) {
53923+ if (atomic_read(&info->port.count)) {
53924 /* XXX is the ldisc num worth this? */
53925 struct tty_struct *tty;
53926 struct tty_ldisc *ld;
53927diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
53928index 4fcec1d..5a036f7 100644
53929--- a/drivers/tty/hvc/hvc_console.c
53930+++ b/drivers/tty/hvc/hvc_console.c
53931@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
53932
53933 spin_lock_irqsave(&hp->port.lock, flags);
53934 /* Check and then increment for fast path open. */
53935- if (hp->port.count++ > 0) {
53936+ if (atomic_inc_return(&hp->port.count) > 1) {
53937 spin_unlock_irqrestore(&hp->port.lock, flags);
53938 hvc_kick();
53939 return 0;
53940@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53941
53942 spin_lock_irqsave(&hp->port.lock, flags);
53943
53944- if (--hp->port.count == 0) {
53945+ if (atomic_dec_return(&hp->port.count) == 0) {
53946 spin_unlock_irqrestore(&hp->port.lock, flags);
53947 /* We are done with the tty pointer now. */
53948 tty_port_tty_set(&hp->port, NULL);
53949@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53950 */
53951 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
53952 } else {
53953- if (hp->port.count < 0)
53954+ if (atomic_read(&hp->port.count) < 0)
53955 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
53956- hp->vtermno, hp->port.count);
53957+ hp->vtermno, atomic_read(&hp->port.count));
53958 spin_unlock_irqrestore(&hp->port.lock, flags);
53959 }
53960 }
53961@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
53962 * open->hangup case this can be called after the final close so prevent
53963 * that from happening for now.
53964 */
53965- if (hp->port.count <= 0) {
53966+ if (atomic_read(&hp->port.count) <= 0) {
53967 spin_unlock_irqrestore(&hp->port.lock, flags);
53968 return;
53969 }
53970
53971- hp->port.count = 0;
53972+ atomic_set(&hp->port.count, 0);
53973 spin_unlock_irqrestore(&hp->port.lock, flags);
53974 tty_port_tty_set(&hp->port, NULL);
53975
53976@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
53977 return -EPIPE;
53978
53979 /* FIXME what's this (unprotected) check for? */
53980- if (hp->port.count <= 0)
53981+ if (atomic_read(&hp->port.count) <= 0)
53982 return -EIO;
53983
53984 spin_lock_irqsave(&hp->lock, flags);
53985diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
53986index 81ff7e1..dfb7b71 100644
53987--- a/drivers/tty/hvc/hvcs.c
53988+++ b/drivers/tty/hvc/hvcs.c
53989@@ -83,6 +83,7 @@
53990 #include <asm/hvcserver.h>
53991 #include <asm/uaccess.h>
53992 #include <asm/vio.h>
53993+#include <asm/local.h>
53994
53995 /*
53996 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
53997@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
53998
53999 spin_lock_irqsave(&hvcsd->lock, flags);
54000
54001- if (hvcsd->port.count > 0) {
54002+ if (atomic_read(&hvcsd->port.count) > 0) {
54003 spin_unlock_irqrestore(&hvcsd->lock, flags);
54004 printk(KERN_INFO "HVCS: vterm state unchanged. "
54005 "The hvcs device node is still in use.\n");
54006@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
54007 }
54008 }
54009
54010- hvcsd->port.count = 0;
54011+ atomic_set(&hvcsd->port.count, 0);
54012 hvcsd->port.tty = tty;
54013 tty->driver_data = hvcsd;
54014
54015@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
54016 unsigned long flags;
54017
54018 spin_lock_irqsave(&hvcsd->lock, flags);
54019- hvcsd->port.count++;
54020+ atomic_inc(&hvcsd->port.count);
54021 hvcsd->todo_mask |= HVCS_SCHED_READ;
54022 spin_unlock_irqrestore(&hvcsd->lock, flags);
54023
54024@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54025 hvcsd = tty->driver_data;
54026
54027 spin_lock_irqsave(&hvcsd->lock, flags);
54028- if (--hvcsd->port.count == 0) {
54029+ if (atomic_dec_and_test(&hvcsd->port.count)) {
54030
54031 vio_disable_interrupts(hvcsd->vdev);
54032
54033@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54034
54035 free_irq(irq, hvcsd);
54036 return;
54037- } else if (hvcsd->port.count < 0) {
54038+ } else if (atomic_read(&hvcsd->port.count) < 0) {
54039 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
54040 " is missmanaged.\n",
54041- hvcsd->vdev->unit_address, hvcsd->port.count);
54042+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
54043 }
54044
54045 spin_unlock_irqrestore(&hvcsd->lock, flags);
54046@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54047
54048 spin_lock_irqsave(&hvcsd->lock, flags);
54049 /* Preserve this so that we know how many kref refs to put */
54050- temp_open_count = hvcsd->port.count;
54051+ temp_open_count = atomic_read(&hvcsd->port.count);
54052
54053 /*
54054 * Don't kref put inside the spinlock because the destruction
54055@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54056 tty->driver_data = NULL;
54057 hvcsd->port.tty = NULL;
54058
54059- hvcsd->port.count = 0;
54060+ atomic_set(&hvcsd->port.count, 0);
54061
54062 /* This will drop any buffered data on the floor which is OK in a hangup
54063 * scenario. */
54064@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
54065 * the middle of a write operation? This is a crummy place to do this
54066 * but we want to keep it all in the spinlock.
54067 */
54068- if (hvcsd->port.count <= 0) {
54069+ if (atomic_read(&hvcsd->port.count) <= 0) {
54070 spin_unlock_irqrestore(&hvcsd->lock, flags);
54071 return -ENODEV;
54072 }
54073@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
54074 {
54075 struct hvcs_struct *hvcsd = tty->driver_data;
54076
54077- if (!hvcsd || hvcsd->port.count <= 0)
54078+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54079 return 0;
54080
54081 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54082diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54083index 4190199..06d5bfa 100644
54084--- a/drivers/tty/hvc/hvsi.c
54085+++ b/drivers/tty/hvc/hvsi.c
54086@@ -85,7 +85,7 @@ struct hvsi_struct {
54087 int n_outbuf;
54088 uint32_t vtermno;
54089 uint32_t virq;
54090- atomic_t seqno; /* HVSI packet sequence number */
54091+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54092 uint16_t mctrl;
54093 uint8_t state; /* HVSI protocol state */
54094 uint8_t flags;
54095@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54096
54097 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54098 packet.hdr.len = sizeof(struct hvsi_query_response);
54099- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54100+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54101 packet.verb = VSV_SEND_VERSION_NUMBER;
54102 packet.u.version = HVSI_VERSION;
54103 packet.query_seqno = query_seqno+1;
54104@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54105
54106 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54107 packet.hdr.len = sizeof(struct hvsi_query);
54108- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54109+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54110 packet.verb = verb;
54111
54112 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54113@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54114 int wrote;
54115
54116 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54117- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54118+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54119 packet.hdr.len = sizeof(struct hvsi_control);
54120 packet.verb = VSV_SET_MODEM_CTL;
54121 packet.mask = HVSI_TSDTR;
54122@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54123 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54124
54125 packet.hdr.type = VS_DATA_PACKET_HEADER;
54126- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54127+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54128 packet.hdr.len = count + sizeof(struct hvsi_header);
54129 memcpy(&packet.data, buf, count);
54130
54131@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54132 struct hvsi_control packet __ALIGNED__;
54133
54134 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54135- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54136+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54137 packet.hdr.len = 6;
54138 packet.verb = VSV_CLOSE_PROTOCOL;
54139
54140@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54141
54142 tty_port_tty_set(&hp->port, tty);
54143 spin_lock_irqsave(&hp->lock, flags);
54144- hp->port.count++;
54145+ atomic_inc(&hp->port.count);
54146 atomic_set(&hp->seqno, 0);
54147 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54148 spin_unlock_irqrestore(&hp->lock, flags);
54149@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54150
54151 spin_lock_irqsave(&hp->lock, flags);
54152
54153- if (--hp->port.count == 0) {
54154+ if (atomic_dec_return(&hp->port.count) == 0) {
54155 tty_port_tty_set(&hp->port, NULL);
54156 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54157
54158@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54159
54160 spin_lock_irqsave(&hp->lock, flags);
54161 }
54162- } else if (hp->port.count < 0)
54163+ } else if (atomic_read(&hp->port.count) < 0)
54164 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54165- hp - hvsi_ports, hp->port.count);
54166+ hp - hvsi_ports, atomic_read(&hp->port.count));
54167
54168 spin_unlock_irqrestore(&hp->lock, flags);
54169 }
54170@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54171 tty_port_tty_set(&hp->port, NULL);
54172
54173 spin_lock_irqsave(&hp->lock, flags);
54174- hp->port.count = 0;
54175+ atomic_set(&hp->port.count, 0);
54176 hp->n_outbuf = 0;
54177 spin_unlock_irqrestore(&hp->lock, flags);
54178 }
54179diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54180index a270f04..7c77b5d 100644
54181--- a/drivers/tty/hvc/hvsi_lib.c
54182+++ b/drivers/tty/hvc/hvsi_lib.c
54183@@ -8,7 +8,7 @@
54184
54185 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54186 {
54187- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54188+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54189
54190 /* Assumes that always succeeds, works in practice */
54191 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54192@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54193
54194 /* Reset state */
54195 pv->established = 0;
54196- atomic_set(&pv->seqno, 0);
54197+ atomic_set_unchecked(&pv->seqno, 0);
54198
54199 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54200
54201diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54202index 345cebb..d5a1e9e 100644
54203--- a/drivers/tty/ipwireless/tty.c
54204+++ b/drivers/tty/ipwireless/tty.c
54205@@ -28,6 +28,7 @@
54206 #include <linux/tty_driver.h>
54207 #include <linux/tty_flip.h>
54208 #include <linux/uaccess.h>
54209+#include <asm/local.h>
54210
54211 #include "tty.h"
54212 #include "network.h"
54213@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54214 return -ENODEV;
54215
54216 mutex_lock(&tty->ipw_tty_mutex);
54217- if (tty->port.count == 0)
54218+ if (atomic_read(&tty->port.count) == 0)
54219 tty->tx_bytes_queued = 0;
54220
54221- tty->port.count++;
54222+ atomic_inc(&tty->port.count);
54223
54224 tty->port.tty = linux_tty;
54225 linux_tty->driver_data = tty;
54226@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54227
54228 static void do_ipw_close(struct ipw_tty *tty)
54229 {
54230- tty->port.count--;
54231-
54232- if (tty->port.count == 0) {
54233+ if (atomic_dec_return(&tty->port.count) == 0) {
54234 struct tty_struct *linux_tty = tty->port.tty;
54235
54236 if (linux_tty != NULL) {
54237@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54238 return;
54239
54240 mutex_lock(&tty->ipw_tty_mutex);
54241- if (tty->port.count == 0) {
54242+ if (atomic_read(&tty->port.count) == 0) {
54243 mutex_unlock(&tty->ipw_tty_mutex);
54244 return;
54245 }
54246@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54247
54248 mutex_lock(&tty->ipw_tty_mutex);
54249
54250- if (!tty->port.count) {
54251+ if (!atomic_read(&tty->port.count)) {
54252 mutex_unlock(&tty->ipw_tty_mutex);
54253 return;
54254 }
54255@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54256 return -ENODEV;
54257
54258 mutex_lock(&tty->ipw_tty_mutex);
54259- if (!tty->port.count) {
54260+ if (!atomic_read(&tty->port.count)) {
54261 mutex_unlock(&tty->ipw_tty_mutex);
54262 return -EINVAL;
54263 }
54264@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54265 if (!tty)
54266 return -ENODEV;
54267
54268- if (!tty->port.count)
54269+ if (!atomic_read(&tty->port.count))
54270 return -EINVAL;
54271
54272 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54273@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54274 if (!tty)
54275 return 0;
54276
54277- if (!tty->port.count)
54278+ if (!atomic_read(&tty->port.count))
54279 return 0;
54280
54281 return tty->tx_bytes_queued;
54282@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54283 if (!tty)
54284 return -ENODEV;
54285
54286- if (!tty->port.count)
54287+ if (!atomic_read(&tty->port.count))
54288 return -EINVAL;
54289
54290 return get_control_lines(tty);
54291@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54292 if (!tty)
54293 return -ENODEV;
54294
54295- if (!tty->port.count)
54296+ if (!atomic_read(&tty->port.count))
54297 return -EINVAL;
54298
54299 return set_control_lines(tty, set, clear);
54300@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54301 if (!tty)
54302 return -ENODEV;
54303
54304- if (!tty->port.count)
54305+ if (!atomic_read(&tty->port.count))
54306 return -EINVAL;
54307
54308 /* FIXME: Exactly how is the tty object locked here .. */
54309@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54310 * are gone */
54311 mutex_lock(&ttyj->ipw_tty_mutex);
54312 }
54313- while (ttyj->port.count)
54314+ while (atomic_read(&ttyj->port.count))
54315 do_ipw_close(ttyj);
54316 ipwireless_disassociate_network_ttys(network,
54317 ttyj->channel_idx);
54318diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54319index 14c54e0..1efd4f2 100644
54320--- a/drivers/tty/moxa.c
54321+++ b/drivers/tty/moxa.c
54322@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54323 }
54324
54325 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54326- ch->port.count++;
54327+ atomic_inc(&ch->port.count);
54328 tty->driver_data = ch;
54329 tty_port_tty_set(&ch->port, tty);
54330 mutex_lock(&ch->port.mutex);
54331diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54332index 2c34c32..81d10e1 100644
54333--- a/drivers/tty/n_gsm.c
54334+++ b/drivers/tty/n_gsm.c
54335@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54336 spin_lock_init(&dlci->lock);
54337 mutex_init(&dlci->mutex);
54338 dlci->fifo = &dlci->_fifo;
54339- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54340+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54341 kfree(dlci);
54342 return NULL;
54343 }
54344@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54345 struct gsm_dlci *dlci = tty->driver_data;
54346 struct tty_port *port = &dlci->port;
54347
54348- port->count++;
54349+ atomic_inc(&port->count);
54350 tty_port_tty_set(port, tty);
54351
54352 dlci->modem_rx = 0;
54353diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54354index 16ed0b6..7d944b4 100644
54355--- a/drivers/tty/n_tty.c
54356+++ b/drivers/tty/n_tty.c
54357@@ -116,7 +116,7 @@ struct n_tty_data {
54358 int minimum_to_wake;
54359
54360 /* consumer-published */
54361- size_t read_tail;
54362+ size_t read_tail __intentional_overflow(-1);
54363 size_t line_start;
54364
54365 /* protected by output lock */
54366@@ -2582,6 +2582,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54367 {
54368 *ops = tty_ldisc_N_TTY;
54369 ops->owner = NULL;
54370- ops->refcount = ops->flags = 0;
54371+ atomic_set(&ops->refcount, 0);
54372+ ops->flags = 0;
54373 }
54374 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54375diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54376index 4d5e840..a2340a6 100644
54377--- a/drivers/tty/pty.c
54378+++ b/drivers/tty/pty.c
54379@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54380 panic("Couldn't register Unix98 pts driver");
54381
54382 /* Now create the /dev/ptmx special device */
54383+ pax_open_kernel();
54384 tty_default_fops(&ptmx_fops);
54385- ptmx_fops.open = ptmx_open;
54386+ *(void **)&ptmx_fops.open = ptmx_open;
54387+ pax_close_kernel();
54388
54389 cdev_init(&ptmx_cdev, &ptmx_fops);
54390 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54391diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54392index c8dd8dc..dca6cfd 100644
54393--- a/drivers/tty/rocket.c
54394+++ b/drivers/tty/rocket.c
54395@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54396 tty->driver_data = info;
54397 tty_port_tty_set(port, tty);
54398
54399- if (port->count++ == 0) {
54400+ if (atomic_inc_return(&port->count) == 1) {
54401 atomic_inc(&rp_num_ports_open);
54402
54403 #ifdef ROCKET_DEBUG_OPEN
54404@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54405 #endif
54406 }
54407 #ifdef ROCKET_DEBUG_OPEN
54408- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54409+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54410 #endif
54411
54412 /*
54413@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54414 spin_unlock_irqrestore(&info->port.lock, flags);
54415 return;
54416 }
54417- if (info->port.count)
54418+ if (atomic_read(&info->port.count))
54419 atomic_dec(&rp_num_ports_open);
54420 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54421 spin_unlock_irqrestore(&info->port.lock, flags);
54422diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
54423index 4506e40..ac0b470 100644
54424--- a/drivers/tty/serial/8250/8250_core.c
54425+++ b/drivers/tty/serial/8250/8250_core.c
54426@@ -3241,9 +3241,9 @@ static void univ8250_release_port(struct uart_port *port)
54427
54428 static void univ8250_rsa_support(struct uart_ops *ops)
54429 {
54430- ops->config_port = univ8250_config_port;
54431- ops->request_port = univ8250_request_port;
54432- ops->release_port = univ8250_release_port;
54433+ *(void **)&ops->config_port = univ8250_config_port;
54434+ *(void **)&ops->request_port = univ8250_request_port;
54435+ *(void **)&ops->release_port = univ8250_release_port;
54436 }
54437
54438 #else
54439@@ -3286,8 +3286,10 @@ static void __init serial8250_isa_init_ports(void)
54440 }
54441
54442 /* chain base port ops to support Remote Supervisor Adapter */
54443- univ8250_port_ops = *base_ops;
54444+ pax_open_kernel();
54445+ memcpy((void *)&univ8250_port_ops, base_ops, sizeof univ8250_port_ops);
54446 univ8250_rsa_support(&univ8250_port_ops);
54447+ pax_close_kernel();
54448
54449 if (share_irqs)
54450 irqflag = IRQF_SHARED;
54451diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54452index aa28209..e08fb85 100644
54453--- a/drivers/tty/serial/ioc4_serial.c
54454+++ b/drivers/tty/serial/ioc4_serial.c
54455@@ -437,7 +437,7 @@ struct ioc4_soft {
54456 } is_intr_info[MAX_IOC4_INTR_ENTS];
54457
54458 /* Number of entries active in the above array */
54459- atomic_t is_num_intrs;
54460+ atomic_unchecked_t is_num_intrs;
54461 } is_intr_type[IOC4_NUM_INTR_TYPES];
54462
54463 /* is_ir_lock must be held while
54464@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54465 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54466 || (type == IOC4_OTHER_INTR_TYPE)));
54467
54468- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54469+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54470 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54471
54472 /* Save off the lower level interrupt handler */
54473@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54474
54475 soft = arg;
54476 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54477- num_intrs = (int)atomic_read(
54478+ num_intrs = (int)atomic_read_unchecked(
54479 &soft->is_intr_type[intr_type].is_num_intrs);
54480
54481 this_mir = this_ir = pending_intrs(soft, intr_type);
54482diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54483index 129dc5b..1da5bb8 100644
54484--- a/drivers/tty/serial/kgdb_nmi.c
54485+++ b/drivers/tty/serial/kgdb_nmi.c
54486@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54487 * I/O utilities that messages sent to the console will automatically
54488 * be displayed on the dbg_io.
54489 */
54490- dbg_io_ops->is_console = true;
54491+ pax_open_kernel();
54492+ *(int *)&dbg_io_ops->is_console = true;
54493+ pax_close_kernel();
54494
54495 return 0;
54496 }
54497diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54498index a260cde..6b2b5ce 100644
54499--- a/drivers/tty/serial/kgdboc.c
54500+++ b/drivers/tty/serial/kgdboc.c
54501@@ -24,8 +24,9 @@
54502 #define MAX_CONFIG_LEN 40
54503
54504 static struct kgdb_io kgdboc_io_ops;
54505+static struct kgdb_io kgdboc_io_ops_console;
54506
54507-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54508+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54509 static int configured = -1;
54510
54511 static char config[MAX_CONFIG_LEN];
54512@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54513 kgdboc_unregister_kbd();
54514 if (configured == 1)
54515 kgdb_unregister_io_module(&kgdboc_io_ops);
54516+ else if (configured == 2)
54517+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54518 }
54519
54520 static int configure_kgdboc(void)
54521@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54522 int err;
54523 char *cptr = config;
54524 struct console *cons;
54525+ int is_console = 0;
54526
54527 err = kgdboc_option_setup(config);
54528 if (err || !strlen(config) || isspace(config[0]))
54529 goto noconfig;
54530
54531 err = -ENODEV;
54532- kgdboc_io_ops.is_console = 0;
54533 kgdb_tty_driver = NULL;
54534
54535 kgdboc_use_kms = 0;
54536@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54537 int idx;
54538 if (cons->device && cons->device(cons, &idx) == p &&
54539 idx == tty_line) {
54540- kgdboc_io_ops.is_console = 1;
54541+ is_console = 1;
54542 break;
54543 }
54544 cons = cons->next;
54545@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54546 kgdb_tty_line = tty_line;
54547
54548 do_register:
54549- err = kgdb_register_io_module(&kgdboc_io_ops);
54550+ if (is_console) {
54551+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54552+ configured = 2;
54553+ } else {
54554+ err = kgdb_register_io_module(&kgdboc_io_ops);
54555+ configured = 1;
54556+ }
54557 if (err)
54558 goto noconfig;
54559
54560@@ -205,8 +214,6 @@ do_register:
54561 if (err)
54562 goto nmi_con_failed;
54563
54564- configured = 1;
54565-
54566 return 0;
54567
54568 nmi_con_failed:
54569@@ -223,7 +230,7 @@ noconfig:
54570 static int __init init_kgdboc(void)
54571 {
54572 /* Already configured? */
54573- if (configured == 1)
54574+ if (configured >= 1)
54575 return 0;
54576
54577 return configure_kgdboc();
54578@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54579 if (config[len - 1] == '\n')
54580 config[len - 1] = '\0';
54581
54582- if (configured == 1)
54583+ if (configured >= 1)
54584 cleanup_kgdboc();
54585
54586 /* Go and configure with the new params. */
54587@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54588 .post_exception = kgdboc_post_exp_handler,
54589 };
54590
54591+static struct kgdb_io kgdboc_io_ops_console = {
54592+ .name = "kgdboc",
54593+ .read_char = kgdboc_get_char,
54594+ .write_char = kgdboc_put_char,
54595+ .pre_exception = kgdboc_pre_exp_handler,
54596+ .post_exception = kgdboc_post_exp_handler,
54597+ .is_console = 1
54598+};
54599+
54600 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54601 /* This is only available if kgdboc is a built in for early debugging */
54602 static int __init kgdboc_early_init(char *opt)
54603diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54604index b73889c..9f74f0a 100644
54605--- a/drivers/tty/serial/msm_serial.c
54606+++ b/drivers/tty/serial/msm_serial.c
54607@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54608 .cons = MSM_CONSOLE,
54609 };
54610
54611-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54612+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54613
54614 static const struct of_device_id msm_uartdm_table[] = {
54615 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54616@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54617 line = pdev->id;
54618
54619 if (line < 0)
54620- line = atomic_inc_return(&msm_uart_next_id) - 1;
54621+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54622
54623 if (unlikely(line < 0 || line >= UART_NR))
54624 return -ENXIO;
54625diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54626index a0ae942..befa48d 100644
54627--- a/drivers/tty/serial/samsung.c
54628+++ b/drivers/tty/serial/samsung.c
54629@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54630 ourport->tx_in_progress = 0;
54631 }
54632
54633+static int s3c64xx_serial_startup(struct uart_port *port);
54634 static int s3c24xx_serial_startup(struct uart_port *port)
54635 {
54636 struct s3c24xx_uart_port *ourport = to_ourport(port);
54637 int ret;
54638
54639+ /* Startup sequence is different for s3c64xx and higher SoC's */
54640+ if (s3c24xx_serial_has_interrupt_mask(port))
54641+ return s3c64xx_serial_startup(port);
54642+
54643 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54644 port, (unsigned long long)port->mapbase, port->membase);
54645
54646@@ -1698,10 +1703,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54647 /* setup info for port */
54648 port->dev = &platdev->dev;
54649
54650- /* Startup sequence is different for s3c64xx and higher SoC's */
54651- if (s3c24xx_serial_has_interrupt_mask(port))
54652- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54653-
54654 port->uartclk = 1;
54655
54656 if (cfg->uart_flags & UPF_CONS_FLOW) {
54657diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54658index ec54044..fc93d3f 100644
54659--- a/drivers/tty/serial/serial_core.c
54660+++ b/drivers/tty/serial/serial_core.c
54661@@ -1376,7 +1376,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54662 state = drv->state + tty->index;
54663 port = &state->port;
54664 spin_lock_irq(&port->lock);
54665- --port->count;
54666+ atomic_dec(&port->count);
54667 spin_unlock_irq(&port->lock);
54668 return;
54669 }
54670@@ -1386,7 +1386,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54671
54672 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54673
54674- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54675+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54676 return;
54677
54678 /*
54679@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
54680 uart_flush_buffer(tty);
54681 uart_shutdown(tty, state);
54682 spin_lock_irqsave(&port->lock, flags);
54683- port->count = 0;
54684+ atomic_set(&port->count, 0);
54685 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54686 spin_unlock_irqrestore(&port->lock, flags);
54687 tty_port_tty_set(port, NULL);
54688@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54689 pr_debug("uart_open(%d) called\n", line);
54690
54691 spin_lock_irq(&port->lock);
54692- ++port->count;
54693+ atomic_inc(&port->count);
54694 spin_unlock_irq(&port->lock);
54695
54696 /*
54697diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
54698index b1c6bd3..5f038e2 100644
54699--- a/drivers/tty/serial/uartlite.c
54700+++ b/drivers/tty/serial/uartlite.c
54701@@ -341,13 +341,13 @@ static int ulite_request_port(struct uart_port *port)
54702 return -EBUSY;
54703 }
54704
54705- port->private_data = &uartlite_be;
54706+ port->private_data = (void *)&uartlite_be;
54707 ret = uart_in32(ULITE_CONTROL, port);
54708 uart_out32(ULITE_CONTROL_RST_TX, ULITE_CONTROL, port);
54709 ret = uart_in32(ULITE_STATUS, port);
54710 /* Endianess detection */
54711 if ((ret & ULITE_STATUS_TXEMPTY) != ULITE_STATUS_TXEMPTY)
54712- port->private_data = &uartlite_le;
54713+ port->private_data = (void *)&uartlite_le;
54714
54715 return 0;
54716 }
54717diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54718index b799170..87dafd5 100644
54719--- a/drivers/tty/synclink.c
54720+++ b/drivers/tty/synclink.c
54721@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54722
54723 if (debug_level >= DEBUG_LEVEL_INFO)
54724 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54725- __FILE__,__LINE__, info->device_name, info->port.count);
54726+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54727
54728 if (tty_port_close_start(&info->port, tty, filp) == 0)
54729 goto cleanup;
54730@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54731 cleanup:
54732 if (debug_level >= DEBUG_LEVEL_INFO)
54733 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54734- tty->driver->name, info->port.count);
54735+ tty->driver->name, atomic_read(&info->port.count));
54736
54737 } /* end of mgsl_close() */
54738
54739@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54740
54741 mgsl_flush_buffer(tty);
54742 shutdown(info);
54743-
54744- info->port.count = 0;
54745+
54746+ atomic_set(&info->port.count, 0);
54747 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54748 info->port.tty = NULL;
54749
54750@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54751
54752 if (debug_level >= DEBUG_LEVEL_INFO)
54753 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54754- __FILE__,__LINE__, tty->driver->name, port->count );
54755+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54756
54757 spin_lock_irqsave(&info->irq_spinlock, flags);
54758- port->count--;
54759+ atomic_dec(&port->count);
54760 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54761 port->blocked_open++;
54762
54763@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54764
54765 if (debug_level >= DEBUG_LEVEL_INFO)
54766 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54767- __FILE__,__LINE__, tty->driver->name, port->count );
54768+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54769
54770 tty_unlock(tty);
54771 schedule();
54772@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54773
54774 /* FIXME: Racy on hangup during close wait */
54775 if (!tty_hung_up_p(filp))
54776- port->count++;
54777+ atomic_inc(&port->count);
54778 port->blocked_open--;
54779
54780 if (debug_level >= DEBUG_LEVEL_INFO)
54781 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54782- __FILE__,__LINE__, tty->driver->name, port->count );
54783+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54784
54785 if (!retval)
54786 port->flags |= ASYNC_NORMAL_ACTIVE;
54787@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54788
54789 if (debug_level >= DEBUG_LEVEL_INFO)
54790 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54791- __FILE__,__LINE__,tty->driver->name, info->port.count);
54792+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54793
54794 /* If port is closing, signal caller to try again */
54795 if (info->port.flags & ASYNC_CLOSING){
54796@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54797 spin_unlock_irqrestore(&info->netlock, flags);
54798 goto cleanup;
54799 }
54800- info->port.count++;
54801+ atomic_inc(&info->port.count);
54802 spin_unlock_irqrestore(&info->netlock, flags);
54803
54804- if (info->port.count == 1) {
54805+ if (atomic_read(&info->port.count) == 1) {
54806 /* 1st open on this device, init hardware */
54807 retval = startup(info);
54808 if (retval < 0)
54809@@ -3442,8 +3442,8 @@ cleanup:
54810 if (retval) {
54811 if (tty->count == 1)
54812 info->port.tty = NULL; /* tty layer will release tty struct */
54813- if(info->port.count)
54814- info->port.count--;
54815+ if (atomic_read(&info->port.count))
54816+ atomic_dec(&info->port.count);
54817 }
54818
54819 return retval;
54820@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54821 unsigned short new_crctype;
54822
54823 /* return error if TTY interface open */
54824- if (info->port.count)
54825+ if (atomic_read(&info->port.count))
54826 return -EBUSY;
54827
54828 switch (encoding)
54829@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
54830
54831 /* arbitrate between network and tty opens */
54832 spin_lock_irqsave(&info->netlock, flags);
54833- if (info->port.count != 0 || info->netcount != 0) {
54834+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54835 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54836 spin_unlock_irqrestore(&info->netlock, flags);
54837 return -EBUSY;
54838@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54839 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54840
54841 /* return error if TTY interface open */
54842- if (info->port.count)
54843+ if (atomic_read(&info->port.count))
54844 return -EBUSY;
54845
54846 if (cmd != SIOCWANDEV)
54847diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
54848index 0e8c39b..e0cb171 100644
54849--- a/drivers/tty/synclink_gt.c
54850+++ b/drivers/tty/synclink_gt.c
54851@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54852 tty->driver_data = info;
54853 info->port.tty = tty;
54854
54855- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
54856+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
54857
54858 /* If port is closing, signal caller to try again */
54859 if (info->port.flags & ASYNC_CLOSING){
54860@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54861 mutex_unlock(&info->port.mutex);
54862 goto cleanup;
54863 }
54864- info->port.count++;
54865+ atomic_inc(&info->port.count);
54866 spin_unlock_irqrestore(&info->netlock, flags);
54867
54868- if (info->port.count == 1) {
54869+ if (atomic_read(&info->port.count) == 1) {
54870 /* 1st open on this device, init hardware */
54871 retval = startup(info);
54872 if (retval < 0) {
54873@@ -715,8 +715,8 @@ cleanup:
54874 if (retval) {
54875 if (tty->count == 1)
54876 info->port.tty = NULL; /* tty layer will release tty struct */
54877- if(info->port.count)
54878- info->port.count--;
54879+ if(atomic_read(&info->port.count))
54880+ atomic_dec(&info->port.count);
54881 }
54882
54883 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
54884@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54885
54886 if (sanity_check(info, tty->name, "close"))
54887 return;
54888- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
54889+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
54890
54891 if (tty_port_close_start(&info->port, tty, filp) == 0)
54892 goto cleanup;
54893@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54894 tty_port_close_end(&info->port, tty);
54895 info->port.tty = NULL;
54896 cleanup:
54897- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
54898+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
54899 }
54900
54901 static void hangup(struct tty_struct *tty)
54902@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
54903 shutdown(info);
54904
54905 spin_lock_irqsave(&info->port.lock, flags);
54906- info->port.count = 0;
54907+ atomic_set(&info->port.count, 0);
54908 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54909 info->port.tty = NULL;
54910 spin_unlock_irqrestore(&info->port.lock, flags);
54911@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54912 unsigned short new_crctype;
54913
54914 /* return error if TTY interface open */
54915- if (info->port.count)
54916+ if (atomic_read(&info->port.count))
54917 return -EBUSY;
54918
54919 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
54920@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
54921
54922 /* arbitrate between network and tty opens */
54923 spin_lock_irqsave(&info->netlock, flags);
54924- if (info->port.count != 0 || info->netcount != 0) {
54925+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54926 DBGINFO(("%s hdlc_open busy\n", dev->name));
54927 spin_unlock_irqrestore(&info->netlock, flags);
54928 return -EBUSY;
54929@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54930 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
54931
54932 /* return error if TTY interface open */
54933- if (info->port.count)
54934+ if (atomic_read(&info->port.count))
54935 return -EBUSY;
54936
54937 if (cmd != SIOCWANDEV)
54938@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
54939 if (port == NULL)
54940 continue;
54941 spin_lock(&port->lock);
54942- if ((port->port.count || port->netcount) &&
54943+ if ((atomic_read(&port->port.count) || port->netcount) &&
54944 port->pending_bh && !port->bh_running &&
54945 !port->bh_requested) {
54946 DBGISR(("%s bh queued\n", port->device_name));
54947@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54948 add_wait_queue(&port->open_wait, &wait);
54949
54950 spin_lock_irqsave(&info->lock, flags);
54951- port->count--;
54952+ atomic_dec(&port->count);
54953 spin_unlock_irqrestore(&info->lock, flags);
54954 port->blocked_open++;
54955
54956@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54957 remove_wait_queue(&port->open_wait, &wait);
54958
54959 if (!tty_hung_up_p(filp))
54960- port->count++;
54961+ atomic_inc(&port->count);
54962 port->blocked_open--;
54963
54964 if (!retval)
54965diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
54966index c3f9091..abe4601 100644
54967--- a/drivers/tty/synclinkmp.c
54968+++ b/drivers/tty/synclinkmp.c
54969@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54970
54971 if (debug_level >= DEBUG_LEVEL_INFO)
54972 printk("%s(%d):%s open(), old ref count = %d\n",
54973- __FILE__,__LINE__,tty->driver->name, info->port.count);
54974+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54975
54976 /* If port is closing, signal caller to try again */
54977 if (info->port.flags & ASYNC_CLOSING){
54978@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54979 spin_unlock_irqrestore(&info->netlock, flags);
54980 goto cleanup;
54981 }
54982- info->port.count++;
54983+ atomic_inc(&info->port.count);
54984 spin_unlock_irqrestore(&info->netlock, flags);
54985
54986- if (info->port.count == 1) {
54987+ if (atomic_read(&info->port.count) == 1) {
54988 /* 1st open on this device, init hardware */
54989 retval = startup(info);
54990 if (retval < 0)
54991@@ -796,8 +796,8 @@ cleanup:
54992 if (retval) {
54993 if (tty->count == 1)
54994 info->port.tty = NULL; /* tty layer will release tty struct */
54995- if(info->port.count)
54996- info->port.count--;
54997+ if(atomic_read(&info->port.count))
54998+ atomic_dec(&info->port.count);
54999 }
55000
55001 return retval;
55002@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55003
55004 if (debug_level >= DEBUG_LEVEL_INFO)
55005 printk("%s(%d):%s close() entry, count=%d\n",
55006- __FILE__,__LINE__, info->device_name, info->port.count);
55007+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
55008
55009 if (tty_port_close_start(&info->port, tty, filp) == 0)
55010 goto cleanup;
55011@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55012 cleanup:
55013 if (debug_level >= DEBUG_LEVEL_INFO)
55014 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
55015- tty->driver->name, info->port.count);
55016+ tty->driver->name, atomic_read(&info->port.count));
55017 }
55018
55019 /* Called by tty_hangup() when a hangup is signaled.
55020@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
55021 shutdown(info);
55022
55023 spin_lock_irqsave(&info->port.lock, flags);
55024- info->port.count = 0;
55025+ atomic_set(&info->port.count, 0);
55026 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55027 info->port.tty = NULL;
55028 spin_unlock_irqrestore(&info->port.lock, flags);
55029@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55030 unsigned short new_crctype;
55031
55032 /* return error if TTY interface open */
55033- if (info->port.count)
55034+ if (atomic_read(&info->port.count))
55035 return -EBUSY;
55036
55037 switch (encoding)
55038@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
55039
55040 /* arbitrate between network and tty opens */
55041 spin_lock_irqsave(&info->netlock, flags);
55042- if (info->port.count != 0 || info->netcount != 0) {
55043+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55044 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55045 spin_unlock_irqrestore(&info->netlock, flags);
55046 return -EBUSY;
55047@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55048 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55049
55050 /* return error if TTY interface open */
55051- if (info->port.count)
55052+ if (atomic_read(&info->port.count))
55053 return -EBUSY;
55054
55055 if (cmd != SIOCWANDEV)
55056@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
55057 * do not request bottom half processing if the
55058 * device is not open in a normal mode.
55059 */
55060- if ( port && (port->port.count || port->netcount) &&
55061+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
55062 port->pending_bh && !port->bh_running &&
55063 !port->bh_requested ) {
55064 if ( debug_level >= DEBUG_LEVEL_ISR )
55065@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55066
55067 if (debug_level >= DEBUG_LEVEL_INFO)
55068 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
55069- __FILE__,__LINE__, tty->driver->name, port->count );
55070+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55071
55072 spin_lock_irqsave(&info->lock, flags);
55073- port->count--;
55074+ atomic_dec(&port->count);
55075 spin_unlock_irqrestore(&info->lock, flags);
55076 port->blocked_open++;
55077
55078@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55079
55080 if (debug_level >= DEBUG_LEVEL_INFO)
55081 printk("%s(%d):%s block_til_ready() count=%d\n",
55082- __FILE__,__LINE__, tty->driver->name, port->count );
55083+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55084
55085 tty_unlock(tty);
55086 schedule();
55087@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55088 set_current_state(TASK_RUNNING);
55089 remove_wait_queue(&port->open_wait, &wait);
55090 if (!tty_hung_up_p(filp))
55091- port->count++;
55092+ atomic_inc(&port->count);
55093 port->blocked_open--;
55094
55095 if (debug_level >= DEBUG_LEVEL_INFO)
55096 printk("%s(%d):%s block_til_ready() after, count=%d\n",
55097- __FILE__,__LINE__, tty->driver->name, port->count );
55098+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55099
55100 if (!retval)
55101 port->flags |= ASYNC_NORMAL_ACTIVE;
55102diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
55103index 9ffdfcf..fd81170 100644
55104--- a/drivers/tty/sysrq.c
55105+++ b/drivers/tty/sysrq.c
55106@@ -1069,7 +1069,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
55107 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
55108 size_t count, loff_t *ppos)
55109 {
55110- if (count) {
55111+ if (count && capable(CAP_SYS_ADMIN)) {
55112 char c;
55113
55114 if (get_user(c, buf))
55115diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
55116index e569546..fbce20c 100644
55117--- a/drivers/tty/tty_io.c
55118+++ b/drivers/tty/tty_io.c
55119@@ -3509,7 +3509,7 @@ EXPORT_SYMBOL(tty_devnum);
55120
55121 void tty_default_fops(struct file_operations *fops)
55122 {
55123- *fops = tty_fops;
55124+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
55125 }
55126
55127 /*
55128diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55129index 3737f55..7cef448 100644
55130--- a/drivers/tty/tty_ldisc.c
55131+++ b/drivers/tty/tty_ldisc.c
55132@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55133 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55134 tty_ldiscs[disc] = new_ldisc;
55135 new_ldisc->num = disc;
55136- new_ldisc->refcount = 0;
55137+ atomic_set(&new_ldisc->refcount, 0);
55138 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55139
55140 return ret;
55141@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55142 return -EINVAL;
55143
55144 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55145- if (tty_ldiscs[disc]->refcount)
55146+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55147 ret = -EBUSY;
55148 else
55149 tty_ldiscs[disc] = NULL;
55150@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55151 if (ldops) {
55152 ret = ERR_PTR(-EAGAIN);
55153 if (try_module_get(ldops->owner)) {
55154- ldops->refcount++;
55155+ atomic_inc(&ldops->refcount);
55156 ret = ldops;
55157 }
55158 }
55159@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55160 unsigned long flags;
55161
55162 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55163- ldops->refcount--;
55164+ atomic_dec(&ldops->refcount);
55165 module_put(ldops->owner);
55166 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55167 }
55168diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55169index 40b31835..94d92ae 100644
55170--- a/drivers/tty/tty_port.c
55171+++ b/drivers/tty/tty_port.c
55172@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55173 unsigned long flags;
55174
55175 spin_lock_irqsave(&port->lock, flags);
55176- port->count = 0;
55177+ atomic_set(&port->count, 0);
55178 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55179 tty = port->tty;
55180 if (tty)
55181@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55182
55183 /* The port lock protects the port counts */
55184 spin_lock_irqsave(&port->lock, flags);
55185- port->count--;
55186+ atomic_dec(&port->count);
55187 port->blocked_open++;
55188 spin_unlock_irqrestore(&port->lock, flags);
55189
55190@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55191 we must not mess that up further */
55192 spin_lock_irqsave(&port->lock, flags);
55193 if (!tty_hung_up_p(filp))
55194- port->count++;
55195+ atomic_inc(&port->count);
55196 port->blocked_open--;
55197 if (retval == 0)
55198 port->flags |= ASYNC_NORMAL_ACTIVE;
55199@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55200 return 0;
55201
55202 spin_lock_irqsave(&port->lock, flags);
55203- if (tty->count == 1 && port->count != 1) {
55204+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55205 printk(KERN_WARNING
55206 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55207- port->count);
55208- port->count = 1;
55209+ atomic_read(&port->count));
55210+ atomic_set(&port->count, 1);
55211 }
55212- if (--port->count < 0) {
55213+ if (atomic_dec_return(&port->count) < 0) {
55214 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55215- port->count);
55216- port->count = 0;
55217+ atomic_read(&port->count));
55218+ atomic_set(&port->count, 0);
55219 }
55220
55221- if (port->count) {
55222+ if (atomic_read(&port->count)) {
55223 spin_unlock_irqrestore(&port->lock, flags);
55224 return 0;
55225 }
55226@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55227 struct file *filp)
55228 {
55229 spin_lock_irq(&port->lock);
55230- ++port->count;
55231+ atomic_inc(&port->count);
55232 spin_unlock_irq(&port->lock);
55233 tty_port_tty_set(port, tty);
55234
55235diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55236index 8a89f6e..50b32af 100644
55237--- a/drivers/tty/vt/keyboard.c
55238+++ b/drivers/tty/vt/keyboard.c
55239@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55240 kbd->kbdmode == VC_OFF) &&
55241 value != KVAL(K_SAK))
55242 return; /* SAK is allowed even in raw mode */
55243+
55244+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55245+ {
55246+ void *func = fn_handler[value];
55247+ if (func == fn_show_state || func == fn_show_ptregs ||
55248+ func == fn_show_mem)
55249+ return;
55250+ }
55251+#endif
55252+
55253 fn_handler[value](vc);
55254 }
55255
55256@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55257 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55258 return -EFAULT;
55259
55260- if (!capable(CAP_SYS_TTY_CONFIG))
55261- perm = 0;
55262-
55263 switch (cmd) {
55264 case KDGKBENT:
55265 /* Ensure another thread doesn't free it under us */
55266@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55267 spin_unlock_irqrestore(&kbd_event_lock, flags);
55268 return put_user(val, &user_kbe->kb_value);
55269 case KDSKBENT:
55270+ if (!capable(CAP_SYS_TTY_CONFIG))
55271+ perm = 0;
55272+
55273 if (!perm)
55274 return -EPERM;
55275 if (!i && v == K_NOSUCHMAP) {
55276@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55277 int i, j, k;
55278 int ret;
55279
55280- if (!capable(CAP_SYS_TTY_CONFIG))
55281- perm = 0;
55282-
55283 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55284 if (!kbs) {
55285 ret = -ENOMEM;
55286@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55287 kfree(kbs);
55288 return ((p && *p) ? -EOVERFLOW : 0);
55289 case KDSKBSENT:
55290+ if (!capable(CAP_SYS_TTY_CONFIG))
55291+ perm = 0;
55292+
55293 if (!perm) {
55294 ret = -EPERM;
55295 goto reterr;
55296diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55297index 65bf067..b3b2e13 100644
55298--- a/drivers/uio/uio.c
55299+++ b/drivers/uio/uio.c
55300@@ -25,6 +25,7 @@
55301 #include <linux/kobject.h>
55302 #include <linux/cdev.h>
55303 #include <linux/uio_driver.h>
55304+#include <asm/local.h>
55305
55306 #define UIO_MAX_DEVICES (1U << MINORBITS)
55307
55308@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55309 struct device_attribute *attr, char *buf)
55310 {
55311 struct uio_device *idev = dev_get_drvdata(dev);
55312- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55313+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55314 }
55315 static DEVICE_ATTR_RO(event);
55316
55317@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55318 {
55319 struct uio_device *idev = info->uio_dev;
55320
55321- atomic_inc(&idev->event);
55322+ atomic_inc_unchecked(&idev->event);
55323 wake_up_interruptible(&idev->wait);
55324 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55325 }
55326@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55327 }
55328
55329 listener->dev = idev;
55330- listener->event_count = atomic_read(&idev->event);
55331+ listener->event_count = atomic_read_unchecked(&idev->event);
55332 filep->private_data = listener;
55333
55334 if (idev->info->open) {
55335@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55336 return -EIO;
55337
55338 poll_wait(filep, &idev->wait, wait);
55339- if (listener->event_count != atomic_read(&idev->event))
55340+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55341 return POLLIN | POLLRDNORM;
55342 return 0;
55343 }
55344@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55345 do {
55346 set_current_state(TASK_INTERRUPTIBLE);
55347
55348- event_count = atomic_read(&idev->event);
55349+ event_count = atomic_read_unchecked(&idev->event);
55350 if (event_count != listener->event_count) {
55351 if (copy_to_user(buf, &event_count, count))
55352 retval = -EFAULT;
55353@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55354 static int uio_find_mem_index(struct vm_area_struct *vma)
55355 {
55356 struct uio_device *idev = vma->vm_private_data;
55357+ unsigned long size;
55358
55359 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55360- if (idev->info->mem[vma->vm_pgoff].size == 0)
55361+ size = idev->info->mem[vma->vm_pgoff].size;
55362+ if (size == 0)
55363+ return -1;
55364+ if (vma->vm_end - vma->vm_start > size)
55365 return -1;
55366 return (int)vma->vm_pgoff;
55367 }
55368@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55369 idev->owner = owner;
55370 idev->info = info;
55371 init_waitqueue_head(&idev->wait);
55372- atomic_set(&idev->event, 0);
55373+ atomic_set_unchecked(&idev->event, 0);
55374
55375 ret = uio_get_minor(idev);
55376 if (ret)
55377diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55378index 813d4d3..a71934f 100644
55379--- a/drivers/usb/atm/cxacru.c
55380+++ b/drivers/usb/atm/cxacru.c
55381@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55382 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55383 if (ret < 2)
55384 return -EINVAL;
55385- if (index < 0 || index > 0x7f)
55386+ if (index > 0x7f)
55387 return -EINVAL;
55388 pos += tmp;
55389
55390diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55391index dada014..1d0d517 100644
55392--- a/drivers/usb/atm/usbatm.c
55393+++ b/drivers/usb/atm/usbatm.c
55394@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55395 if (printk_ratelimit())
55396 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55397 __func__, vpi, vci);
55398- atomic_inc(&vcc->stats->rx_err);
55399+ atomic_inc_unchecked(&vcc->stats->rx_err);
55400 return;
55401 }
55402
55403@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55404 if (length > ATM_MAX_AAL5_PDU) {
55405 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55406 __func__, length, vcc);
55407- atomic_inc(&vcc->stats->rx_err);
55408+ atomic_inc_unchecked(&vcc->stats->rx_err);
55409 goto out;
55410 }
55411
55412@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55413 if (sarb->len < pdu_length) {
55414 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55415 __func__, pdu_length, sarb->len, vcc);
55416- atomic_inc(&vcc->stats->rx_err);
55417+ atomic_inc_unchecked(&vcc->stats->rx_err);
55418 goto out;
55419 }
55420
55421 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55422 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55423 __func__, vcc);
55424- atomic_inc(&vcc->stats->rx_err);
55425+ atomic_inc_unchecked(&vcc->stats->rx_err);
55426 goto out;
55427 }
55428
55429@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55430 if (printk_ratelimit())
55431 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55432 __func__, length);
55433- atomic_inc(&vcc->stats->rx_drop);
55434+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55435 goto out;
55436 }
55437
55438@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55439
55440 vcc->push(vcc, skb);
55441
55442- atomic_inc(&vcc->stats->rx);
55443+ atomic_inc_unchecked(&vcc->stats->rx);
55444 out:
55445 skb_trim(sarb, 0);
55446 }
55447@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55448 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55449
55450 usbatm_pop(vcc, skb);
55451- atomic_inc(&vcc->stats->tx);
55452+ atomic_inc_unchecked(&vcc->stats->tx);
55453
55454 skb = skb_dequeue(&instance->sndqueue);
55455 }
55456@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55457 if (!left--)
55458 return sprintf(page,
55459 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55460- atomic_read(&atm_dev->stats.aal5.tx),
55461- atomic_read(&atm_dev->stats.aal5.tx_err),
55462- atomic_read(&atm_dev->stats.aal5.rx),
55463- atomic_read(&atm_dev->stats.aal5.rx_err),
55464- atomic_read(&atm_dev->stats.aal5.rx_drop));
55465+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55466+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55467+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55468+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55469+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55470
55471 if (!left--) {
55472 if (instance->disconnected)
55473diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55474index 2a3bbdf..91d72cf 100644
55475--- a/drivers/usb/core/devices.c
55476+++ b/drivers/usb/core/devices.c
55477@@ -126,7 +126,7 @@ static const char format_endpt[] =
55478 * time it gets called.
55479 */
55480 static struct device_connect_event {
55481- atomic_t count;
55482+ atomic_unchecked_t count;
55483 wait_queue_head_t wait;
55484 } device_event = {
55485 .count = ATOMIC_INIT(1),
55486@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55487
55488 void usbfs_conn_disc_event(void)
55489 {
55490- atomic_add(2, &device_event.count);
55491+ atomic_add_unchecked(2, &device_event.count);
55492 wake_up(&device_event.wait);
55493 }
55494
55495@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55496
55497 poll_wait(file, &device_event.wait, wait);
55498
55499- event_count = atomic_read(&device_event.count);
55500+ event_count = atomic_read_unchecked(&device_event.count);
55501 if (file->f_version != event_count) {
55502 file->f_version = event_count;
55503 return POLLIN | POLLRDNORM;
55504diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55505index 986abde..80e8279 100644
55506--- a/drivers/usb/core/devio.c
55507+++ b/drivers/usb/core/devio.c
55508@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55509 struct usb_dev_state *ps = file->private_data;
55510 struct usb_device *dev = ps->dev;
55511 ssize_t ret = 0;
55512- unsigned len;
55513+ size_t len;
55514 loff_t pos;
55515 int i;
55516
55517@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55518 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55519 struct usb_config_descriptor *config =
55520 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55521- unsigned int length = le16_to_cpu(config->wTotalLength);
55522+ size_t length = le16_to_cpu(config->wTotalLength);
55523
55524 if (*ppos < pos + length) {
55525
55526 /* The descriptor may claim to be longer than it
55527 * really is. Here is the actual allocated length. */
55528- unsigned alloclen =
55529+ size_t alloclen =
55530 le16_to_cpu(dev->config[i].desc.wTotalLength);
55531
55532- len = length - (*ppos - pos);
55533+ len = length + pos - *ppos;
55534 if (len > nbytes)
55535 len = nbytes;
55536
55537 /* Simply don't write (skip over) unallocated parts */
55538 if (alloclen > (*ppos - pos)) {
55539- alloclen -= (*ppos - pos);
55540+ alloclen = alloclen + pos - *ppos;
55541 if (copy_to_user(buf,
55542 dev->rawdescriptors[i] + (*ppos - pos),
55543 min(len, alloclen))) {
55544diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55545index 1c1385e..18400ff 100644
55546--- a/drivers/usb/core/hcd.c
55547+++ b/drivers/usb/core/hcd.c
55548@@ -1554,7 +1554,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55549 */
55550 usb_get_urb(urb);
55551 atomic_inc(&urb->use_count);
55552- atomic_inc(&urb->dev->urbnum);
55553+ atomic_inc_unchecked(&urb->dev->urbnum);
55554 usbmon_urb_submit(&hcd->self, urb);
55555
55556 /* NOTE requirements on root-hub callers (usbfs and the hub
55557@@ -1581,7 +1581,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55558 urb->hcpriv = NULL;
55559 INIT_LIST_HEAD(&urb->urb_list);
55560 atomic_dec(&urb->use_count);
55561- atomic_dec(&urb->dev->urbnum);
55562+ atomic_dec_unchecked(&urb->dev->urbnum);
55563 if (atomic_read(&urb->reject))
55564 wake_up(&usb_kill_urb_queue);
55565 usb_put_urb(urb);
55566diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55567index 1e9a8c9..b4248b7 100644
55568--- a/drivers/usb/core/hub.c
55569+++ b/drivers/usb/core/hub.c
55570@@ -26,6 +26,7 @@
55571 #include <linux/mutex.h>
55572 #include <linux/random.h>
55573 #include <linux/pm_qos.h>
55574+#include <linux/grsecurity.h>
55575
55576 #include <asm/uaccess.h>
55577 #include <asm/byteorder.h>
55578@@ -4649,6 +4650,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55579 goto done;
55580 return;
55581 }
55582+
55583+ if (gr_handle_new_usb())
55584+ goto done;
55585+
55586 if (hub_is_superspeed(hub->hdev))
55587 unit_load = 150;
55588 else
55589diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55590index f368d20..0c30ac5 100644
55591--- a/drivers/usb/core/message.c
55592+++ b/drivers/usb/core/message.c
55593@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55594 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55595 * error number.
55596 */
55597-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55598+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55599 __u8 requesttype, __u16 value, __u16 index, void *data,
55600 __u16 size, int timeout)
55601 {
55602@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55603 * If successful, 0. Otherwise a negative error number. The number of actual
55604 * bytes transferred will be stored in the @actual_length parameter.
55605 */
55606-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55607+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55608 void *data, int len, int *actual_length, int timeout)
55609 {
55610 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55611@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55612 * bytes transferred will be stored in the @actual_length parameter.
55613 *
55614 */
55615-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55616+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55617 void *data, int len, int *actual_length, int timeout)
55618 {
55619 struct urb *urb;
55620diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55621index d269738..7340cd7 100644
55622--- a/drivers/usb/core/sysfs.c
55623+++ b/drivers/usb/core/sysfs.c
55624@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55625 struct usb_device *udev;
55626
55627 udev = to_usb_device(dev);
55628- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55629+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55630 }
55631 static DEVICE_ATTR_RO(urbnum);
55632
55633diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55634index 8d5b2f4..3896940 100644
55635--- a/drivers/usb/core/usb.c
55636+++ b/drivers/usb/core/usb.c
55637@@ -447,7 +447,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55638 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55639 dev->state = USB_STATE_ATTACHED;
55640 dev->lpm_disable_count = 1;
55641- atomic_set(&dev->urbnum, 0);
55642+ atomic_set_unchecked(&dev->urbnum, 0);
55643
55644 INIT_LIST_HEAD(&dev->ep0.urb_list);
55645 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55646diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55647index 8cfc319..4868255 100644
55648--- a/drivers/usb/early/ehci-dbgp.c
55649+++ b/drivers/usb/early/ehci-dbgp.c
55650@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55651
55652 #ifdef CONFIG_KGDB
55653 static struct kgdb_io kgdbdbgp_io_ops;
55654-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55655+static struct kgdb_io kgdbdbgp_io_ops_console;
55656+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55657 #else
55658 #define dbgp_kgdb_mode (0)
55659 #endif
55660@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55661 .write_char = kgdbdbgp_write_char,
55662 };
55663
55664+static struct kgdb_io kgdbdbgp_io_ops_console = {
55665+ .name = "kgdbdbgp",
55666+ .read_char = kgdbdbgp_read_char,
55667+ .write_char = kgdbdbgp_write_char,
55668+ .is_console = 1
55669+};
55670+
55671 static int kgdbdbgp_wait_time;
55672
55673 static int __init kgdbdbgp_parse_config(char *str)
55674@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55675 ptr++;
55676 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55677 }
55678- kgdb_register_io_module(&kgdbdbgp_io_ops);
55679- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55680+ if (early_dbgp_console.index != -1)
55681+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55682+ else
55683+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55684
55685 return 0;
55686 }
55687diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
55688index 0495c94..289e201 100644
55689--- a/drivers/usb/gadget/configfs.c
55690+++ b/drivers/usb/gadget/configfs.c
55691@@ -571,7 +571,7 @@ static struct config_group *function_make(
55692 if (IS_ERR(fi))
55693 return ERR_CAST(fi);
55694
55695- ret = config_item_set_name(&fi->group.cg_item, name);
55696+ ret = config_item_set_name(&fi->group.cg_item, "%s", name);
55697 if (ret) {
55698 usb_put_function_instance(fi);
55699 return ERR_PTR(ret);
55700diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55701index 7856b33..8b7fe09 100644
55702--- a/drivers/usb/gadget/function/f_uac1.c
55703+++ b/drivers/usb/gadget/function/f_uac1.c
55704@@ -14,6 +14,7 @@
55705 #include <linux/module.h>
55706 #include <linux/device.h>
55707 #include <linux/atomic.h>
55708+#include <linux/module.h>
55709
55710 #include "u_uac1.h"
55711
55712diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55713index 7ee05793..2e31e99 100644
55714--- a/drivers/usb/gadget/function/u_serial.c
55715+++ b/drivers/usb/gadget/function/u_serial.c
55716@@ -732,9 +732,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55717 spin_lock_irq(&port->port_lock);
55718
55719 /* already open? Great. */
55720- if (port->port.count) {
55721+ if (atomic_read(&port->port.count)) {
55722 status = 0;
55723- port->port.count++;
55724+ atomic_inc(&port->port.count);
55725
55726 /* currently opening/closing? wait ... */
55727 } else if (port->openclose) {
55728@@ -793,7 +793,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55729 tty->driver_data = port;
55730 port->port.tty = tty;
55731
55732- port->port.count = 1;
55733+ atomic_set(&port->port.count, 1);
55734 port->openclose = false;
55735
55736 /* if connected, start the I/O stream */
55737@@ -835,11 +835,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55738
55739 spin_lock_irq(&port->port_lock);
55740
55741- if (port->port.count != 1) {
55742- if (port->port.count == 0)
55743+ if (atomic_read(&port->port.count) != 1) {
55744+ if (atomic_read(&port->port.count) == 0)
55745 WARN_ON(1);
55746 else
55747- --port->port.count;
55748+ atomic_dec(&port->port.count);
55749 goto exit;
55750 }
55751
55752@@ -849,7 +849,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55753 * and sleep if necessary
55754 */
55755 port->openclose = true;
55756- port->port.count = 0;
55757+ atomic_set(&port->port.count, 0);
55758
55759 gser = port->port_usb;
55760 if (gser && gser->disconnect)
55761@@ -1065,7 +1065,7 @@ static int gs_closed(struct gs_port *port)
55762 int cond;
55763
55764 spin_lock_irq(&port->port_lock);
55765- cond = (port->port.count == 0) && !port->openclose;
55766+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55767 spin_unlock_irq(&port->port_lock);
55768 return cond;
55769 }
55770@@ -1208,7 +1208,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55771 /* if it's already open, start I/O ... and notify the serial
55772 * protocol about open/close status (connect/disconnect).
55773 */
55774- if (port->port.count) {
55775+ if (atomic_read(&port->port.count)) {
55776 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55777 gs_start_io(port);
55778 if (gser->connect)
55779@@ -1255,7 +1255,7 @@ void gserial_disconnect(struct gserial *gser)
55780
55781 port->port_usb = NULL;
55782 gser->ioport = NULL;
55783- if (port->port.count > 0 || port->openclose) {
55784+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55785 wake_up_interruptible(&port->drain_wait);
55786 if (port->port.tty)
55787 tty_hangup(port->port.tty);
55788@@ -1271,7 +1271,7 @@ void gserial_disconnect(struct gserial *gser)
55789
55790 /* finally, free any unused/unusable I/O buffers */
55791 spin_lock_irqsave(&port->port_lock, flags);
55792- if (port->port.count == 0 && !port->openclose)
55793+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
55794 gs_buf_free(&port->port_write_buf);
55795 gs_free_requests(gser->out, &port->read_pool, NULL);
55796 gs_free_requests(gser->out, &port->read_queue, NULL);
55797diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
55798index c78c841..48fd281 100644
55799--- a/drivers/usb/gadget/function/u_uac1.c
55800+++ b/drivers/usb/gadget/function/u_uac1.c
55801@@ -17,6 +17,7 @@
55802 #include <linux/ctype.h>
55803 #include <linux/random.h>
55804 #include <linux/syscalls.h>
55805+#include <linux/module.h>
55806
55807 #include "u_uac1.h"
55808
55809diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
55810index 6920844..480bb7e 100644
55811--- a/drivers/usb/host/ehci-hub.c
55812+++ b/drivers/usb/host/ehci-hub.c
55813@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
55814 urb->transfer_flags = URB_DIR_IN;
55815 usb_get_urb(urb);
55816 atomic_inc(&urb->use_count);
55817- atomic_inc(&urb->dev->urbnum);
55818+ atomic_inc_unchecked(&urb->dev->urbnum);
55819 urb->setup_dma = dma_map_single(
55820 hcd->self.controller,
55821 urb->setup_packet,
55822@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
55823 urb->status = -EINPROGRESS;
55824 usb_get_urb(urb);
55825 atomic_inc(&urb->use_count);
55826- atomic_inc(&urb->dev->urbnum);
55827+ atomic_inc_unchecked(&urb->dev->urbnum);
55828 retval = submit_single_step_set_feature(hcd, urb, 0);
55829 if (!retval && !wait_for_completion_timeout(&done,
55830 msecs_to_jiffies(2000))) {
55831diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
55832index 1db0626..4948782 100644
55833--- a/drivers/usb/host/hwa-hc.c
55834+++ b/drivers/usb/host/hwa-hc.c
55835@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55836 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
55837 struct wahc *wa = &hwahc->wa;
55838 struct device *dev = &wa->usb_iface->dev;
55839- u8 mas_le[UWB_NUM_MAS/8];
55840+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
55841+
55842+ if (mas_le == NULL)
55843+ return -ENOMEM;
55844
55845 /* Set the stream index */
55846 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
55847@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55848 WUSB_REQ_SET_WUSB_MAS,
55849 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
55850 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
55851- mas_le, 32, USB_CTRL_SET_TIMEOUT);
55852+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
55853 if (result < 0)
55854 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
55855 out:
55856+ kfree(mas_le);
55857+
55858 return result;
55859 }
55860
55861diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
55862index a0a3827..d7ec10b 100644
55863--- a/drivers/usb/misc/appledisplay.c
55864+++ b/drivers/usb/misc/appledisplay.c
55865@@ -84,7 +84,7 @@ struct appledisplay {
55866 struct mutex sysfslock; /* concurrent read and write */
55867 };
55868
55869-static atomic_t count_displays = ATOMIC_INIT(0);
55870+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
55871 static struct workqueue_struct *wq;
55872
55873 static void appledisplay_complete(struct urb *urb)
55874@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
55875
55876 /* Register backlight device */
55877 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
55878- atomic_inc_return(&count_displays) - 1);
55879+ atomic_inc_return_unchecked(&count_displays) - 1);
55880 memset(&props, 0, sizeof(struct backlight_properties));
55881 props.type = BACKLIGHT_RAW;
55882 props.max_brightness = 0xff;
55883diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
55884index 3806e70..55c508b 100644
55885--- a/drivers/usb/serial/console.c
55886+++ b/drivers/usb/serial/console.c
55887@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
55888
55889 info->port = port;
55890
55891- ++port->port.count;
55892+ atomic_inc(&port->port.count);
55893 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
55894 if (serial->type->set_termios) {
55895 /*
55896@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
55897 }
55898 /* Now that any required fake tty operations are completed restore
55899 * the tty port count */
55900- --port->port.count;
55901+ atomic_dec(&port->port.count);
55902 /* The console is special in terms of closing the device so
55903 * indicate this port is now acting as a system console. */
55904 port->port.console = 1;
55905@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
55906 put_tty:
55907 tty_kref_put(tty);
55908 reset_open_count:
55909- port->port.count = 0;
55910+ atomic_set(&port->port.count, 0);
55911 usb_autopm_put_interface(serial->interface);
55912 error_get_interface:
55913 usb_serial_put(serial);
55914@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
55915 static void usb_console_write(struct console *co,
55916 const char *buf, unsigned count)
55917 {
55918- static struct usbcons_info *info = &usbcons_info;
55919+ struct usbcons_info *info = &usbcons_info;
55920 struct usb_serial_port *port = info->port;
55921 struct usb_serial *serial;
55922 int retval = -ENODEV;
55923diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
55924index 307e339..6aa97cb 100644
55925--- a/drivers/usb/storage/usb.h
55926+++ b/drivers/usb/storage/usb.h
55927@@ -63,7 +63,7 @@ struct us_unusual_dev {
55928 __u8 useProtocol;
55929 __u8 useTransport;
55930 int (*initFunction)(struct us_data *);
55931-};
55932+} __do_const;
55933
55934
55935 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
55936diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
55937index a863a98..d272795 100644
55938--- a/drivers/usb/usbip/vhci.h
55939+++ b/drivers/usb/usbip/vhci.h
55940@@ -83,7 +83,7 @@ struct vhci_hcd {
55941 unsigned resuming:1;
55942 unsigned long re_timeout;
55943
55944- atomic_t seqnum;
55945+ atomic_unchecked_t seqnum;
55946
55947 /*
55948 * NOTE:
55949diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
55950index e9ef1ec..c3a0b04 100644
55951--- a/drivers/usb/usbip/vhci_hcd.c
55952+++ b/drivers/usb/usbip/vhci_hcd.c
55953@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
55954
55955 spin_lock(&vdev->priv_lock);
55956
55957- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
55958+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55959 if (priv->seqnum == 0xffff)
55960 dev_info(&urb->dev->dev, "seqnum max\n");
55961
55962@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
55963 return -ENOMEM;
55964 }
55965
55966- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
55967+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55968 if (unlink->seqnum == 0xffff)
55969 pr_info("seqnum max\n");
55970
55971@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
55972 vdev->rhport = rhport;
55973 }
55974
55975- atomic_set(&vhci->seqnum, 0);
55976+ atomic_set_unchecked(&vhci->seqnum, 0);
55977 spin_lock_init(&vhci->lock);
55978
55979 hcd->power_budget = 0; /* no limit */
55980diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
55981index 00e4a54..d676f85 100644
55982--- a/drivers/usb/usbip/vhci_rx.c
55983+++ b/drivers/usb/usbip/vhci_rx.c
55984@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
55985 if (!urb) {
55986 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
55987 pr_info("max seqnum %d\n",
55988- atomic_read(&the_controller->seqnum));
55989+ atomic_read_unchecked(&the_controller->seqnum));
55990 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
55991 return;
55992 }
55993diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
55994index edc7267..9f65ce2 100644
55995--- a/drivers/usb/wusbcore/wa-hc.h
55996+++ b/drivers/usb/wusbcore/wa-hc.h
55997@@ -240,7 +240,7 @@ struct wahc {
55998 spinlock_t xfer_list_lock;
55999 struct work_struct xfer_enqueue_work;
56000 struct work_struct xfer_error_work;
56001- atomic_t xfer_id_count;
56002+ atomic_unchecked_t xfer_id_count;
56003
56004 kernel_ulong_t quirks;
56005 };
56006@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
56007 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
56008 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
56009 wa->dto_in_use = 0;
56010- atomic_set(&wa->xfer_id_count, 1);
56011+ atomic_set_unchecked(&wa->xfer_id_count, 1);
56012 /* init the buf in URBs */
56013 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
56014 usb_init_urb(&(wa->buf_in_urbs[index]));
56015diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
56016index 69af4fd..da390d7 100644
56017--- a/drivers/usb/wusbcore/wa-xfer.c
56018+++ b/drivers/usb/wusbcore/wa-xfer.c
56019@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
56020 */
56021 static void wa_xfer_id_init(struct wa_xfer *xfer)
56022 {
56023- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
56024+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
56025 }
56026
56027 /* Return the xfer's ID. */
56028diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
56029index e1278fe..7fdeac4 100644
56030--- a/drivers/vfio/vfio.c
56031+++ b/drivers/vfio/vfio.c
56032@@ -517,7 +517,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
56033 return 0;
56034
56035 /* TODO Prevent device auto probing */
56036- WARN("Device %s added to live group %d!\n", dev_name(dev),
56037+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
56038 iommu_group_id(group->iommu_group));
56039
56040 return 0;
56041diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
56042index 3bb02c6..a01ff38 100644
56043--- a/drivers/vhost/vringh.c
56044+++ b/drivers/vhost/vringh.c
56045@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
56046 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
56047 {
56048 __virtio16 v = 0;
56049- int rc = get_user(v, (__force __virtio16 __user *)p);
56050+ int rc = get_user(v, (__force_user __virtio16 *)p);
56051 *val = vringh16_to_cpu(vrh, v);
56052 return rc;
56053 }
56054@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
56055 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
56056 {
56057 __virtio16 v = cpu_to_vringh16(vrh, val);
56058- return put_user(v, (__force __virtio16 __user *)p);
56059+ return put_user(v, (__force_user __virtio16 *)p);
56060 }
56061
56062 static inline int copydesc_user(void *dst, const void *src, size_t len)
56063 {
56064- return copy_from_user(dst, (__force void __user *)src, len) ?
56065+ return copy_from_user(dst, (void __force_user *)src, len) ?
56066 -EFAULT : 0;
56067 }
56068
56069@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
56070 const struct vring_used_elem *src,
56071 unsigned int num)
56072 {
56073- return copy_to_user((__force void __user *)dst, src,
56074+ return copy_to_user((void __force_user *)dst, src,
56075 sizeof(*dst) * num) ? -EFAULT : 0;
56076 }
56077
56078 static inline int xfer_from_user(void *src, void *dst, size_t len)
56079 {
56080- return copy_from_user(dst, (__force void __user *)src, len) ?
56081+ return copy_from_user(dst, (void __force_user *)src, len) ?
56082 -EFAULT : 0;
56083 }
56084
56085 static inline int xfer_to_user(void *dst, void *src, size_t len)
56086 {
56087- return copy_to_user((__force void __user *)dst, src, len) ?
56088+ return copy_to_user((void __force_user *)dst, src, len) ?
56089 -EFAULT : 0;
56090 }
56091
56092@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
56093 vrh->last_used_idx = 0;
56094 vrh->vring.num = num;
56095 /* vring expects kernel addresses, but only used via accessors. */
56096- vrh->vring.desc = (__force struct vring_desc *)desc;
56097- vrh->vring.avail = (__force struct vring_avail *)avail;
56098- vrh->vring.used = (__force struct vring_used *)used;
56099+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
56100+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
56101+ vrh->vring.used = (__force_kernel struct vring_used *)used;
56102 return 0;
56103 }
56104 EXPORT_SYMBOL(vringh_init_user);
56105@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
56106
56107 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
56108 {
56109- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
56110+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
56111 return 0;
56112 }
56113
56114diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
56115index 84a110a..96312c3 100644
56116--- a/drivers/video/backlight/kb3886_bl.c
56117+++ b/drivers/video/backlight/kb3886_bl.c
56118@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
56119 static unsigned long kb3886bl_flags;
56120 #define KB3886BL_SUSPENDED 0x01
56121
56122-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
56123+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
56124 {
56125 .ident = "Sahara Touch-iT",
56126 .matches = {
56127diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
56128index 1b0b233..6f34c2c 100644
56129--- a/drivers/video/fbdev/arcfb.c
56130+++ b/drivers/video/fbdev/arcfb.c
56131@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
56132 return -ENOSPC;
56133
56134 err = 0;
56135- if ((count + p) > fbmemlength) {
56136+ if (count > (fbmemlength - p)) {
56137 count = fbmemlength - p;
56138 err = -ENOSPC;
56139 }
56140diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56141index 0156954..c07d4e0 100644
56142--- a/drivers/video/fbdev/aty/aty128fb.c
56143+++ b/drivers/video/fbdev/aty/aty128fb.c
56144@@ -149,7 +149,7 @@ enum {
56145 };
56146
56147 /* Must match above enum */
56148-static char * const r128_family[] = {
56149+static const char * const r128_family[] = {
56150 "AGP",
56151 "PCI",
56152 "PRO AGP",
56153diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56154index 8789e48..698fe4c 100644
56155--- a/drivers/video/fbdev/aty/atyfb_base.c
56156+++ b/drivers/video/fbdev/aty/atyfb_base.c
56157@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56158 par->accel_flags = var->accel_flags; /* hack */
56159
56160 if (var->accel_flags) {
56161- info->fbops->fb_sync = atyfb_sync;
56162+ pax_open_kernel();
56163+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56164+ pax_close_kernel();
56165 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56166 } else {
56167- info->fbops->fb_sync = NULL;
56168+ pax_open_kernel();
56169+ *(void **)&info->fbops->fb_sync = NULL;
56170+ pax_close_kernel();
56171 info->flags |= FBINFO_HWACCEL_DISABLED;
56172 }
56173
56174diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56175index 2fa0317..4983f2a 100644
56176--- a/drivers/video/fbdev/aty/mach64_cursor.c
56177+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56178@@ -8,6 +8,7 @@
56179 #include "../core/fb_draw.h"
56180
56181 #include <asm/io.h>
56182+#include <asm/pgtable.h>
56183
56184 #ifdef __sparc__
56185 #include <asm/fbio.h>
56186@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56187 info->sprite.buf_align = 16; /* and 64 lines tall. */
56188 info->sprite.flags = FB_PIXMAP_IO;
56189
56190- info->fbops->fb_cursor = atyfb_cursor;
56191+ pax_open_kernel();
56192+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56193+ pax_close_kernel();
56194
56195 return 0;
56196 }
56197diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56198index d6cab1f..112f680 100644
56199--- a/drivers/video/fbdev/core/fb_defio.c
56200+++ b/drivers/video/fbdev/core/fb_defio.c
56201@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56202
56203 BUG_ON(!fbdefio);
56204 mutex_init(&fbdefio->lock);
56205- info->fbops->fb_mmap = fb_deferred_io_mmap;
56206+ pax_open_kernel();
56207+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56208+ pax_close_kernel();
56209 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56210 INIT_LIST_HEAD(&fbdefio->pagelist);
56211 if (fbdefio->delay == 0) /* set a default of 1 s */
56212@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56213 page->mapping = NULL;
56214 }
56215
56216- info->fbops->fb_mmap = NULL;
56217+ *(void **)&info->fbops->fb_mmap = NULL;
56218 mutex_destroy(&fbdefio->lock);
56219 }
56220 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56221diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56222index 0705d88..d9429bf 100644
56223--- a/drivers/video/fbdev/core/fbmem.c
56224+++ b/drivers/video/fbdev/core/fbmem.c
56225@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56226 __u32 data;
56227 int err;
56228
56229- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56230+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56231
56232 data = (__u32) (unsigned long) fix->smem_start;
56233 err |= put_user(data, &fix32->smem_start);
56234diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56235index 807ee22..7814cd6 100644
56236--- a/drivers/video/fbdev/hyperv_fb.c
56237+++ b/drivers/video/fbdev/hyperv_fb.c
56238@@ -240,7 +240,7 @@ static uint screen_fb_size;
56239 static inline int synthvid_send(struct hv_device *hdev,
56240 struct synthvid_msg *msg)
56241 {
56242- static atomic64_t request_id = ATOMIC64_INIT(0);
56243+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56244 int ret;
56245
56246 msg->pipe_hdr.type = PIPE_MSG_DATA;
56247@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56248
56249 ret = vmbus_sendpacket(hdev->channel, msg,
56250 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56251- atomic64_inc_return(&request_id),
56252+ atomic64_inc_return_unchecked(&request_id),
56253 VM_PKT_DATA_INBAND, 0);
56254
56255 if (ret)
56256diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56257index 7672d2e..b56437f 100644
56258--- a/drivers/video/fbdev/i810/i810_accel.c
56259+++ b/drivers/video/fbdev/i810/i810_accel.c
56260@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56261 }
56262 }
56263 printk("ringbuffer lockup!!!\n");
56264+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56265 i810_report_error(mmio);
56266 par->dev_flags |= LOCKUP;
56267 info->pixmap.scan_align = 1;
56268diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56269index a01147f..5d896f8 100644
56270--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56271+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56272@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56273
56274 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56275 struct matrox_switch matrox_mystique = {
56276- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56277+ .preinit = MGA1064_preinit,
56278+ .reset = MGA1064_reset,
56279+ .init = MGA1064_init,
56280+ .restore = MGA1064_restore,
56281 };
56282 EXPORT_SYMBOL(matrox_mystique);
56283 #endif
56284
56285 #ifdef CONFIG_FB_MATROX_G
56286 struct matrox_switch matrox_G100 = {
56287- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56288+ .preinit = MGAG100_preinit,
56289+ .reset = MGAG100_reset,
56290+ .init = MGAG100_init,
56291+ .restore = MGAG100_restore,
56292 };
56293 EXPORT_SYMBOL(matrox_G100);
56294 #endif
56295diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56296index 195ad7c..09743fc 100644
56297--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56298+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56299@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56300 }
56301
56302 struct matrox_switch matrox_millennium = {
56303- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56304+ .preinit = Ti3026_preinit,
56305+ .reset = Ti3026_reset,
56306+ .init = Ti3026_init,
56307+ .restore = Ti3026_restore
56308 };
56309 EXPORT_SYMBOL(matrox_millennium);
56310 #endif
56311diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56312index fe92eed..106e085 100644
56313--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56314+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56315@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56316 struct mb862xxfb_par *par = info->par;
56317
56318 if (info->var.bits_per_pixel == 32) {
56319- info->fbops->fb_fillrect = cfb_fillrect;
56320- info->fbops->fb_copyarea = cfb_copyarea;
56321- info->fbops->fb_imageblit = cfb_imageblit;
56322+ pax_open_kernel();
56323+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56324+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56325+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56326+ pax_close_kernel();
56327 } else {
56328 outreg(disp, GC_L0EM, 3);
56329- info->fbops->fb_fillrect = mb86290fb_fillrect;
56330- info->fbops->fb_copyarea = mb86290fb_copyarea;
56331- info->fbops->fb_imageblit = mb86290fb_imageblit;
56332+ pax_open_kernel();
56333+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56334+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56335+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56336+ pax_close_kernel();
56337 }
56338 outreg(draw, GDC_REG_DRAW_BASE, 0);
56339 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56340diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56341index 4273c6e..b413013 100644
56342--- a/drivers/video/fbdev/nvidia/nvidia.c
56343+++ b/drivers/video/fbdev/nvidia/nvidia.c
56344@@ -665,19 +665,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56345 info->fix.line_length = (info->var.xres_virtual *
56346 info->var.bits_per_pixel) >> 3;
56347 if (info->var.accel_flags) {
56348- info->fbops->fb_imageblit = nvidiafb_imageblit;
56349- info->fbops->fb_fillrect = nvidiafb_fillrect;
56350- info->fbops->fb_copyarea = nvidiafb_copyarea;
56351- info->fbops->fb_sync = nvidiafb_sync;
56352+ pax_open_kernel();
56353+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56354+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56355+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56356+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56357+ pax_close_kernel();
56358 info->pixmap.scan_align = 4;
56359 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56360 info->flags |= FBINFO_READS_FAST;
56361 NVResetGraphics(info);
56362 } else {
56363- info->fbops->fb_imageblit = cfb_imageblit;
56364- info->fbops->fb_fillrect = cfb_fillrect;
56365- info->fbops->fb_copyarea = cfb_copyarea;
56366- info->fbops->fb_sync = NULL;
56367+ pax_open_kernel();
56368+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56369+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56370+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56371+ *(void **)&info->fbops->fb_sync = NULL;
56372+ pax_close_kernel();
56373 info->pixmap.scan_align = 1;
56374 info->flags |= FBINFO_HWACCEL_DISABLED;
56375 info->flags &= ~FBINFO_READS_FAST;
56376@@ -1169,8 +1173,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56377 info->pixmap.size = 8 * 1024;
56378 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56379
56380- if (!hwcur)
56381- info->fbops->fb_cursor = NULL;
56382+ if (!hwcur) {
56383+ pax_open_kernel();
56384+ *(void **)&info->fbops->fb_cursor = NULL;
56385+ pax_close_kernel();
56386+ }
56387
56388 info->var.accel_flags = (!noaccel);
56389
56390diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56391index ef5b902..47cf7f5 100644
56392--- a/drivers/video/fbdev/omap2/dss/display.c
56393+++ b/drivers/video/fbdev/omap2/dss/display.c
56394@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56395 if (dssdev->name == NULL)
56396 dssdev->name = dssdev->alias;
56397
56398+ pax_open_kernel();
56399 if (drv && drv->get_resolution == NULL)
56400- drv->get_resolution = omapdss_default_get_resolution;
56401+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56402 if (drv && drv->get_recommended_bpp == NULL)
56403- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56404+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56405 if (drv && drv->get_timings == NULL)
56406- drv->get_timings = omapdss_default_get_timings;
56407+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56408+ pax_close_kernel();
56409
56410 mutex_lock(&panel_list_mutex);
56411 list_add_tail(&dssdev->panel_list, &panel_list);
56412diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56413index 83433cb..71e9b98 100644
56414--- a/drivers/video/fbdev/s1d13xxxfb.c
56415+++ b/drivers/video/fbdev/s1d13xxxfb.c
56416@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56417
56418 switch(prod_id) {
56419 case S1D13506_PROD_ID: /* activate acceleration */
56420- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56421- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56422+ pax_open_kernel();
56423+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56424+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56425+ pax_close_kernel();
56426 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56427 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56428 break;
56429diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56430index 82c0a8c..42499a1 100644
56431--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56432+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56433@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56434 }
56435
56436 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56437- lcdc_sys_write_index,
56438- lcdc_sys_write_data,
56439- lcdc_sys_read_data,
56440+ .write_index = lcdc_sys_write_index,
56441+ .write_data = lcdc_sys_write_data,
56442+ .read_data = lcdc_sys_read_data,
56443 };
56444
56445 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56446diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56447index 9279e5f..d5f5276 100644
56448--- a/drivers/video/fbdev/smscufx.c
56449+++ b/drivers/video/fbdev/smscufx.c
56450@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56451 fb_deferred_io_cleanup(info);
56452 kfree(info->fbdefio);
56453 info->fbdefio = NULL;
56454- info->fbops->fb_mmap = ufx_ops_mmap;
56455+ pax_open_kernel();
56456+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56457+ pax_close_kernel();
56458 }
56459
56460 pr_debug("released /dev/fb%d user=%d count=%d",
56461diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56462index ff2b873..626a8d5 100644
56463--- a/drivers/video/fbdev/udlfb.c
56464+++ b/drivers/video/fbdev/udlfb.c
56465@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56466 dlfb_urb_completion(urb);
56467
56468 error:
56469- atomic_add(bytes_sent, &dev->bytes_sent);
56470- atomic_add(bytes_identical, &dev->bytes_identical);
56471- atomic_add(width*height*2, &dev->bytes_rendered);
56472+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56473+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56474+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56475 end_cycles = get_cycles();
56476- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56477+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56478 >> 10)), /* Kcycles */
56479 &dev->cpu_kcycles_used);
56480
56481@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56482 dlfb_urb_completion(urb);
56483
56484 error:
56485- atomic_add(bytes_sent, &dev->bytes_sent);
56486- atomic_add(bytes_identical, &dev->bytes_identical);
56487- atomic_add(bytes_rendered, &dev->bytes_rendered);
56488+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56489+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56490+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56491 end_cycles = get_cycles();
56492- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56493+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56494 >> 10)), /* Kcycles */
56495 &dev->cpu_kcycles_used);
56496 }
56497@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56498 fb_deferred_io_cleanup(info);
56499 kfree(info->fbdefio);
56500 info->fbdefio = NULL;
56501- info->fbops->fb_mmap = dlfb_ops_mmap;
56502+ pax_open_kernel();
56503+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56504+ pax_close_kernel();
56505 }
56506
56507 pr_warn("released /dev/fb%d user=%d count=%d\n",
56508@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56509 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56510 struct dlfb_data *dev = fb_info->par;
56511 return snprintf(buf, PAGE_SIZE, "%u\n",
56512- atomic_read(&dev->bytes_rendered));
56513+ atomic_read_unchecked(&dev->bytes_rendered));
56514 }
56515
56516 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56517@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56518 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56519 struct dlfb_data *dev = fb_info->par;
56520 return snprintf(buf, PAGE_SIZE, "%u\n",
56521- atomic_read(&dev->bytes_identical));
56522+ atomic_read_unchecked(&dev->bytes_identical));
56523 }
56524
56525 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56526@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56527 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56528 struct dlfb_data *dev = fb_info->par;
56529 return snprintf(buf, PAGE_SIZE, "%u\n",
56530- atomic_read(&dev->bytes_sent));
56531+ atomic_read_unchecked(&dev->bytes_sent));
56532 }
56533
56534 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56535@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56536 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56537 struct dlfb_data *dev = fb_info->par;
56538 return snprintf(buf, PAGE_SIZE, "%u\n",
56539- atomic_read(&dev->cpu_kcycles_used));
56540+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56541 }
56542
56543 static ssize_t edid_show(
56544@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56545 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56546 struct dlfb_data *dev = fb_info->par;
56547
56548- atomic_set(&dev->bytes_rendered, 0);
56549- atomic_set(&dev->bytes_identical, 0);
56550- atomic_set(&dev->bytes_sent, 0);
56551- atomic_set(&dev->cpu_kcycles_used, 0);
56552+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56553+ atomic_set_unchecked(&dev->bytes_identical, 0);
56554+ atomic_set_unchecked(&dev->bytes_sent, 0);
56555+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56556
56557 return count;
56558 }
56559diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56560index d32d1c4..46722e6 100644
56561--- a/drivers/video/fbdev/uvesafb.c
56562+++ b/drivers/video/fbdev/uvesafb.c
56563@@ -19,6 +19,7 @@
56564 #include <linux/io.h>
56565 #include <linux/mutex.h>
56566 #include <linux/slab.h>
56567+#include <linux/moduleloader.h>
56568 #include <video/edid.h>
56569 #include <video/uvesafb.h>
56570 #ifdef CONFIG_X86
56571@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56572 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56573 par->pmi_setpal = par->ypan = 0;
56574 } else {
56575+
56576+#ifdef CONFIG_PAX_KERNEXEC
56577+#ifdef CONFIG_MODULES
56578+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56579+#endif
56580+ if (!par->pmi_code) {
56581+ par->pmi_setpal = par->ypan = 0;
56582+ return 0;
56583+ }
56584+#endif
56585+
56586 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56587 + task->t.regs.edi);
56588+
56589+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56590+ pax_open_kernel();
56591+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56592+ pax_close_kernel();
56593+
56594+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56595+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56596+#else
56597 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56598 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56599+#endif
56600+
56601 printk(KERN_INFO "uvesafb: protected mode interface info at "
56602 "%04x:%04x\n",
56603 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56604@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56605 par->ypan = ypan;
56606
56607 if (par->pmi_setpal || par->ypan) {
56608+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56609 if (__supported_pte_mask & _PAGE_NX) {
56610 par->pmi_setpal = par->ypan = 0;
56611 printk(KERN_WARNING "uvesafb: NX protection is active, "
56612 "better not use the PMI.\n");
56613- } else {
56614+ } else
56615+#endif
56616 uvesafb_vbe_getpmi(task, par);
56617- }
56618 }
56619 #else
56620 /* The protected mode interface is not available on non-x86. */
56621@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56622 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56623
56624 /* Disable blanking if the user requested so. */
56625- if (!blank)
56626- info->fbops->fb_blank = NULL;
56627+ if (!blank) {
56628+ pax_open_kernel();
56629+ *(void **)&info->fbops->fb_blank = NULL;
56630+ pax_close_kernel();
56631+ }
56632
56633 /*
56634 * Find out how much IO memory is required for the mode with
56635@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56636 info->flags = FBINFO_FLAG_DEFAULT |
56637 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56638
56639- if (!par->ypan)
56640- info->fbops->fb_pan_display = NULL;
56641+ if (!par->ypan) {
56642+ pax_open_kernel();
56643+ *(void **)&info->fbops->fb_pan_display = NULL;
56644+ pax_close_kernel();
56645+ }
56646 }
56647
56648 static void uvesafb_init_mtrr(struct fb_info *info)
56649@@ -1786,6 +1816,11 @@ out_mode:
56650 out:
56651 kfree(par->vbe_modes);
56652
56653+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56654+ if (par->pmi_code)
56655+ module_memfree_exec(par->pmi_code);
56656+#endif
56657+
56658 framebuffer_release(info);
56659 return err;
56660 }
56661@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56662 kfree(par->vbe_state_orig);
56663 kfree(par->vbe_state_saved);
56664
56665+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56666+ if (par->pmi_code)
56667+ module_memfree_exec(par->pmi_code);
56668+#endif
56669+
56670 framebuffer_release(info);
56671 }
56672 return 0;
56673diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56674index d79a0ac..2d0c3d4 100644
56675--- a/drivers/video/fbdev/vesafb.c
56676+++ b/drivers/video/fbdev/vesafb.c
56677@@ -9,6 +9,7 @@
56678 */
56679
56680 #include <linux/module.h>
56681+#include <linux/moduleloader.h>
56682 #include <linux/kernel.h>
56683 #include <linux/errno.h>
56684 #include <linux/string.h>
56685@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56686 static int vram_total; /* Set total amount of memory */
56687 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56688 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56689-static void (*pmi_start)(void) __read_mostly;
56690-static void (*pmi_pal) (void) __read_mostly;
56691+static void (*pmi_start)(void) __read_only;
56692+static void (*pmi_pal) (void) __read_only;
56693 static int depth __read_mostly;
56694 static int vga_compat __read_mostly;
56695 /* --------------------------------------------------------------------- */
56696@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56697 unsigned int size_remap;
56698 unsigned int size_total;
56699 char *option = NULL;
56700+ void *pmi_code = NULL;
56701
56702 /* ignore error return of fb_get_options */
56703 fb_get_options("vesafb", &option);
56704@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56705 size_remap = size_total;
56706 vesafb_fix.smem_len = size_remap;
56707
56708-#ifndef __i386__
56709- screen_info.vesapm_seg = 0;
56710-#endif
56711-
56712 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56713 printk(KERN_WARNING
56714 "vesafb: cannot reserve video memory at 0x%lx\n",
56715@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56716 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56717 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56718
56719+#ifdef __i386__
56720+
56721+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56722+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56723+ if (!pmi_code)
56724+#elif !defined(CONFIG_PAX_KERNEXEC)
56725+ if (0)
56726+#endif
56727+
56728+#endif
56729+ screen_info.vesapm_seg = 0;
56730+
56731 if (screen_info.vesapm_seg) {
56732- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56733- screen_info.vesapm_seg,screen_info.vesapm_off);
56734+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56735+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56736 }
56737
56738 if (screen_info.vesapm_seg < 0xc000)
56739@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56740
56741 if (ypan || pmi_setpal) {
56742 unsigned short *pmi_base;
56743+
56744 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56745- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56746- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56747+
56748+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56749+ pax_open_kernel();
56750+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56751+#else
56752+ pmi_code = pmi_base;
56753+#endif
56754+
56755+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56756+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56757+
56758+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56759+ pmi_start = ktva_ktla(pmi_start);
56760+ pmi_pal = ktva_ktla(pmi_pal);
56761+ pax_close_kernel();
56762+#endif
56763+
56764 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56765 if (pmi_base[3]) {
56766 printk(KERN_INFO "vesafb: pmi: ports = ");
56767@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56768 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56769 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56770
56771- if (!ypan)
56772- info->fbops->fb_pan_display = NULL;
56773+ if (!ypan) {
56774+ pax_open_kernel();
56775+ *(void **)&info->fbops->fb_pan_display = NULL;
56776+ pax_close_kernel();
56777+ }
56778
56779 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56780 err = -ENOMEM;
56781@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56782 fb_info(info, "%s frame buffer device\n", info->fix.id);
56783 return 0;
56784 err:
56785+
56786+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56787+ module_memfree_exec(pmi_code);
56788+#endif
56789+
56790 if (info->screen_base)
56791 iounmap(info->screen_base);
56792 framebuffer_release(info);
56793diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
56794index 88714ae..16c2e11 100644
56795--- a/drivers/video/fbdev/via/via_clock.h
56796+++ b/drivers/video/fbdev/via/via_clock.h
56797@@ -56,7 +56,7 @@ struct via_clock {
56798
56799 void (*set_engine_pll_state)(u8 state);
56800 void (*set_engine_pll)(struct via_pll_config config);
56801-};
56802+} __no_const;
56803
56804
56805 static inline u32 get_pll_internal_frequency(u32 ref_freq,
56806diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
56807index 3c14e43..2630570 100644
56808--- a/drivers/video/logo/logo_linux_clut224.ppm
56809+++ b/drivers/video/logo/logo_linux_clut224.ppm
56810@@ -2,1603 +2,1123 @@ P3
56811 # Standard 224-color Linux logo
56812 80 80
56813 255
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 0 0 0 0 0 0 0 0 0
56817- 0 0 0 0 0 0 0 0 0 0 0 0
56818- 0 0 0 0 0 0 0 0 0 0 0 0
56819- 0 0 0 0 0 0 0 0 0 0 0 0
56820- 0 0 0 0 0 0 0 0 0 0 0 0
56821- 0 0 0 0 0 0 0 0 0 0 0 0
56822- 0 0 0 0 0 0 0 0 0 0 0 0
56823- 6 6 6 6 6 6 10 10 10 10 10 10
56824- 10 10 10 6 6 6 6 6 6 6 6 6
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 0 0 0 0 0 0 0
56830- 0 0 0 0 0 0 0 0 0 0 0 0
56831- 0 0 0 0 0 0 0 0 0 0 0 0
56832- 0 0 0 0 0 0 0 0 0 0 0 0
56833- 0 0 0 0 0 0 0 0 0 0 0 0
56834- 0 0 0 0 0 0 0 0 0 0 0 0
56835- 0 0 0 0 0 0 0 0 0 0 0 0
56836- 0 0 0 0 0 0 0 0 0 0 0 0
56837- 0 0 0 0 0 0 0 0 0 0 0 0
56838- 0 0 0 0 0 0 0 0 0 0 0 0
56839- 0 0 0 0 0 0 0 0 0 0 0 0
56840- 0 0 0 0 0 0 0 0 0 0 0 0
56841- 0 0 0 0 0 0 0 0 0 0 0 0
56842- 0 0 0 6 6 6 10 10 10 14 14 14
56843- 22 22 22 26 26 26 30 30 30 34 34 34
56844- 30 30 30 30 30 30 26 26 26 18 18 18
56845- 14 14 14 10 10 10 6 6 6 0 0 0
56846- 0 0 0 0 0 0 0 0 0 0 0 0
56847- 0 0 0 0 0 0 0 0 0 0 0 0
56848- 0 0 0 0 0 0 0 0 0 0 0 0
56849- 0 0 0 0 0 0 0 0 0 0 0 0
56850- 0 0 0 0 0 0 0 0 0 0 0 0
56851- 0 0 0 0 0 0 0 0 0 0 0 0
56852- 0 0 0 0 0 0 0 0 0 0 0 0
56853- 0 0 0 0 0 0 0 0 0 0 0 0
56854- 0 0 0 0 0 0 0 0 0 0 0 0
56855- 0 0 0 0 0 1 0 0 1 0 0 0
56856- 0 0 0 0 0 0 0 0 0 0 0 0
56857- 0 0 0 0 0 0 0 0 0 0 0 0
56858- 0 0 0 0 0 0 0 0 0 0 0 0
56859- 0 0 0 0 0 0 0 0 0 0 0 0
56860- 0 0 0 0 0 0 0 0 0 0 0 0
56861- 0 0 0 0 0 0 0 0 0 0 0 0
56862- 6 6 6 14 14 14 26 26 26 42 42 42
56863- 54 54 54 66 66 66 78 78 78 78 78 78
56864- 78 78 78 74 74 74 66 66 66 54 54 54
56865- 42 42 42 26 26 26 18 18 18 10 10 10
56866- 6 6 6 0 0 0 0 0 0 0 0 0
56867- 0 0 0 0 0 0 0 0 0 0 0 0
56868- 0 0 0 0 0 0 0 0 0 0 0 0
56869- 0 0 0 0 0 0 0 0 0 0 0 0
56870- 0 0 0 0 0 0 0 0 0 0 0 0
56871- 0 0 0 0 0 0 0 0 0 0 0 0
56872- 0 0 0 0 0 0 0 0 0 0 0 0
56873- 0 0 0 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 1 0 0 0 0 0 0 0 0 0
56876- 0 0 0 0 0 0 0 0 0 0 0 0
56877- 0 0 0 0 0 0 0 0 0 0 0 0
56878- 0 0 0 0 0 0 0 0 0 0 0 0
56879- 0 0 0 0 0 0 0 0 0 0 0 0
56880- 0 0 0 0 0 0 0 0 0 0 0 0
56881- 0 0 0 0 0 0 0 0 0 10 10 10
56882- 22 22 22 42 42 42 66 66 66 86 86 86
56883- 66 66 66 38 38 38 38 38 38 22 22 22
56884- 26 26 26 34 34 34 54 54 54 66 66 66
56885- 86 86 86 70 70 70 46 46 46 26 26 26
56886- 14 14 14 6 6 6 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 1 0 0 1 0 0 1 0 0 0
56896- 0 0 0 0 0 0 0 0 0 0 0 0
56897- 0 0 0 0 0 0 0 0 0 0 0 0
56898- 0 0 0 0 0 0 0 0 0 0 0 0
56899- 0 0 0 0 0 0 0 0 0 0 0 0
56900- 0 0 0 0 0 0 0 0 0 0 0 0
56901- 0 0 0 0 0 0 10 10 10 26 26 26
56902- 50 50 50 82 82 82 58 58 58 6 6 6
56903- 2 2 6 2 2 6 2 2 6 2 2 6
56904- 2 2 6 2 2 6 2 2 6 2 2 6
56905- 6 6 6 54 54 54 86 86 86 66 66 66
56906- 38 38 38 18 18 18 6 6 6 0 0 0
56907- 0 0 0 0 0 0 0 0 0 0 0 0
56908- 0 0 0 0 0 0 0 0 0 0 0 0
56909- 0 0 0 0 0 0 0 0 0 0 0 0
56910- 0 0 0 0 0 0 0 0 0 0 0 0
56911- 0 0 0 0 0 0 0 0 0 0 0 0
56912- 0 0 0 0 0 0 0 0 0 0 0 0
56913- 0 0 0 0 0 0 0 0 0 0 0 0
56914- 0 0 0 0 0 0 0 0 0 0 0 0
56915- 0 0 0 0 0 0 0 0 0 0 0 0
56916- 0 0 0 0 0 0 0 0 0 0 0 0
56917- 0 0 0 0 0 0 0 0 0 0 0 0
56918- 0 0 0 0 0 0 0 0 0 0 0 0
56919- 0 0 0 0 0 0 0 0 0 0 0 0
56920- 0 0 0 0 0 0 0 0 0 0 0 0
56921- 0 0 0 6 6 6 22 22 22 50 50 50
56922- 78 78 78 34 34 34 2 2 6 2 2 6
56923- 2 2 6 2 2 6 2 2 6 2 2 6
56924- 2 2 6 2 2 6 2 2 6 2 2 6
56925- 2 2 6 2 2 6 6 6 6 70 70 70
56926- 78 78 78 46 46 46 22 22 22 6 6 6
56927- 0 0 0 0 0 0 0 0 0 0 0 0
56928- 0 0 0 0 0 0 0 0 0 0 0 0
56929- 0 0 0 0 0 0 0 0 0 0 0 0
56930- 0 0 0 0 0 0 0 0 0 0 0 0
56931- 0 0 0 0 0 0 0 0 0 0 0 0
56932- 0 0 0 0 0 0 0 0 0 0 0 0
56933- 0 0 0 0 0 0 0 0 0 0 0 0
56934- 0 0 0 0 0 0 0 0 0 0 0 0
56935- 0 0 1 0 0 1 0 0 1 0 0 0
56936- 0 0 0 0 0 0 0 0 0 0 0 0
56937- 0 0 0 0 0 0 0 0 0 0 0 0
56938- 0 0 0 0 0 0 0 0 0 0 0 0
56939- 0 0 0 0 0 0 0 0 0 0 0 0
56940- 0 0 0 0 0 0 0 0 0 0 0 0
56941- 6 6 6 18 18 18 42 42 42 82 82 82
56942- 26 26 26 2 2 6 2 2 6 2 2 6
56943- 2 2 6 2 2 6 2 2 6 2 2 6
56944- 2 2 6 2 2 6 2 2 6 14 14 14
56945- 46 46 46 34 34 34 6 6 6 2 2 6
56946- 42 42 42 78 78 78 42 42 42 18 18 18
56947- 6 6 6 0 0 0 0 0 0 0 0 0
56948- 0 0 0 0 0 0 0 0 0 0 0 0
56949- 0 0 0 0 0 0 0 0 0 0 0 0
56950- 0 0 0 0 0 0 0 0 0 0 0 0
56951- 0 0 0 0 0 0 0 0 0 0 0 0
56952- 0 0 0 0 0 0 0 0 0 0 0 0
56953- 0 0 0 0 0 0 0 0 0 0 0 0
56954- 0 0 0 0 0 0 0 0 0 0 0 0
56955- 0 0 1 0 0 0 0 0 1 0 0 0
56956- 0 0 0 0 0 0 0 0 0 0 0 0
56957- 0 0 0 0 0 0 0 0 0 0 0 0
56958- 0 0 0 0 0 0 0 0 0 0 0 0
56959- 0 0 0 0 0 0 0 0 0 0 0 0
56960- 0 0 0 0 0 0 0 0 0 0 0 0
56961- 10 10 10 30 30 30 66 66 66 58 58 58
56962- 2 2 6 2 2 6 2 2 6 2 2 6
56963- 2 2 6 2 2 6 2 2 6 2 2 6
56964- 2 2 6 2 2 6 2 2 6 26 26 26
56965- 86 86 86 101 101 101 46 46 46 10 10 10
56966- 2 2 6 58 58 58 70 70 70 34 34 34
56967- 10 10 10 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 0 0 0
56975- 0 0 1 0 0 1 0 0 1 0 0 0
56976- 0 0 0 0 0 0 0 0 0 0 0 0
56977- 0 0 0 0 0 0 0 0 0 0 0 0
56978- 0 0 0 0 0 0 0 0 0 0 0 0
56979- 0 0 0 0 0 0 0 0 0 0 0 0
56980- 0 0 0 0 0 0 0 0 0 0 0 0
56981- 14 14 14 42 42 42 86 86 86 10 10 10
56982- 2 2 6 2 2 6 2 2 6 2 2 6
56983- 2 2 6 2 2 6 2 2 6 2 2 6
56984- 2 2 6 2 2 6 2 2 6 30 30 30
56985- 94 94 94 94 94 94 58 58 58 26 26 26
56986- 2 2 6 6 6 6 78 78 78 54 54 54
56987- 22 22 22 6 6 6 0 0 0 0 0 0
56988- 0 0 0 0 0 0 0 0 0 0 0 0
56989- 0 0 0 0 0 0 0 0 0 0 0 0
56990- 0 0 0 0 0 0 0 0 0 0 0 0
56991- 0 0 0 0 0 0 0 0 0 0 0 0
56992- 0 0 0 0 0 0 0 0 0 0 0 0
56993- 0 0 0 0 0 0 0 0 0 0 0 0
56994- 0 0 0 0 0 0 0 0 0 0 0 0
56995- 0 0 0 0 0 0 0 0 0 0 0 0
56996- 0 0 0 0 0 0 0 0 0 0 0 0
56997- 0 0 0 0 0 0 0 0 0 0 0 0
56998- 0 0 0 0 0 0 0 0 0 0 0 0
56999- 0 0 0 0 0 0 0 0 0 0 0 0
57000- 0 0 0 0 0 0 0 0 0 6 6 6
57001- 22 22 22 62 62 62 62 62 62 2 2 6
57002- 2 2 6 2 2 6 2 2 6 2 2 6
57003- 2 2 6 2 2 6 2 2 6 2 2 6
57004- 2 2 6 2 2 6 2 2 6 26 26 26
57005- 54 54 54 38 38 38 18 18 18 10 10 10
57006- 2 2 6 2 2 6 34 34 34 82 82 82
57007- 38 38 38 14 14 14 0 0 0 0 0 0
57008- 0 0 0 0 0 0 0 0 0 0 0 0
57009- 0 0 0 0 0 0 0 0 0 0 0 0
57010- 0 0 0 0 0 0 0 0 0 0 0 0
57011- 0 0 0 0 0 0 0 0 0 0 0 0
57012- 0 0 0 0 0 0 0 0 0 0 0 0
57013- 0 0 0 0 0 0 0 0 0 0 0 0
57014- 0 0 0 0 0 0 0 0 0 0 0 0
57015- 0 0 0 0 0 1 0 0 1 0 0 0
57016- 0 0 0 0 0 0 0 0 0 0 0 0
57017- 0 0 0 0 0 0 0 0 0 0 0 0
57018- 0 0 0 0 0 0 0 0 0 0 0 0
57019- 0 0 0 0 0 0 0 0 0 0 0 0
57020- 0 0 0 0 0 0 0 0 0 6 6 6
57021- 30 30 30 78 78 78 30 30 30 2 2 6
57022- 2 2 6 2 2 6 2 2 6 2 2 6
57023- 2 2 6 2 2 6 2 2 6 2 2 6
57024- 2 2 6 2 2 6 2 2 6 10 10 10
57025- 10 10 10 2 2 6 2 2 6 2 2 6
57026- 2 2 6 2 2 6 2 2 6 78 78 78
57027- 50 50 50 18 18 18 6 6 6 0 0 0
57028- 0 0 0 0 0 0 0 0 0 0 0 0
57029- 0 0 0 0 0 0 0 0 0 0 0 0
57030- 0 0 0 0 0 0 0 0 0 0 0 0
57031- 0 0 0 0 0 0 0 0 0 0 0 0
57032- 0 0 0 0 0 0 0 0 0 0 0 0
57033- 0 0 0 0 0 0 0 0 0 0 0 0
57034- 0 0 0 0 0 0 0 0 0 0 0 0
57035- 0 0 1 0 0 0 0 0 0 0 0 0
57036- 0 0 0 0 0 0 0 0 0 0 0 0
57037- 0 0 0 0 0 0 0 0 0 0 0 0
57038- 0 0 0 0 0 0 0 0 0 0 0 0
57039- 0 0 0 0 0 0 0 0 0 0 0 0
57040- 0 0 0 0 0 0 0 0 0 10 10 10
57041- 38 38 38 86 86 86 14 14 14 2 2 6
57042- 2 2 6 2 2 6 2 2 6 2 2 6
57043- 2 2 6 2 2 6 2 2 6 2 2 6
57044- 2 2 6 2 2 6 2 2 6 2 2 6
57045- 2 2 6 2 2 6 2 2 6 2 2 6
57046- 2 2 6 2 2 6 2 2 6 54 54 54
57047- 66 66 66 26 26 26 6 6 6 0 0 0
57048- 0 0 0 0 0 0 0 0 0 0 0 0
57049- 0 0 0 0 0 0 0 0 0 0 0 0
57050- 0 0 0 0 0 0 0 0 0 0 0 0
57051- 0 0 0 0 0 0 0 0 0 0 0 0
57052- 0 0 0 0 0 0 0 0 0 0 0 0
57053- 0 0 0 0 0 0 0 0 0 0 0 0
57054- 0 0 0 0 0 0 0 0 0 0 0 0
57055- 0 0 0 0 0 1 0 0 1 0 0 0
57056- 0 0 0 0 0 0 0 0 0 0 0 0
57057- 0 0 0 0 0 0 0 0 0 0 0 0
57058- 0 0 0 0 0 0 0 0 0 0 0 0
57059- 0 0 0 0 0 0 0 0 0 0 0 0
57060- 0 0 0 0 0 0 0 0 0 14 14 14
57061- 42 42 42 82 82 82 2 2 6 2 2 6
57062- 2 2 6 6 6 6 10 10 10 2 2 6
57063- 2 2 6 2 2 6 2 2 6 2 2 6
57064- 2 2 6 2 2 6 2 2 6 6 6 6
57065- 14 14 14 10 10 10 2 2 6 2 2 6
57066- 2 2 6 2 2 6 2 2 6 18 18 18
57067- 82 82 82 34 34 34 10 10 10 0 0 0
57068- 0 0 0 0 0 0 0 0 0 0 0 0
57069- 0 0 0 0 0 0 0 0 0 0 0 0
57070- 0 0 0 0 0 0 0 0 0 0 0 0
57071- 0 0 0 0 0 0 0 0 0 0 0 0
57072- 0 0 0 0 0 0 0 0 0 0 0 0
57073- 0 0 0 0 0 0 0 0 0 0 0 0
57074- 0 0 0 0 0 0 0 0 0 0 0 0
57075- 0 0 1 0 0 0 0 0 0 0 0 0
57076- 0 0 0 0 0 0 0 0 0 0 0 0
57077- 0 0 0 0 0 0 0 0 0 0 0 0
57078- 0 0 0 0 0 0 0 0 0 0 0 0
57079- 0 0 0 0 0 0 0 0 0 0 0 0
57080- 0 0 0 0 0 0 0 0 0 14 14 14
57081- 46 46 46 86 86 86 2 2 6 2 2 6
57082- 6 6 6 6 6 6 22 22 22 34 34 34
57083- 6 6 6 2 2 6 2 2 6 2 2 6
57084- 2 2 6 2 2 6 18 18 18 34 34 34
57085- 10 10 10 50 50 50 22 22 22 2 2 6
57086- 2 2 6 2 2 6 2 2 6 10 10 10
57087- 86 86 86 42 42 42 14 14 14 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 0 0 0
57095- 0 0 1 0 0 1 0 0 1 0 0 0
57096- 0 0 0 0 0 0 0 0 0 0 0 0
57097- 0 0 0 0 0 0 0 0 0 0 0 0
57098- 0 0 0 0 0 0 0 0 0 0 0 0
57099- 0 0 0 0 0 0 0 0 0 0 0 0
57100- 0 0 0 0 0 0 0 0 0 14 14 14
57101- 46 46 46 86 86 86 2 2 6 2 2 6
57102- 38 38 38 116 116 116 94 94 94 22 22 22
57103- 22 22 22 2 2 6 2 2 6 2 2 6
57104- 14 14 14 86 86 86 138 138 138 162 162 162
57105-154 154 154 38 38 38 26 26 26 6 6 6
57106- 2 2 6 2 2 6 2 2 6 2 2 6
57107- 86 86 86 46 46 46 14 14 14 0 0 0
57108- 0 0 0 0 0 0 0 0 0 0 0 0
57109- 0 0 0 0 0 0 0 0 0 0 0 0
57110- 0 0 0 0 0 0 0 0 0 0 0 0
57111- 0 0 0 0 0 0 0 0 0 0 0 0
57112- 0 0 0 0 0 0 0 0 0 0 0 0
57113- 0 0 0 0 0 0 0 0 0 0 0 0
57114- 0 0 0 0 0 0 0 0 0 0 0 0
57115- 0 0 0 0 0 0 0 0 0 0 0 0
57116- 0 0 0 0 0 0 0 0 0 0 0 0
57117- 0 0 0 0 0 0 0 0 0 0 0 0
57118- 0 0 0 0 0 0 0 0 0 0 0 0
57119- 0 0 0 0 0 0 0 0 0 0 0 0
57120- 0 0 0 0 0 0 0 0 0 14 14 14
57121- 46 46 46 86 86 86 2 2 6 14 14 14
57122-134 134 134 198 198 198 195 195 195 116 116 116
57123- 10 10 10 2 2 6 2 2 6 6 6 6
57124-101 98 89 187 187 187 210 210 210 218 218 218
57125-214 214 214 134 134 134 14 14 14 6 6 6
57126- 2 2 6 2 2 6 2 2 6 2 2 6
57127- 86 86 86 50 50 50 18 18 18 6 6 6
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 1 0 0 0
57135- 0 0 1 0 0 1 0 0 1 0 0 0
57136- 0 0 0 0 0 0 0 0 0 0 0 0
57137- 0 0 0 0 0 0 0 0 0 0 0 0
57138- 0 0 0 0 0 0 0 0 0 0 0 0
57139- 0 0 0 0 0 0 0 0 0 0 0 0
57140- 0 0 0 0 0 0 0 0 0 14 14 14
57141- 46 46 46 86 86 86 2 2 6 54 54 54
57142-218 218 218 195 195 195 226 226 226 246 246 246
57143- 58 58 58 2 2 6 2 2 6 30 30 30
57144-210 210 210 253 253 253 174 174 174 123 123 123
57145-221 221 221 234 234 234 74 74 74 2 2 6
57146- 2 2 6 2 2 6 2 2 6 2 2 6
57147- 70 70 70 58 58 58 22 22 22 6 6 6
57148- 0 0 0 0 0 0 0 0 0 0 0 0
57149- 0 0 0 0 0 0 0 0 0 0 0 0
57150- 0 0 0 0 0 0 0 0 0 0 0 0
57151- 0 0 0 0 0 0 0 0 0 0 0 0
57152- 0 0 0 0 0 0 0 0 0 0 0 0
57153- 0 0 0 0 0 0 0 0 0 0 0 0
57154- 0 0 0 0 0 0 0 0 0 0 0 0
57155- 0 0 0 0 0 0 0 0 0 0 0 0
57156- 0 0 0 0 0 0 0 0 0 0 0 0
57157- 0 0 0 0 0 0 0 0 0 0 0 0
57158- 0 0 0 0 0 0 0 0 0 0 0 0
57159- 0 0 0 0 0 0 0 0 0 0 0 0
57160- 0 0 0 0 0 0 0 0 0 14 14 14
57161- 46 46 46 82 82 82 2 2 6 106 106 106
57162-170 170 170 26 26 26 86 86 86 226 226 226
57163-123 123 123 10 10 10 14 14 14 46 46 46
57164-231 231 231 190 190 190 6 6 6 70 70 70
57165- 90 90 90 238 238 238 158 158 158 2 2 6
57166- 2 2 6 2 2 6 2 2 6 2 2 6
57167- 70 70 70 58 58 58 22 22 22 6 6 6
57168- 0 0 0 0 0 0 0 0 0 0 0 0
57169- 0 0 0 0 0 0 0 0 0 0 0 0
57170- 0 0 0 0 0 0 0 0 0 0 0 0
57171- 0 0 0 0 0 0 0 0 0 0 0 0
57172- 0 0 0 0 0 0 0 0 0 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 1 0 0 0
57175- 0 0 1 0 0 1 0 0 1 0 0 0
57176- 0 0 0 0 0 0 0 0 0 0 0 0
57177- 0 0 0 0 0 0 0 0 0 0 0 0
57178- 0 0 0 0 0 0 0 0 0 0 0 0
57179- 0 0 0 0 0 0 0 0 0 0 0 0
57180- 0 0 0 0 0 0 0 0 0 14 14 14
57181- 42 42 42 86 86 86 6 6 6 116 116 116
57182-106 106 106 6 6 6 70 70 70 149 149 149
57183-128 128 128 18 18 18 38 38 38 54 54 54
57184-221 221 221 106 106 106 2 2 6 14 14 14
57185- 46 46 46 190 190 190 198 198 198 2 2 6
57186- 2 2 6 2 2 6 2 2 6 2 2 6
57187- 74 74 74 62 62 62 22 22 22 6 6 6
57188- 0 0 0 0 0 0 0 0 0 0 0 0
57189- 0 0 0 0 0 0 0 0 0 0 0 0
57190- 0 0 0 0 0 0 0 0 0 0 0 0
57191- 0 0 0 0 0 0 0 0 0 0 0 0
57192- 0 0 0 0 0 0 0 0 0 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 1 0 0 0
57195- 0 0 1 0 0 0 0 0 1 0 0 0
57196- 0 0 0 0 0 0 0 0 0 0 0 0
57197- 0 0 0 0 0 0 0 0 0 0 0 0
57198- 0 0 0 0 0 0 0 0 0 0 0 0
57199- 0 0 0 0 0 0 0 0 0 0 0 0
57200- 0 0 0 0 0 0 0 0 0 14 14 14
57201- 42 42 42 94 94 94 14 14 14 101 101 101
57202-128 128 128 2 2 6 18 18 18 116 116 116
57203-118 98 46 121 92 8 121 92 8 98 78 10
57204-162 162 162 106 106 106 2 2 6 2 2 6
57205- 2 2 6 195 195 195 195 195 195 6 6 6
57206- 2 2 6 2 2 6 2 2 6 2 2 6
57207- 74 74 74 62 62 62 22 22 22 6 6 6
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 1 0 0 1
57215- 0 0 1 0 0 0 0 0 1 0 0 0
57216- 0 0 0 0 0 0 0 0 0 0 0 0
57217- 0 0 0 0 0 0 0 0 0 0 0 0
57218- 0 0 0 0 0 0 0 0 0 0 0 0
57219- 0 0 0 0 0 0 0 0 0 0 0 0
57220- 0 0 0 0 0 0 0 0 0 10 10 10
57221- 38 38 38 90 90 90 14 14 14 58 58 58
57222-210 210 210 26 26 26 54 38 6 154 114 10
57223-226 170 11 236 186 11 225 175 15 184 144 12
57224-215 174 15 175 146 61 37 26 9 2 2 6
57225- 70 70 70 246 246 246 138 138 138 2 2 6
57226- 2 2 6 2 2 6 2 2 6 2 2 6
57227- 70 70 70 66 66 66 26 26 26 6 6 6
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 0 0 0
57235- 0 0 0 0 0 0 0 0 0 0 0 0
57236- 0 0 0 0 0 0 0 0 0 0 0 0
57237- 0 0 0 0 0 0 0 0 0 0 0 0
57238- 0 0 0 0 0 0 0 0 0 0 0 0
57239- 0 0 0 0 0 0 0 0 0 0 0 0
57240- 0 0 0 0 0 0 0 0 0 10 10 10
57241- 38 38 38 86 86 86 14 14 14 10 10 10
57242-195 195 195 188 164 115 192 133 9 225 175 15
57243-239 182 13 234 190 10 232 195 16 232 200 30
57244-245 207 45 241 208 19 232 195 16 184 144 12
57245-218 194 134 211 206 186 42 42 42 2 2 6
57246- 2 2 6 2 2 6 2 2 6 2 2 6
57247- 50 50 50 74 74 74 30 30 30 6 6 6
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 0 0 0
57255- 0 0 0 0 0 0 0 0 0 0 0 0
57256- 0 0 0 0 0 0 0 0 0 0 0 0
57257- 0 0 0 0 0 0 0 0 0 0 0 0
57258- 0 0 0 0 0 0 0 0 0 0 0 0
57259- 0 0 0 0 0 0 0 0 0 0 0 0
57260- 0 0 0 0 0 0 0 0 0 10 10 10
57261- 34 34 34 86 86 86 14 14 14 2 2 6
57262-121 87 25 192 133 9 219 162 10 239 182 13
57263-236 186 11 232 195 16 241 208 19 244 214 54
57264-246 218 60 246 218 38 246 215 20 241 208 19
57265-241 208 19 226 184 13 121 87 25 2 2 6
57266- 2 2 6 2 2 6 2 2 6 2 2 6
57267- 50 50 50 82 82 82 34 34 34 10 10 10
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 0 0 0
57275- 0 0 0 0 0 0 0 0 0 0 0 0
57276- 0 0 0 0 0 0 0 0 0 0 0 0
57277- 0 0 0 0 0 0 0 0 0 0 0 0
57278- 0 0 0 0 0 0 0 0 0 0 0 0
57279- 0 0 0 0 0 0 0 0 0 0 0 0
57280- 0 0 0 0 0 0 0 0 0 10 10 10
57281- 34 34 34 82 82 82 30 30 30 61 42 6
57282-180 123 7 206 145 10 230 174 11 239 182 13
57283-234 190 10 238 202 15 241 208 19 246 218 74
57284-246 218 38 246 215 20 246 215 20 246 215 20
57285-226 184 13 215 174 15 184 144 12 6 6 6
57286- 2 2 6 2 2 6 2 2 6 2 2 6
57287- 26 26 26 94 94 94 42 42 42 14 14 14
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 0 0 0
57295- 0 0 0 0 0 0 0 0 0 0 0 0
57296- 0 0 0 0 0 0 0 0 0 0 0 0
57297- 0 0 0 0 0 0 0 0 0 0 0 0
57298- 0 0 0 0 0 0 0 0 0 0 0 0
57299- 0 0 0 0 0 0 0 0 0 0 0 0
57300- 0 0 0 0 0 0 0 0 0 10 10 10
57301- 30 30 30 78 78 78 50 50 50 104 69 6
57302-192 133 9 216 158 10 236 178 12 236 186 11
57303-232 195 16 241 208 19 244 214 54 245 215 43
57304-246 215 20 246 215 20 241 208 19 198 155 10
57305-200 144 11 216 158 10 156 118 10 2 2 6
57306- 2 2 6 2 2 6 2 2 6 2 2 6
57307- 6 6 6 90 90 90 54 54 54 18 18 18
57308- 6 6 6 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 0 0 0
57315- 0 0 0 0 0 0 0 0 0 0 0 0
57316- 0 0 0 0 0 0 0 0 0 0 0 0
57317- 0 0 0 0 0 0 0 0 0 0 0 0
57318- 0 0 0 0 0 0 0 0 0 0 0 0
57319- 0 0 0 0 0 0 0 0 0 0 0 0
57320- 0 0 0 0 0 0 0 0 0 10 10 10
57321- 30 30 30 78 78 78 46 46 46 22 22 22
57322-137 92 6 210 162 10 239 182 13 238 190 10
57323-238 202 15 241 208 19 246 215 20 246 215 20
57324-241 208 19 203 166 17 185 133 11 210 150 10
57325-216 158 10 210 150 10 102 78 10 2 2 6
57326- 6 6 6 54 54 54 14 14 14 2 2 6
57327- 2 2 6 62 62 62 74 74 74 30 30 30
57328- 10 10 10 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 0 0 0
57335- 0 0 0 0 0 0 0 0 0 0 0 0
57336- 0 0 0 0 0 0 0 0 0 0 0 0
57337- 0 0 0 0 0 0 0 0 0 0 0 0
57338- 0 0 0 0 0 0 0 0 0 0 0 0
57339- 0 0 0 0 0 0 0 0 0 0 0 0
57340- 0 0 0 0 0 0 0 0 0 10 10 10
57341- 34 34 34 78 78 78 50 50 50 6 6 6
57342- 94 70 30 139 102 15 190 146 13 226 184 13
57343-232 200 30 232 195 16 215 174 15 190 146 13
57344-168 122 10 192 133 9 210 150 10 213 154 11
57345-202 150 34 182 157 106 101 98 89 2 2 6
57346- 2 2 6 78 78 78 116 116 116 58 58 58
57347- 2 2 6 22 22 22 90 90 90 46 46 46
57348- 18 18 18 6 6 6 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 0 0 0 0 0 0
57355- 0 0 0 0 0 0 0 0 0 0 0 0
57356- 0 0 0 0 0 0 0 0 0 0 0 0
57357- 0 0 0 0 0 0 0 0 0 0 0 0
57358- 0 0 0 0 0 0 0 0 0 0 0 0
57359- 0 0 0 0 0 0 0 0 0 0 0 0
57360- 0 0 0 0 0 0 0 0 0 10 10 10
57361- 38 38 38 86 86 86 50 50 50 6 6 6
57362-128 128 128 174 154 114 156 107 11 168 122 10
57363-198 155 10 184 144 12 197 138 11 200 144 11
57364-206 145 10 206 145 10 197 138 11 188 164 115
57365-195 195 195 198 198 198 174 174 174 14 14 14
57366- 2 2 6 22 22 22 116 116 116 116 116 116
57367- 22 22 22 2 2 6 74 74 74 70 70 70
57368- 30 30 30 10 10 10 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 0 0 0 0 0 0
57375- 0 0 0 0 0 0 0 0 0 0 0 0
57376- 0 0 0 0 0 0 0 0 0 0 0 0
57377- 0 0 0 0 0 0 0 0 0 0 0 0
57378- 0 0 0 0 0 0 0 0 0 0 0 0
57379- 0 0 0 0 0 0 0 0 0 0 0 0
57380- 0 0 0 0 0 0 6 6 6 18 18 18
57381- 50 50 50 101 101 101 26 26 26 10 10 10
57382-138 138 138 190 190 190 174 154 114 156 107 11
57383-197 138 11 200 144 11 197 138 11 192 133 9
57384-180 123 7 190 142 34 190 178 144 187 187 187
57385-202 202 202 221 221 221 214 214 214 66 66 66
57386- 2 2 6 2 2 6 50 50 50 62 62 62
57387- 6 6 6 2 2 6 10 10 10 90 90 90
57388- 50 50 50 18 18 18 6 6 6 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 0 0 0 0 0 0 0 0 0
57395- 0 0 0 0 0 0 0 0 0 0 0 0
57396- 0 0 0 0 0 0 0 0 0 0 0 0
57397- 0 0 0 0 0 0 0 0 0 0 0 0
57398- 0 0 0 0 0 0 0 0 0 0 0 0
57399- 0 0 0 0 0 0 0 0 0 0 0 0
57400- 0 0 0 0 0 0 10 10 10 34 34 34
57401- 74 74 74 74 74 74 2 2 6 6 6 6
57402-144 144 144 198 198 198 190 190 190 178 166 146
57403-154 121 60 156 107 11 156 107 11 168 124 44
57404-174 154 114 187 187 187 190 190 190 210 210 210
57405-246 246 246 253 253 253 253 253 253 182 182 182
57406- 6 6 6 2 2 6 2 2 6 2 2 6
57407- 2 2 6 2 2 6 2 2 6 62 62 62
57408- 74 74 74 34 34 34 14 14 14 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- 0 0 0 0 0 0 0 0 0 0 0 0
57415- 0 0 0 0 0 0 0 0 0 0 0 0
57416- 0 0 0 0 0 0 0 0 0 0 0 0
57417- 0 0 0 0 0 0 0 0 0 0 0 0
57418- 0 0 0 0 0 0 0 0 0 0 0 0
57419- 0 0 0 0 0 0 0 0 0 0 0 0
57420- 0 0 0 10 10 10 22 22 22 54 54 54
57421- 94 94 94 18 18 18 2 2 6 46 46 46
57422-234 234 234 221 221 221 190 190 190 190 190 190
57423-190 190 190 187 187 187 187 187 187 190 190 190
57424-190 190 190 195 195 195 214 214 214 242 242 242
57425-253 253 253 253 253 253 253 253 253 253 253 253
57426- 82 82 82 2 2 6 2 2 6 2 2 6
57427- 2 2 6 2 2 6 2 2 6 14 14 14
57428- 86 86 86 54 54 54 22 22 22 6 6 6
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 0 0 0
57434- 0 0 0 0 0 0 0 0 0 0 0 0
57435- 0 0 0 0 0 0 0 0 0 0 0 0
57436- 0 0 0 0 0 0 0 0 0 0 0 0
57437- 0 0 0 0 0 0 0 0 0 0 0 0
57438- 0 0 0 0 0 0 0 0 0 0 0 0
57439- 0 0 0 0 0 0 0 0 0 0 0 0
57440- 6 6 6 18 18 18 46 46 46 90 90 90
57441- 46 46 46 18 18 18 6 6 6 182 182 182
57442-253 253 253 246 246 246 206 206 206 190 190 190
57443-190 190 190 190 190 190 190 190 190 190 190 190
57444-206 206 206 231 231 231 250 250 250 253 253 253
57445-253 253 253 253 253 253 253 253 253 253 253 253
57446-202 202 202 14 14 14 2 2 6 2 2 6
57447- 2 2 6 2 2 6 2 2 6 2 2 6
57448- 42 42 42 86 86 86 42 42 42 18 18 18
57449- 6 6 6 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 0 0 0
57454- 0 0 0 0 0 0 0 0 0 0 0 0
57455- 0 0 0 0 0 0 0 0 0 0 0 0
57456- 0 0 0 0 0 0 0 0 0 0 0 0
57457- 0 0 0 0 0 0 0 0 0 0 0 0
57458- 0 0 0 0 0 0 0 0 0 0 0 0
57459- 0 0 0 0 0 0 0 0 0 6 6 6
57460- 14 14 14 38 38 38 74 74 74 66 66 66
57461- 2 2 6 6 6 6 90 90 90 250 250 250
57462-253 253 253 253 253 253 238 238 238 198 198 198
57463-190 190 190 190 190 190 195 195 195 221 221 221
57464-246 246 246 253 253 253 253 253 253 253 253 253
57465-253 253 253 253 253 253 253 253 253 253 253 253
57466-253 253 253 82 82 82 2 2 6 2 2 6
57467- 2 2 6 2 2 6 2 2 6 2 2 6
57468- 2 2 6 78 78 78 70 70 70 34 34 34
57469- 14 14 14 6 6 6 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 0 0 0 0 0 0
57474- 0 0 0 0 0 0 0 0 0 0 0 0
57475- 0 0 0 0 0 0 0 0 0 0 0 0
57476- 0 0 0 0 0 0 0 0 0 0 0 0
57477- 0 0 0 0 0 0 0 0 0 0 0 0
57478- 0 0 0 0 0 0 0 0 0 0 0 0
57479- 0 0 0 0 0 0 0 0 0 14 14 14
57480- 34 34 34 66 66 66 78 78 78 6 6 6
57481- 2 2 6 18 18 18 218 218 218 253 253 253
57482-253 253 253 253 253 253 253 253 253 246 246 246
57483-226 226 226 231 231 231 246 246 246 253 253 253
57484-253 253 253 253 253 253 253 253 253 253 253 253
57485-253 253 253 253 253 253 253 253 253 253 253 253
57486-253 253 253 178 178 178 2 2 6 2 2 6
57487- 2 2 6 2 2 6 2 2 6 2 2 6
57488- 2 2 6 18 18 18 90 90 90 62 62 62
57489- 30 30 30 10 10 10 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 0 0 0 0 0 0 0 0 0
57494- 0 0 0 0 0 0 0 0 0 0 0 0
57495- 0 0 0 0 0 0 0 0 0 0 0 0
57496- 0 0 0 0 0 0 0 0 0 0 0 0
57497- 0 0 0 0 0 0 0 0 0 0 0 0
57498- 0 0 0 0 0 0 0 0 0 0 0 0
57499- 0 0 0 0 0 0 10 10 10 26 26 26
57500- 58 58 58 90 90 90 18 18 18 2 2 6
57501- 2 2 6 110 110 110 253 253 253 253 253 253
57502-253 253 253 253 253 253 253 253 253 253 253 253
57503-250 250 250 253 253 253 253 253 253 253 253 253
57504-253 253 253 253 253 253 253 253 253 253 253 253
57505-253 253 253 253 253 253 253 253 253 253 253 253
57506-253 253 253 231 231 231 18 18 18 2 2 6
57507- 2 2 6 2 2 6 2 2 6 2 2 6
57508- 2 2 6 2 2 6 18 18 18 94 94 94
57509- 54 54 54 26 26 26 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
57514- 0 0 0 0 0 0 0 0 0 0 0 0
57515- 0 0 0 0 0 0 0 0 0 0 0 0
57516- 0 0 0 0 0 0 0 0 0 0 0 0
57517- 0 0 0 0 0 0 0 0 0 0 0 0
57518- 0 0 0 0 0 0 0 0 0 0 0 0
57519- 0 0 0 6 6 6 22 22 22 50 50 50
57520- 90 90 90 26 26 26 2 2 6 2 2 6
57521- 14 14 14 195 195 195 250 250 250 253 253 253
57522-253 253 253 253 253 253 253 253 253 253 253 253
57523-253 253 253 253 253 253 253 253 253 253 253 253
57524-253 253 253 253 253 253 253 253 253 253 253 253
57525-253 253 253 253 253 253 253 253 253 253 253 253
57526-250 250 250 242 242 242 54 54 54 2 2 6
57527- 2 2 6 2 2 6 2 2 6 2 2 6
57528- 2 2 6 2 2 6 2 2 6 38 38 38
57529- 86 86 86 50 50 50 22 22 22 6 6 6
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- 0 0 0 0 0 0 0 0 0 0 0 0
57534- 0 0 0 0 0 0 0 0 0 0 0 0
57535- 0 0 0 0 0 0 0 0 0 0 0 0
57536- 0 0 0 0 0 0 0 0 0 0 0 0
57537- 0 0 0 0 0 0 0 0 0 0 0 0
57538- 0 0 0 0 0 0 0 0 0 0 0 0
57539- 6 6 6 14 14 14 38 38 38 82 82 82
57540- 34 34 34 2 2 6 2 2 6 2 2 6
57541- 42 42 42 195 195 195 246 246 246 253 253 253
57542-253 253 253 253 253 253 253 253 253 250 250 250
57543-242 242 242 242 242 242 250 250 250 253 253 253
57544-253 253 253 253 253 253 253 253 253 253 253 253
57545-253 253 253 250 250 250 246 246 246 238 238 238
57546-226 226 226 231 231 231 101 101 101 6 6 6
57547- 2 2 6 2 2 6 2 2 6 2 2 6
57548- 2 2 6 2 2 6 2 2 6 2 2 6
57549- 38 38 38 82 82 82 42 42 42 14 14 14
57550- 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
57554- 0 0 0 0 0 0 0 0 0 0 0 0
57555- 0 0 0 0 0 0 0 0 0 0 0 0
57556- 0 0 0 0 0 0 0 0 0 0 0 0
57557- 0 0 0 0 0 0 0 0 0 0 0 0
57558- 0 0 0 0 0 0 0 0 0 0 0 0
57559- 10 10 10 26 26 26 62 62 62 66 66 66
57560- 2 2 6 2 2 6 2 2 6 6 6 6
57561- 70 70 70 170 170 170 206 206 206 234 234 234
57562-246 246 246 250 250 250 250 250 250 238 238 238
57563-226 226 226 231 231 231 238 238 238 250 250 250
57564-250 250 250 250 250 250 246 246 246 231 231 231
57565-214 214 214 206 206 206 202 202 202 202 202 202
57566-198 198 198 202 202 202 182 182 182 18 18 18
57567- 2 2 6 2 2 6 2 2 6 2 2 6
57568- 2 2 6 2 2 6 2 2 6 2 2 6
57569- 2 2 6 62 62 62 66 66 66 30 30 30
57570- 10 10 10 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 0 0 0
57573- 0 0 0 0 0 0 0 0 0 0 0 0
57574- 0 0 0 0 0 0 0 0 0 0 0 0
57575- 0 0 0 0 0 0 0 0 0 0 0 0
57576- 0 0 0 0 0 0 0 0 0 0 0 0
57577- 0 0 0 0 0 0 0 0 0 0 0 0
57578- 0 0 0 0 0 0 0 0 0 0 0 0
57579- 14 14 14 42 42 42 82 82 82 18 18 18
57580- 2 2 6 2 2 6 2 2 6 10 10 10
57581- 94 94 94 182 182 182 218 218 218 242 242 242
57582-250 250 250 253 253 253 253 253 253 250 250 250
57583-234 234 234 253 253 253 253 253 253 253 253 253
57584-253 253 253 253 253 253 253 253 253 246 246 246
57585-238 238 238 226 226 226 210 210 210 202 202 202
57586-195 195 195 195 195 195 210 210 210 158 158 158
57587- 6 6 6 14 14 14 50 50 50 14 14 14
57588- 2 2 6 2 2 6 2 2 6 2 2 6
57589- 2 2 6 6 6 6 86 86 86 46 46 46
57590- 18 18 18 6 6 6 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 0 0 0
57593- 0 0 0 0 0 0 0 0 0 0 0 0
57594- 0 0 0 0 0 0 0 0 0 0 0 0
57595- 0 0 0 0 0 0 0 0 0 0 0 0
57596- 0 0 0 0 0 0 0 0 0 0 0 0
57597- 0 0 0 0 0 0 0 0 0 0 0 0
57598- 0 0 0 0 0 0 0 0 0 6 6 6
57599- 22 22 22 54 54 54 70 70 70 2 2 6
57600- 2 2 6 10 10 10 2 2 6 22 22 22
57601-166 166 166 231 231 231 250 250 250 253 253 253
57602-253 253 253 253 253 253 253 253 253 250 250 250
57603-242 242 242 253 253 253 253 253 253 253 253 253
57604-253 253 253 253 253 253 253 253 253 253 253 253
57605-253 253 253 253 253 253 253 253 253 246 246 246
57606-231 231 231 206 206 206 198 198 198 226 226 226
57607- 94 94 94 2 2 6 6 6 6 38 38 38
57608- 30 30 30 2 2 6 2 2 6 2 2 6
57609- 2 2 6 2 2 6 62 62 62 66 66 66
57610- 26 26 26 10 10 10 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 0 0 0
57613- 0 0 0 0 0 0 0 0 0 0 0 0
57614- 0 0 0 0 0 0 0 0 0 0 0 0
57615- 0 0 0 0 0 0 0 0 0 0 0 0
57616- 0 0 0 0 0 0 0 0 0 0 0 0
57617- 0 0 0 0 0 0 0 0 0 0 0 0
57618- 0 0 0 0 0 0 0 0 0 10 10 10
57619- 30 30 30 74 74 74 50 50 50 2 2 6
57620- 26 26 26 26 26 26 2 2 6 106 106 106
57621-238 238 238 253 253 253 253 253 253 253 253 253
57622-253 253 253 253 253 253 253 253 253 253 253 253
57623-253 253 253 253 253 253 253 253 253 253 253 253
57624-253 253 253 253 253 253 253 253 253 253 253 253
57625-253 253 253 253 253 253 253 253 253 253 253 253
57626-253 253 253 246 246 246 218 218 218 202 202 202
57627-210 210 210 14 14 14 2 2 6 2 2 6
57628- 30 30 30 22 22 22 2 2 6 2 2 6
57629- 2 2 6 2 2 6 18 18 18 86 86 86
57630- 42 42 42 14 14 14 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 0 0 0 0 0 0
57633- 0 0 0 0 0 0 0 0 0 0 0 0
57634- 0 0 0 0 0 0 0 0 0 0 0 0
57635- 0 0 0 0 0 0 0 0 0 0 0 0
57636- 0 0 0 0 0 0 0 0 0 0 0 0
57637- 0 0 0 0 0 0 0 0 0 0 0 0
57638- 0 0 0 0 0 0 0 0 0 14 14 14
57639- 42 42 42 90 90 90 22 22 22 2 2 6
57640- 42 42 42 2 2 6 18 18 18 218 218 218
57641-253 253 253 253 253 253 253 253 253 253 253 253
57642-253 253 253 253 253 253 253 253 253 253 253 253
57643-253 253 253 253 253 253 253 253 253 253 253 253
57644-253 253 253 253 253 253 253 253 253 253 253 253
57645-253 253 253 253 253 253 253 253 253 253 253 253
57646-253 253 253 253 253 253 250 250 250 221 221 221
57647-218 218 218 101 101 101 2 2 6 14 14 14
57648- 18 18 18 38 38 38 10 10 10 2 2 6
57649- 2 2 6 2 2 6 2 2 6 78 78 78
57650- 58 58 58 22 22 22 6 6 6 0 0 0
57651- 0 0 0 0 0 0 0 0 0 0 0 0
57652- 0 0 0 0 0 0 0 0 0 0 0 0
57653- 0 0 0 0 0 0 0 0 0 0 0 0
57654- 0 0 0 0 0 0 0 0 0 0 0 0
57655- 0 0 0 0 0 0 0 0 0 0 0 0
57656- 0 0 0 0 0 0 0 0 0 0 0 0
57657- 0 0 0 0 0 0 0 0 0 0 0 0
57658- 0 0 0 0 0 0 6 6 6 18 18 18
57659- 54 54 54 82 82 82 2 2 6 26 26 26
57660- 22 22 22 2 2 6 123 123 123 253 253 253
57661-253 253 253 253 253 253 253 253 253 253 253 253
57662-253 253 253 253 253 253 253 253 253 253 253 253
57663-253 253 253 253 253 253 253 253 253 253 253 253
57664-253 253 253 253 253 253 253 253 253 253 253 253
57665-253 253 253 253 253 253 253 253 253 253 253 253
57666-253 253 253 253 253 253 253 253 253 250 250 250
57667-238 238 238 198 198 198 6 6 6 38 38 38
57668- 58 58 58 26 26 26 38 38 38 2 2 6
57669- 2 2 6 2 2 6 2 2 6 46 46 46
57670- 78 78 78 30 30 30 10 10 10 0 0 0
57671- 0 0 0 0 0 0 0 0 0 0 0 0
57672- 0 0 0 0 0 0 0 0 0 0 0 0
57673- 0 0 0 0 0 0 0 0 0 0 0 0
57674- 0 0 0 0 0 0 0 0 0 0 0 0
57675- 0 0 0 0 0 0 0 0 0 0 0 0
57676- 0 0 0 0 0 0 0 0 0 0 0 0
57677- 0 0 0 0 0 0 0 0 0 0 0 0
57678- 0 0 0 0 0 0 10 10 10 30 30 30
57679- 74 74 74 58 58 58 2 2 6 42 42 42
57680- 2 2 6 22 22 22 231 231 231 253 253 253
57681-253 253 253 253 253 253 253 253 253 253 253 253
57682-253 253 253 253 253 253 253 253 253 250 250 250
57683-253 253 253 253 253 253 253 253 253 253 253 253
57684-253 253 253 253 253 253 253 253 253 253 253 253
57685-253 253 253 253 253 253 253 253 253 253 253 253
57686-253 253 253 253 253 253 253 253 253 253 253 253
57687-253 253 253 246 246 246 46 46 46 38 38 38
57688- 42 42 42 14 14 14 38 38 38 14 14 14
57689- 2 2 6 2 2 6 2 2 6 6 6 6
57690- 86 86 86 46 46 46 14 14 14 0 0 0
57691- 0 0 0 0 0 0 0 0 0 0 0 0
57692- 0 0 0 0 0 0 0 0 0 0 0 0
57693- 0 0 0 0 0 0 0 0 0 0 0 0
57694- 0 0 0 0 0 0 0 0 0 0 0 0
57695- 0 0 0 0 0 0 0 0 0 0 0 0
57696- 0 0 0 0 0 0 0 0 0 0 0 0
57697- 0 0 0 0 0 0 0 0 0 0 0 0
57698- 0 0 0 6 6 6 14 14 14 42 42 42
57699- 90 90 90 18 18 18 18 18 18 26 26 26
57700- 2 2 6 116 116 116 253 253 253 253 253 253
57701-253 253 253 253 253 253 253 253 253 253 253 253
57702-253 253 253 253 253 253 250 250 250 238 238 238
57703-253 253 253 253 253 253 253 253 253 253 253 253
57704-253 253 253 253 253 253 253 253 253 253 253 253
57705-253 253 253 253 253 253 253 253 253 253 253 253
57706-253 253 253 253 253 253 253 253 253 253 253 253
57707-253 253 253 253 253 253 94 94 94 6 6 6
57708- 2 2 6 2 2 6 10 10 10 34 34 34
57709- 2 2 6 2 2 6 2 2 6 2 2 6
57710- 74 74 74 58 58 58 22 22 22 6 6 6
57711- 0 0 0 0 0 0 0 0 0 0 0 0
57712- 0 0 0 0 0 0 0 0 0 0 0 0
57713- 0 0 0 0 0 0 0 0 0 0 0 0
57714- 0 0 0 0 0 0 0 0 0 0 0 0
57715- 0 0 0 0 0 0 0 0 0 0 0 0
57716- 0 0 0 0 0 0 0 0 0 0 0 0
57717- 0 0 0 0 0 0 0 0 0 0 0 0
57718- 0 0 0 10 10 10 26 26 26 66 66 66
57719- 82 82 82 2 2 6 38 38 38 6 6 6
57720- 14 14 14 210 210 210 253 253 253 253 253 253
57721-253 253 253 253 253 253 253 253 253 253 253 253
57722-253 253 253 253 253 253 246 246 246 242 242 242
57723-253 253 253 253 253 253 253 253 253 253 253 253
57724-253 253 253 253 253 253 253 253 253 253 253 253
57725-253 253 253 253 253 253 253 253 253 253 253 253
57726-253 253 253 253 253 253 253 253 253 253 253 253
57727-253 253 253 253 253 253 144 144 144 2 2 6
57728- 2 2 6 2 2 6 2 2 6 46 46 46
57729- 2 2 6 2 2 6 2 2 6 2 2 6
57730- 42 42 42 74 74 74 30 30 30 10 10 10
57731- 0 0 0 0 0 0 0 0 0 0 0 0
57732- 0 0 0 0 0 0 0 0 0 0 0 0
57733- 0 0 0 0 0 0 0 0 0 0 0 0
57734- 0 0 0 0 0 0 0 0 0 0 0 0
57735- 0 0 0 0 0 0 0 0 0 0 0 0
57736- 0 0 0 0 0 0 0 0 0 0 0 0
57737- 0 0 0 0 0 0 0 0 0 0 0 0
57738- 6 6 6 14 14 14 42 42 42 90 90 90
57739- 26 26 26 6 6 6 42 42 42 2 2 6
57740- 74 74 74 250 250 250 253 253 253 253 253 253
57741-253 253 253 253 253 253 253 253 253 253 253 253
57742-253 253 253 253 253 253 242 242 242 242 242 242
57743-253 253 253 253 253 253 253 253 253 253 253 253
57744-253 253 253 253 253 253 253 253 253 253 253 253
57745-253 253 253 253 253 253 253 253 253 253 253 253
57746-253 253 253 253 253 253 253 253 253 253 253 253
57747-253 253 253 253 253 253 182 182 182 2 2 6
57748- 2 2 6 2 2 6 2 2 6 46 46 46
57749- 2 2 6 2 2 6 2 2 6 2 2 6
57750- 10 10 10 86 86 86 38 38 38 10 10 10
57751- 0 0 0 0 0 0 0 0 0 0 0 0
57752- 0 0 0 0 0 0 0 0 0 0 0 0
57753- 0 0 0 0 0 0 0 0 0 0 0 0
57754- 0 0 0 0 0 0 0 0 0 0 0 0
57755- 0 0 0 0 0 0 0 0 0 0 0 0
57756- 0 0 0 0 0 0 0 0 0 0 0 0
57757- 0 0 0 0 0 0 0 0 0 0 0 0
57758- 10 10 10 26 26 26 66 66 66 82 82 82
57759- 2 2 6 22 22 22 18 18 18 2 2 6
57760-149 149 149 253 253 253 253 253 253 253 253 253
57761-253 253 253 253 253 253 253 253 253 253 253 253
57762-253 253 253 253 253 253 234 234 234 242 242 242
57763-253 253 253 253 253 253 253 253 253 253 253 253
57764-253 253 253 253 253 253 253 253 253 253 253 253
57765-253 253 253 253 253 253 253 253 253 253 253 253
57766-253 253 253 253 253 253 253 253 253 253 253 253
57767-253 253 253 253 253 253 206 206 206 2 2 6
57768- 2 2 6 2 2 6 2 2 6 38 38 38
57769- 2 2 6 2 2 6 2 2 6 2 2 6
57770- 6 6 6 86 86 86 46 46 46 14 14 14
57771- 0 0 0 0 0 0 0 0 0 0 0 0
57772- 0 0 0 0 0 0 0 0 0 0 0 0
57773- 0 0 0 0 0 0 0 0 0 0 0 0
57774- 0 0 0 0 0 0 0 0 0 0 0 0
57775- 0 0 0 0 0 0 0 0 0 0 0 0
57776- 0 0 0 0 0 0 0 0 0 0 0 0
57777- 0 0 0 0 0 0 0 0 0 6 6 6
57778- 18 18 18 46 46 46 86 86 86 18 18 18
57779- 2 2 6 34 34 34 10 10 10 6 6 6
57780-210 210 210 253 253 253 253 253 253 253 253 253
57781-253 253 253 253 253 253 253 253 253 253 253 253
57782-253 253 253 253 253 253 234 234 234 242 242 242
57783-253 253 253 253 253 253 253 253 253 253 253 253
57784-253 253 253 253 253 253 253 253 253 253 253 253
57785-253 253 253 253 253 253 253 253 253 253 253 253
57786-253 253 253 253 253 253 253 253 253 253 253 253
57787-253 253 253 253 253 253 221 221 221 6 6 6
57788- 2 2 6 2 2 6 6 6 6 30 30 30
57789- 2 2 6 2 2 6 2 2 6 2 2 6
57790- 2 2 6 82 82 82 54 54 54 18 18 18
57791- 6 6 6 0 0 0 0 0 0 0 0 0
57792- 0 0 0 0 0 0 0 0 0 0 0 0
57793- 0 0 0 0 0 0 0 0 0 0 0 0
57794- 0 0 0 0 0 0 0 0 0 0 0 0
57795- 0 0 0 0 0 0 0 0 0 0 0 0
57796- 0 0 0 0 0 0 0 0 0 0 0 0
57797- 0 0 0 0 0 0 0 0 0 10 10 10
57798- 26 26 26 66 66 66 62 62 62 2 2 6
57799- 2 2 6 38 38 38 10 10 10 26 26 26
57800-238 238 238 253 253 253 253 253 253 253 253 253
57801-253 253 253 253 253 253 253 253 253 253 253 253
57802-253 253 253 253 253 253 231 231 231 238 238 238
57803-253 253 253 253 253 253 253 253 253 253 253 253
57804-253 253 253 253 253 253 253 253 253 253 253 253
57805-253 253 253 253 253 253 253 253 253 253 253 253
57806-253 253 253 253 253 253 253 253 253 253 253 253
57807-253 253 253 253 253 253 231 231 231 6 6 6
57808- 2 2 6 2 2 6 10 10 10 30 30 30
57809- 2 2 6 2 2 6 2 2 6 2 2 6
57810- 2 2 6 66 66 66 58 58 58 22 22 22
57811- 6 6 6 0 0 0 0 0 0 0 0 0
57812- 0 0 0 0 0 0 0 0 0 0 0 0
57813- 0 0 0 0 0 0 0 0 0 0 0 0
57814- 0 0 0 0 0 0 0 0 0 0 0 0
57815- 0 0 0 0 0 0 0 0 0 0 0 0
57816- 0 0 0 0 0 0 0 0 0 0 0 0
57817- 0 0 0 0 0 0 0 0 0 10 10 10
57818- 38 38 38 78 78 78 6 6 6 2 2 6
57819- 2 2 6 46 46 46 14 14 14 42 42 42
57820-246 246 246 253 253 253 253 253 253 253 253 253
57821-253 253 253 253 253 253 253 253 253 253 253 253
57822-253 253 253 253 253 253 231 231 231 242 242 242
57823-253 253 253 253 253 253 253 253 253 253 253 253
57824-253 253 253 253 253 253 253 253 253 253 253 253
57825-253 253 253 253 253 253 253 253 253 253 253 253
57826-253 253 253 253 253 253 253 253 253 253 253 253
57827-253 253 253 253 253 253 234 234 234 10 10 10
57828- 2 2 6 2 2 6 22 22 22 14 14 14
57829- 2 2 6 2 2 6 2 2 6 2 2 6
57830- 2 2 6 66 66 66 62 62 62 22 22 22
57831- 6 6 6 0 0 0 0 0 0 0 0 0
57832- 0 0 0 0 0 0 0 0 0 0 0 0
57833- 0 0 0 0 0 0 0 0 0 0 0 0
57834- 0 0 0 0 0 0 0 0 0 0 0 0
57835- 0 0 0 0 0 0 0 0 0 0 0 0
57836- 0 0 0 0 0 0 0 0 0 0 0 0
57837- 0 0 0 0 0 0 6 6 6 18 18 18
57838- 50 50 50 74 74 74 2 2 6 2 2 6
57839- 14 14 14 70 70 70 34 34 34 62 62 62
57840-250 250 250 253 253 253 253 253 253 253 253 253
57841-253 253 253 253 253 253 253 253 253 253 253 253
57842-253 253 253 253 253 253 231 231 231 246 246 246
57843-253 253 253 253 253 253 253 253 253 253 253 253
57844-253 253 253 253 253 253 253 253 253 253 253 253
57845-253 253 253 253 253 253 253 253 253 253 253 253
57846-253 253 253 253 253 253 253 253 253 253 253 253
57847-253 253 253 253 253 253 234 234 234 14 14 14
57848- 2 2 6 2 2 6 30 30 30 2 2 6
57849- 2 2 6 2 2 6 2 2 6 2 2 6
57850- 2 2 6 66 66 66 62 62 62 22 22 22
57851- 6 6 6 0 0 0 0 0 0 0 0 0
57852- 0 0 0 0 0 0 0 0 0 0 0 0
57853- 0 0 0 0 0 0 0 0 0 0 0 0
57854- 0 0 0 0 0 0 0 0 0 0 0 0
57855- 0 0 0 0 0 0 0 0 0 0 0 0
57856- 0 0 0 0 0 0 0 0 0 0 0 0
57857- 0 0 0 0 0 0 6 6 6 18 18 18
57858- 54 54 54 62 62 62 2 2 6 2 2 6
57859- 2 2 6 30 30 30 46 46 46 70 70 70
57860-250 250 250 253 253 253 253 253 253 253 253 253
57861-253 253 253 253 253 253 253 253 253 253 253 253
57862-253 253 253 253 253 253 231 231 231 246 246 246
57863-253 253 253 253 253 253 253 253 253 253 253 253
57864-253 253 253 253 253 253 253 253 253 253 253 253
57865-253 253 253 253 253 253 253 253 253 253 253 253
57866-253 253 253 253 253 253 253 253 253 253 253 253
57867-253 253 253 253 253 253 226 226 226 10 10 10
57868- 2 2 6 6 6 6 30 30 30 2 2 6
57869- 2 2 6 2 2 6 2 2 6 2 2 6
57870- 2 2 6 66 66 66 58 58 58 22 22 22
57871- 6 6 6 0 0 0 0 0 0 0 0 0
57872- 0 0 0 0 0 0 0 0 0 0 0 0
57873- 0 0 0 0 0 0 0 0 0 0 0 0
57874- 0 0 0 0 0 0 0 0 0 0 0 0
57875- 0 0 0 0 0 0 0 0 0 0 0 0
57876- 0 0 0 0 0 0 0 0 0 0 0 0
57877- 0 0 0 0 0 0 6 6 6 22 22 22
57878- 58 58 58 62 62 62 2 2 6 2 2 6
57879- 2 2 6 2 2 6 30 30 30 78 78 78
57880-250 250 250 253 253 253 253 253 253 253 253 253
57881-253 253 253 253 253 253 253 253 253 253 253 253
57882-253 253 253 253 253 253 231 231 231 246 246 246
57883-253 253 253 253 253 253 253 253 253 253 253 253
57884-253 253 253 253 253 253 253 253 253 253 253 253
57885-253 253 253 253 253 253 253 253 253 253 253 253
57886-253 253 253 253 253 253 253 253 253 253 253 253
57887-253 253 253 253 253 253 206 206 206 2 2 6
57888- 22 22 22 34 34 34 18 14 6 22 22 22
57889- 26 26 26 18 18 18 6 6 6 2 2 6
57890- 2 2 6 82 82 82 54 54 54 18 18 18
57891- 6 6 6 0 0 0 0 0 0 0 0 0
57892- 0 0 0 0 0 0 0 0 0 0 0 0
57893- 0 0 0 0 0 0 0 0 0 0 0 0
57894- 0 0 0 0 0 0 0 0 0 0 0 0
57895- 0 0 0 0 0 0 0 0 0 0 0 0
57896- 0 0 0 0 0 0 0 0 0 0 0 0
57897- 0 0 0 0 0 0 6 6 6 26 26 26
57898- 62 62 62 106 106 106 74 54 14 185 133 11
57899-210 162 10 121 92 8 6 6 6 62 62 62
57900-238 238 238 253 253 253 253 253 253 253 253 253
57901-253 253 253 253 253 253 253 253 253 253 253 253
57902-253 253 253 253 253 253 231 231 231 246 246 246
57903-253 253 253 253 253 253 253 253 253 253 253 253
57904-253 253 253 253 253 253 253 253 253 253 253 253
57905-253 253 253 253 253 253 253 253 253 253 253 253
57906-253 253 253 253 253 253 253 253 253 253 253 253
57907-253 253 253 253 253 253 158 158 158 18 18 18
57908- 14 14 14 2 2 6 2 2 6 2 2 6
57909- 6 6 6 18 18 18 66 66 66 38 38 38
57910- 6 6 6 94 94 94 50 50 50 18 18 18
57911- 6 6 6 0 0 0 0 0 0 0 0 0
57912- 0 0 0 0 0 0 0 0 0 0 0 0
57913- 0 0 0 0 0 0 0 0 0 0 0 0
57914- 0 0 0 0 0 0 0 0 0 0 0 0
57915- 0 0 0 0 0 0 0 0 0 0 0 0
57916- 0 0 0 0 0 0 0 0 0 6 6 6
57917- 10 10 10 10 10 10 18 18 18 38 38 38
57918- 78 78 78 142 134 106 216 158 10 242 186 14
57919-246 190 14 246 190 14 156 118 10 10 10 10
57920- 90 90 90 238 238 238 253 253 253 253 253 253
57921-253 253 253 253 253 253 253 253 253 253 253 253
57922-253 253 253 253 253 253 231 231 231 250 250 250
57923-253 253 253 253 253 253 253 253 253 253 253 253
57924-253 253 253 253 253 253 253 253 253 253 253 253
57925-253 253 253 253 253 253 253 253 253 253 253 253
57926-253 253 253 253 253 253 253 253 253 246 230 190
57927-238 204 91 238 204 91 181 142 44 37 26 9
57928- 2 2 6 2 2 6 2 2 6 2 2 6
57929- 2 2 6 2 2 6 38 38 38 46 46 46
57930- 26 26 26 106 106 106 54 54 54 18 18 18
57931- 6 6 6 0 0 0 0 0 0 0 0 0
57932- 0 0 0 0 0 0 0 0 0 0 0 0
57933- 0 0 0 0 0 0 0 0 0 0 0 0
57934- 0 0 0 0 0 0 0 0 0 0 0 0
57935- 0 0 0 0 0 0 0 0 0 0 0 0
57936- 0 0 0 6 6 6 14 14 14 22 22 22
57937- 30 30 30 38 38 38 50 50 50 70 70 70
57938-106 106 106 190 142 34 226 170 11 242 186 14
57939-246 190 14 246 190 14 246 190 14 154 114 10
57940- 6 6 6 74 74 74 226 226 226 253 253 253
57941-253 253 253 253 253 253 253 253 253 253 253 253
57942-253 253 253 253 253 253 231 231 231 250 250 250
57943-253 253 253 253 253 253 253 253 253 253 253 253
57944-253 253 253 253 253 253 253 253 253 253 253 253
57945-253 253 253 253 253 253 253 253 253 253 253 253
57946-253 253 253 253 253 253 253 253 253 228 184 62
57947-241 196 14 241 208 19 232 195 16 38 30 10
57948- 2 2 6 2 2 6 2 2 6 2 2 6
57949- 2 2 6 6 6 6 30 30 30 26 26 26
57950-203 166 17 154 142 90 66 66 66 26 26 26
57951- 6 6 6 0 0 0 0 0 0 0 0 0
57952- 0 0 0 0 0 0 0 0 0 0 0 0
57953- 0 0 0 0 0 0 0 0 0 0 0 0
57954- 0 0 0 0 0 0 0 0 0 0 0 0
57955- 0 0 0 0 0 0 0 0 0 0 0 0
57956- 6 6 6 18 18 18 38 38 38 58 58 58
57957- 78 78 78 86 86 86 101 101 101 123 123 123
57958-175 146 61 210 150 10 234 174 13 246 186 14
57959-246 190 14 246 190 14 246 190 14 238 190 10
57960-102 78 10 2 2 6 46 46 46 198 198 198
57961-253 253 253 253 253 253 253 253 253 253 253 253
57962-253 253 253 253 253 253 234 234 234 242 242 242
57963-253 253 253 253 253 253 253 253 253 253 253 253
57964-253 253 253 253 253 253 253 253 253 253 253 253
57965-253 253 253 253 253 253 253 253 253 253 253 253
57966-253 253 253 253 253 253 253 253 253 224 178 62
57967-242 186 14 241 196 14 210 166 10 22 18 6
57968- 2 2 6 2 2 6 2 2 6 2 2 6
57969- 2 2 6 2 2 6 6 6 6 121 92 8
57970-238 202 15 232 195 16 82 82 82 34 34 34
57971- 10 10 10 0 0 0 0 0 0 0 0 0
57972- 0 0 0 0 0 0 0 0 0 0 0 0
57973- 0 0 0 0 0 0 0 0 0 0 0 0
57974- 0 0 0 0 0 0 0 0 0 0 0 0
57975- 0 0 0 0 0 0 0 0 0 0 0 0
57976- 14 14 14 38 38 38 70 70 70 154 122 46
57977-190 142 34 200 144 11 197 138 11 197 138 11
57978-213 154 11 226 170 11 242 186 14 246 190 14
57979-246 190 14 246 190 14 246 190 14 246 190 14
57980-225 175 15 46 32 6 2 2 6 22 22 22
57981-158 158 158 250 250 250 253 253 253 253 253 253
57982-253 253 253 253 253 253 253 253 253 253 253 253
57983-253 253 253 253 253 253 253 253 253 253 253 253
57984-253 253 253 253 253 253 253 253 253 253 253 253
57985-253 253 253 253 253 253 253 253 253 253 253 253
57986-253 253 253 250 250 250 242 242 242 224 178 62
57987-239 182 13 236 186 11 213 154 11 46 32 6
57988- 2 2 6 2 2 6 2 2 6 2 2 6
57989- 2 2 6 2 2 6 61 42 6 225 175 15
57990-238 190 10 236 186 11 112 100 78 42 42 42
57991- 14 14 14 0 0 0 0 0 0 0 0 0
57992- 0 0 0 0 0 0 0 0 0 0 0 0
57993- 0 0 0 0 0 0 0 0 0 0 0 0
57994- 0 0 0 0 0 0 0 0 0 0 0 0
57995- 0 0 0 0 0 0 0 0 0 6 6 6
57996- 22 22 22 54 54 54 154 122 46 213 154 11
57997-226 170 11 230 174 11 226 170 11 226 170 11
57998-236 178 12 242 186 14 246 190 14 246 190 14
57999-246 190 14 246 190 14 246 190 14 246 190 14
58000-241 196 14 184 144 12 10 10 10 2 2 6
58001- 6 6 6 116 116 116 242 242 242 253 253 253
58002-253 253 253 253 253 253 253 253 253 253 253 253
58003-253 253 253 253 253 253 253 253 253 253 253 253
58004-253 253 253 253 253 253 253 253 253 253 253 253
58005-253 253 253 253 253 253 253 253 253 253 253 253
58006-253 253 253 231 231 231 198 198 198 214 170 54
58007-236 178 12 236 178 12 210 150 10 137 92 6
58008- 18 14 6 2 2 6 2 2 6 2 2 6
58009- 6 6 6 70 47 6 200 144 11 236 178 12
58010-239 182 13 239 182 13 124 112 88 58 58 58
58011- 22 22 22 6 6 6 0 0 0 0 0 0
58012- 0 0 0 0 0 0 0 0 0 0 0 0
58013- 0 0 0 0 0 0 0 0 0 0 0 0
58014- 0 0 0 0 0 0 0 0 0 0 0 0
58015- 0 0 0 0 0 0 0 0 0 10 10 10
58016- 30 30 30 70 70 70 180 133 36 226 170 11
58017-239 182 13 242 186 14 242 186 14 246 186 14
58018-246 190 14 246 190 14 246 190 14 246 190 14
58019-246 190 14 246 190 14 246 190 14 246 190 14
58020-246 190 14 232 195 16 98 70 6 2 2 6
58021- 2 2 6 2 2 6 66 66 66 221 221 221
58022-253 253 253 253 253 253 253 253 253 253 253 253
58023-253 253 253 253 253 253 253 253 253 253 253 253
58024-253 253 253 253 253 253 253 253 253 253 253 253
58025-253 253 253 253 253 253 253 253 253 253 253 253
58026-253 253 253 206 206 206 198 198 198 214 166 58
58027-230 174 11 230 174 11 216 158 10 192 133 9
58028-163 110 8 116 81 8 102 78 10 116 81 8
58029-167 114 7 197 138 11 226 170 11 239 182 13
58030-242 186 14 242 186 14 162 146 94 78 78 78
58031- 34 34 34 14 14 14 6 6 6 0 0 0
58032- 0 0 0 0 0 0 0 0 0 0 0 0
58033- 0 0 0 0 0 0 0 0 0 0 0 0
58034- 0 0 0 0 0 0 0 0 0 0 0 0
58035- 0 0 0 0 0 0 0 0 0 6 6 6
58036- 30 30 30 78 78 78 190 142 34 226 170 11
58037-239 182 13 246 190 14 246 190 14 246 190 14
58038-246 190 14 246 190 14 246 190 14 246 190 14
58039-246 190 14 246 190 14 246 190 14 246 190 14
58040-246 190 14 241 196 14 203 166 17 22 18 6
58041- 2 2 6 2 2 6 2 2 6 38 38 38
58042-218 218 218 253 253 253 253 253 253 253 253 253
58043-253 253 253 253 253 253 253 253 253 253 253 253
58044-253 253 253 253 253 253 253 253 253 253 253 253
58045-253 253 253 253 253 253 253 253 253 253 253 253
58046-250 250 250 206 206 206 198 198 198 202 162 69
58047-226 170 11 236 178 12 224 166 10 210 150 10
58048-200 144 11 197 138 11 192 133 9 197 138 11
58049-210 150 10 226 170 11 242 186 14 246 190 14
58050-246 190 14 246 186 14 225 175 15 124 112 88
58051- 62 62 62 30 30 30 14 14 14 6 6 6
58052- 0 0 0 0 0 0 0 0 0 0 0 0
58053- 0 0 0 0 0 0 0 0 0 0 0 0
58054- 0 0 0 0 0 0 0 0 0 0 0 0
58055- 0 0 0 0 0 0 0 0 0 10 10 10
58056- 30 30 30 78 78 78 174 135 50 224 166 10
58057-239 182 13 246 190 14 246 190 14 246 190 14
58058-246 190 14 246 190 14 246 190 14 246 190 14
58059-246 190 14 246 190 14 246 190 14 246 190 14
58060-246 190 14 246 190 14 241 196 14 139 102 15
58061- 2 2 6 2 2 6 2 2 6 2 2 6
58062- 78 78 78 250 250 250 253 253 253 253 253 253
58063-253 253 253 253 253 253 253 253 253 253 253 253
58064-253 253 253 253 253 253 253 253 253 253 253 253
58065-253 253 253 253 253 253 253 253 253 253 253 253
58066-250 250 250 214 214 214 198 198 198 190 150 46
58067-219 162 10 236 178 12 234 174 13 224 166 10
58068-216 158 10 213 154 11 213 154 11 216 158 10
58069-226 170 11 239 182 13 246 190 14 246 190 14
58070-246 190 14 246 190 14 242 186 14 206 162 42
58071-101 101 101 58 58 58 30 30 30 14 14 14
58072- 6 6 6 0 0 0 0 0 0 0 0 0
58073- 0 0 0 0 0 0 0 0 0 0 0 0
58074- 0 0 0 0 0 0 0 0 0 0 0 0
58075- 0 0 0 0 0 0 0 0 0 10 10 10
58076- 30 30 30 74 74 74 174 135 50 216 158 10
58077-236 178 12 246 190 14 246 190 14 246 190 14
58078-246 190 14 246 190 14 246 190 14 246 190 14
58079-246 190 14 246 190 14 246 190 14 246 190 14
58080-246 190 14 246 190 14 241 196 14 226 184 13
58081- 61 42 6 2 2 6 2 2 6 2 2 6
58082- 22 22 22 238 238 238 253 253 253 253 253 253
58083-253 253 253 253 253 253 253 253 253 253 253 253
58084-253 253 253 253 253 253 253 253 253 253 253 253
58085-253 253 253 253 253 253 253 253 253 253 253 253
58086-253 253 253 226 226 226 187 187 187 180 133 36
58087-216 158 10 236 178 12 239 182 13 236 178 12
58088-230 174 11 226 170 11 226 170 11 230 174 11
58089-236 178 12 242 186 14 246 190 14 246 190 14
58090-246 190 14 246 190 14 246 186 14 239 182 13
58091-206 162 42 106 106 106 66 66 66 34 34 34
58092- 14 14 14 6 6 6 0 0 0 0 0 0
58093- 0 0 0 0 0 0 0 0 0 0 0 0
58094- 0 0 0 0 0 0 0 0 0 0 0 0
58095- 0 0 0 0 0 0 0 0 0 6 6 6
58096- 26 26 26 70 70 70 163 133 67 213 154 11
58097-236 178 12 246 190 14 246 190 14 246 190 14
58098-246 190 14 246 190 14 246 190 14 246 190 14
58099-246 190 14 246 190 14 246 190 14 246 190 14
58100-246 190 14 246 190 14 246 190 14 241 196 14
58101-190 146 13 18 14 6 2 2 6 2 2 6
58102- 46 46 46 246 246 246 253 253 253 253 253 253
58103-253 253 253 253 253 253 253 253 253 253 253 253
58104-253 253 253 253 253 253 253 253 253 253 253 253
58105-253 253 253 253 253 253 253 253 253 253 253 253
58106-253 253 253 221 221 221 86 86 86 156 107 11
58107-216 158 10 236 178 12 242 186 14 246 186 14
58108-242 186 14 239 182 13 239 182 13 242 186 14
58109-242 186 14 246 186 14 246 190 14 246 190 14
58110-246 190 14 246 190 14 246 190 14 246 190 14
58111-242 186 14 225 175 15 142 122 72 66 66 66
58112- 30 30 30 10 10 10 0 0 0 0 0 0
58113- 0 0 0 0 0 0 0 0 0 0 0 0
58114- 0 0 0 0 0 0 0 0 0 0 0 0
58115- 0 0 0 0 0 0 0 0 0 6 6 6
58116- 26 26 26 70 70 70 163 133 67 210 150 10
58117-236 178 12 246 190 14 246 190 14 246 190 14
58118-246 190 14 246 190 14 246 190 14 246 190 14
58119-246 190 14 246 190 14 246 190 14 246 190 14
58120-246 190 14 246 190 14 246 190 14 246 190 14
58121-232 195 16 121 92 8 34 34 34 106 106 106
58122-221 221 221 253 253 253 253 253 253 253 253 253
58123-253 253 253 253 253 253 253 253 253 253 253 253
58124-253 253 253 253 253 253 253 253 253 253 253 253
58125-253 253 253 253 253 253 253 253 253 253 253 253
58126-242 242 242 82 82 82 18 14 6 163 110 8
58127-216 158 10 236 178 12 242 186 14 246 190 14
58128-246 190 14 246 190 14 246 190 14 246 190 14
58129-246 190 14 246 190 14 246 190 14 246 190 14
58130-246 190 14 246 190 14 246 190 14 246 190 14
58131-246 190 14 246 190 14 242 186 14 163 133 67
58132- 46 46 46 18 18 18 6 6 6 0 0 0
58133- 0 0 0 0 0 0 0 0 0 0 0 0
58134- 0 0 0 0 0 0 0 0 0 0 0 0
58135- 0 0 0 0 0 0 0 0 0 10 10 10
58136- 30 30 30 78 78 78 163 133 67 210 150 10
58137-236 178 12 246 186 14 246 190 14 246 190 14
58138-246 190 14 246 190 14 246 190 14 246 190 14
58139-246 190 14 246 190 14 246 190 14 246 190 14
58140-246 190 14 246 190 14 246 190 14 246 190 14
58141-241 196 14 215 174 15 190 178 144 253 253 253
58142-253 253 253 253 253 253 253 253 253 253 253 253
58143-253 253 253 253 253 253 253 253 253 253 253 253
58144-253 253 253 253 253 253 253 253 253 253 253 253
58145-253 253 253 253 253 253 253 253 253 218 218 218
58146- 58 58 58 2 2 6 22 18 6 167 114 7
58147-216 158 10 236 178 12 246 186 14 246 190 14
58148-246 190 14 246 190 14 246 190 14 246 190 14
58149-246 190 14 246 190 14 246 190 14 246 190 14
58150-246 190 14 246 190 14 246 190 14 246 190 14
58151-246 190 14 246 186 14 242 186 14 190 150 46
58152- 54 54 54 22 22 22 6 6 6 0 0 0
58153- 0 0 0 0 0 0 0 0 0 0 0 0
58154- 0 0 0 0 0 0 0 0 0 0 0 0
58155- 0 0 0 0 0 0 0 0 0 14 14 14
58156- 38 38 38 86 86 86 180 133 36 213 154 11
58157-236 178 12 246 186 14 246 190 14 246 190 14
58158-246 190 14 246 190 14 246 190 14 246 190 14
58159-246 190 14 246 190 14 246 190 14 246 190 14
58160-246 190 14 246 190 14 246 190 14 246 190 14
58161-246 190 14 232 195 16 190 146 13 214 214 214
58162-253 253 253 253 253 253 253 253 253 253 253 253
58163-253 253 253 253 253 253 253 253 253 253 253 253
58164-253 253 253 253 253 253 253 253 253 253 253 253
58165-253 253 253 250 250 250 170 170 170 26 26 26
58166- 2 2 6 2 2 6 37 26 9 163 110 8
58167-219 162 10 239 182 13 246 186 14 246 190 14
58168-246 190 14 246 190 14 246 190 14 246 190 14
58169-246 190 14 246 190 14 246 190 14 246 190 14
58170-246 190 14 246 190 14 246 190 14 246 190 14
58171-246 186 14 236 178 12 224 166 10 142 122 72
58172- 46 46 46 18 18 18 6 6 6 0 0 0
58173- 0 0 0 0 0 0 0 0 0 0 0 0
58174- 0 0 0 0 0 0 0 0 0 0 0 0
58175- 0 0 0 0 0 0 6 6 6 18 18 18
58176- 50 50 50 109 106 95 192 133 9 224 166 10
58177-242 186 14 246 190 14 246 190 14 246 190 14
58178-246 190 14 246 190 14 246 190 14 246 190 14
58179-246 190 14 246 190 14 246 190 14 246 190 14
58180-246 190 14 246 190 14 246 190 14 246 190 14
58181-242 186 14 226 184 13 210 162 10 142 110 46
58182-226 226 226 253 253 253 253 253 253 253 253 253
58183-253 253 253 253 253 253 253 253 253 253 253 253
58184-253 253 253 253 253 253 253 253 253 253 253 253
58185-198 198 198 66 66 66 2 2 6 2 2 6
58186- 2 2 6 2 2 6 50 34 6 156 107 11
58187-219 162 10 239 182 13 246 186 14 246 190 14
58188-246 190 14 246 190 14 246 190 14 246 190 14
58189-246 190 14 246 190 14 246 190 14 246 190 14
58190-246 190 14 246 190 14 246 190 14 242 186 14
58191-234 174 13 213 154 11 154 122 46 66 66 66
58192- 30 30 30 10 10 10 0 0 0 0 0 0
58193- 0 0 0 0 0 0 0 0 0 0 0 0
58194- 0 0 0 0 0 0 0 0 0 0 0 0
58195- 0 0 0 0 0 0 6 6 6 22 22 22
58196- 58 58 58 154 121 60 206 145 10 234 174 13
58197-242 186 14 246 186 14 246 190 14 246 190 14
58198-246 190 14 246 190 14 246 190 14 246 190 14
58199-246 190 14 246 190 14 246 190 14 246 190 14
58200-246 190 14 246 190 14 246 190 14 246 190 14
58201-246 186 14 236 178 12 210 162 10 163 110 8
58202- 61 42 6 138 138 138 218 218 218 250 250 250
58203-253 253 253 253 253 253 253 253 253 250 250 250
58204-242 242 242 210 210 210 144 144 144 66 66 66
58205- 6 6 6 2 2 6 2 2 6 2 2 6
58206- 2 2 6 2 2 6 61 42 6 163 110 8
58207-216 158 10 236 178 12 246 190 14 246 190 14
58208-246 190 14 246 190 14 246 190 14 246 190 14
58209-246 190 14 246 190 14 246 190 14 246 190 14
58210-246 190 14 239 182 13 230 174 11 216 158 10
58211-190 142 34 124 112 88 70 70 70 38 38 38
58212- 18 18 18 6 6 6 0 0 0 0 0 0
58213- 0 0 0 0 0 0 0 0 0 0 0 0
58214- 0 0 0 0 0 0 0 0 0 0 0 0
58215- 0 0 0 0 0 0 6 6 6 22 22 22
58216- 62 62 62 168 124 44 206 145 10 224 166 10
58217-236 178 12 239 182 13 242 186 14 242 186 14
58218-246 186 14 246 190 14 246 190 14 246 190 14
58219-246 190 14 246 190 14 246 190 14 246 190 14
58220-246 190 14 246 190 14 246 190 14 246 190 14
58221-246 190 14 236 178 12 216 158 10 175 118 6
58222- 80 54 7 2 2 6 6 6 6 30 30 30
58223- 54 54 54 62 62 62 50 50 50 38 38 38
58224- 14 14 14 2 2 6 2 2 6 2 2 6
58225- 2 2 6 2 2 6 2 2 6 2 2 6
58226- 2 2 6 6 6 6 80 54 7 167 114 7
58227-213 154 11 236 178 12 246 190 14 246 190 14
58228-246 190 14 246 190 14 246 190 14 246 190 14
58229-246 190 14 242 186 14 239 182 13 239 182 13
58230-230 174 11 210 150 10 174 135 50 124 112 88
58231- 82 82 82 54 54 54 34 34 34 18 18 18
58232- 6 6 6 0 0 0 0 0 0 0 0 0
58233- 0 0 0 0 0 0 0 0 0 0 0 0
58234- 0 0 0 0 0 0 0 0 0 0 0 0
58235- 0 0 0 0 0 0 6 6 6 18 18 18
58236- 50 50 50 158 118 36 192 133 9 200 144 11
58237-216 158 10 219 162 10 224 166 10 226 170 11
58238-230 174 11 236 178 12 239 182 13 239 182 13
58239-242 186 14 246 186 14 246 190 14 246 190 14
58240-246 190 14 246 190 14 246 190 14 246 190 14
58241-246 186 14 230 174 11 210 150 10 163 110 8
58242-104 69 6 10 10 10 2 2 6 2 2 6
58243- 2 2 6 2 2 6 2 2 6 2 2 6
58244- 2 2 6 2 2 6 2 2 6 2 2 6
58245- 2 2 6 2 2 6 2 2 6 2 2 6
58246- 2 2 6 6 6 6 91 60 6 167 114 7
58247-206 145 10 230 174 11 242 186 14 246 190 14
58248-246 190 14 246 190 14 246 186 14 242 186 14
58249-239 182 13 230 174 11 224 166 10 213 154 11
58250-180 133 36 124 112 88 86 86 86 58 58 58
58251- 38 38 38 22 22 22 10 10 10 6 6 6
58252- 0 0 0 0 0 0 0 0 0 0 0 0
58253- 0 0 0 0 0 0 0 0 0 0 0 0
58254- 0 0 0 0 0 0 0 0 0 0 0 0
58255- 0 0 0 0 0 0 0 0 0 14 14 14
58256- 34 34 34 70 70 70 138 110 50 158 118 36
58257-167 114 7 180 123 7 192 133 9 197 138 11
58258-200 144 11 206 145 10 213 154 11 219 162 10
58259-224 166 10 230 174 11 239 182 13 242 186 14
58260-246 186 14 246 186 14 246 186 14 246 186 14
58261-239 182 13 216 158 10 185 133 11 152 99 6
58262-104 69 6 18 14 6 2 2 6 2 2 6
58263- 2 2 6 2 2 6 2 2 6 2 2 6
58264- 2 2 6 2 2 6 2 2 6 2 2 6
58265- 2 2 6 2 2 6 2 2 6 2 2 6
58266- 2 2 6 6 6 6 80 54 7 152 99 6
58267-192 133 9 219 162 10 236 178 12 239 182 13
58268-246 186 14 242 186 14 239 182 13 236 178 12
58269-224 166 10 206 145 10 192 133 9 154 121 60
58270- 94 94 94 62 62 62 42 42 42 22 22 22
58271- 14 14 14 6 6 6 0 0 0 0 0 0
58272- 0 0 0 0 0 0 0 0 0 0 0 0
58273- 0 0 0 0 0 0 0 0 0 0 0 0
58274- 0 0 0 0 0 0 0 0 0 0 0 0
58275- 0 0 0 0 0 0 0 0 0 6 6 6
58276- 18 18 18 34 34 34 58 58 58 78 78 78
58277-101 98 89 124 112 88 142 110 46 156 107 11
58278-163 110 8 167 114 7 175 118 6 180 123 7
58279-185 133 11 197 138 11 210 150 10 219 162 10
58280-226 170 11 236 178 12 236 178 12 234 174 13
58281-219 162 10 197 138 11 163 110 8 130 83 6
58282- 91 60 6 10 10 10 2 2 6 2 2 6
58283- 18 18 18 38 38 38 38 38 38 38 38 38
58284- 38 38 38 38 38 38 38 38 38 38 38 38
58285- 38 38 38 38 38 38 26 26 26 2 2 6
58286- 2 2 6 6 6 6 70 47 6 137 92 6
58287-175 118 6 200 144 11 219 162 10 230 174 11
58288-234 174 13 230 174 11 219 162 10 210 150 10
58289-192 133 9 163 110 8 124 112 88 82 82 82
58290- 50 50 50 30 30 30 14 14 14 6 6 6
58291- 0 0 0 0 0 0 0 0 0 0 0 0
58292- 0 0 0 0 0 0 0 0 0 0 0 0
58293- 0 0 0 0 0 0 0 0 0 0 0 0
58294- 0 0 0 0 0 0 0 0 0 0 0 0
58295- 0 0 0 0 0 0 0 0 0 0 0 0
58296- 6 6 6 14 14 14 22 22 22 34 34 34
58297- 42 42 42 58 58 58 74 74 74 86 86 86
58298-101 98 89 122 102 70 130 98 46 121 87 25
58299-137 92 6 152 99 6 163 110 8 180 123 7
58300-185 133 11 197 138 11 206 145 10 200 144 11
58301-180 123 7 156 107 11 130 83 6 104 69 6
58302- 50 34 6 54 54 54 110 110 110 101 98 89
58303- 86 86 86 82 82 82 78 78 78 78 78 78
58304- 78 78 78 78 78 78 78 78 78 78 78 78
58305- 78 78 78 82 82 82 86 86 86 94 94 94
58306-106 106 106 101 101 101 86 66 34 124 80 6
58307-156 107 11 180 123 7 192 133 9 200 144 11
58308-206 145 10 200 144 11 192 133 9 175 118 6
58309-139 102 15 109 106 95 70 70 70 42 42 42
58310- 22 22 22 10 10 10 0 0 0 0 0 0
58311- 0 0 0 0 0 0 0 0 0 0 0 0
58312- 0 0 0 0 0 0 0 0 0 0 0 0
58313- 0 0 0 0 0 0 0 0 0 0 0 0
58314- 0 0 0 0 0 0 0 0 0 0 0 0
58315- 0 0 0 0 0 0 0 0 0 0 0 0
58316- 0 0 0 0 0 0 6 6 6 10 10 10
58317- 14 14 14 22 22 22 30 30 30 38 38 38
58318- 50 50 50 62 62 62 74 74 74 90 90 90
58319-101 98 89 112 100 78 121 87 25 124 80 6
58320-137 92 6 152 99 6 152 99 6 152 99 6
58321-138 86 6 124 80 6 98 70 6 86 66 30
58322-101 98 89 82 82 82 58 58 58 46 46 46
58323- 38 38 38 34 34 34 34 34 34 34 34 34
58324- 34 34 34 34 34 34 34 34 34 34 34 34
58325- 34 34 34 34 34 34 38 38 38 42 42 42
58326- 54 54 54 82 82 82 94 86 76 91 60 6
58327-134 86 6 156 107 11 167 114 7 175 118 6
58328-175 118 6 167 114 7 152 99 6 121 87 25
58329-101 98 89 62 62 62 34 34 34 18 18 18
58330- 6 6 6 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 0 0 0 0 0 0 0 0 0
58333- 0 0 0 0 0 0 0 0 0 0 0 0
58334- 0 0 0 0 0 0 0 0 0 0 0 0
58335- 0 0 0 0 0 0 0 0 0 0 0 0
58336- 0 0 0 0 0 0 0 0 0 0 0 0
58337- 0 0 0 6 6 6 6 6 6 10 10 10
58338- 18 18 18 22 22 22 30 30 30 42 42 42
58339- 50 50 50 66 66 66 86 86 86 101 98 89
58340-106 86 58 98 70 6 104 69 6 104 69 6
58341-104 69 6 91 60 6 82 62 34 90 90 90
58342- 62 62 62 38 38 38 22 22 22 14 14 14
58343- 10 10 10 10 10 10 10 10 10 10 10 10
58344- 10 10 10 10 10 10 6 6 6 10 10 10
58345- 10 10 10 10 10 10 10 10 10 14 14 14
58346- 22 22 22 42 42 42 70 70 70 89 81 66
58347- 80 54 7 104 69 6 124 80 6 137 92 6
58348-134 86 6 116 81 8 100 82 52 86 86 86
58349- 58 58 58 30 30 30 14 14 14 6 6 6
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- 0 0 0 0 0 0 0 0 0 0 0 0
58354- 0 0 0 0 0 0 0 0 0 0 0 0
58355- 0 0 0 0 0 0 0 0 0 0 0 0
58356- 0 0 0 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 6 6 6 10 10 10 14 14 14
58359- 18 18 18 26 26 26 38 38 38 54 54 54
58360- 70 70 70 86 86 86 94 86 76 89 81 66
58361- 89 81 66 86 86 86 74 74 74 50 50 50
58362- 30 30 30 14 14 14 6 6 6 0 0 0
58363- 0 0 0 0 0 0 0 0 0 0 0 0
58364- 0 0 0 0 0 0 0 0 0 0 0 0
58365- 0 0 0 0 0 0 0 0 0 0 0 0
58366- 6 6 6 18 18 18 34 34 34 58 58 58
58367- 82 82 82 89 81 66 89 81 66 89 81 66
58368- 94 86 66 94 86 76 74 74 74 50 50 50
58369- 26 26 26 14 14 14 6 6 6 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 0 0 0
58374- 0 0 0 0 0 0 0 0 0 0 0 0
58375- 0 0 0 0 0 0 0 0 0 0 0 0
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- 6 6 6 6 6 6 14 14 14 18 18 18
58380- 30 30 30 38 38 38 46 46 46 54 54 54
58381- 50 50 50 42 42 42 30 30 30 18 18 18
58382- 10 10 10 0 0 0 0 0 0 0 0 0
58383- 0 0 0 0 0 0 0 0 0 0 0 0
58384- 0 0 0 0 0 0 0 0 0 0 0 0
58385- 0 0 0 0 0 0 0 0 0 0 0 0
58386- 0 0 0 6 6 6 14 14 14 26 26 26
58387- 38 38 38 50 50 50 58 58 58 58 58 58
58388- 54 54 54 42 42 42 30 30 30 18 18 18
58389- 10 10 10 0 0 0 0 0 0 0 0 0
58390- 0 0 0 0 0 0 0 0 0 0 0 0
58391- 0 0 0 0 0 0 0 0 0 0 0 0
58392- 0 0 0 0 0 0 0 0 0 0 0 0
58393- 0 0 0 0 0 0 0 0 0 0 0 0
58394- 0 0 0 0 0 0 0 0 0 0 0 0
58395- 0 0 0 0 0 0 0 0 0 0 0 0
58396- 0 0 0 0 0 0 0 0 0 0 0 0
58397- 0 0 0 0 0 0 0 0 0 0 0 0
58398- 0 0 0 0 0 0 0 0 0 0 0 0
58399- 0 0 0 0 0 0 0 0 0 6 6 6
58400- 6 6 6 10 10 10 14 14 14 18 18 18
58401- 18 18 18 14 14 14 10 10 10 6 6 6
58402- 0 0 0 0 0 0 0 0 0 0 0 0
58403- 0 0 0 0 0 0 0 0 0 0 0 0
58404- 0 0 0 0 0 0 0 0 0 0 0 0
58405- 0 0 0 0 0 0 0 0 0 0 0 0
58406- 0 0 0 0 0 0 0 0 0 6 6 6
58407- 14 14 14 18 18 18 22 22 22 22 22 22
58408- 18 18 18 14 14 14 10 10 10 6 6 6
58409- 0 0 0 0 0 0 0 0 0 0 0 0
58410- 0 0 0 0 0 0 0 0 0 0 0 0
58411- 0 0 0 0 0 0 0 0 0 0 0 0
58412- 0 0 0 0 0 0 0 0 0 0 0 0
58413- 0 0 0 0 0 0 0 0 0 0 0 0
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 4 4 4 4 4 4 4 4 4 4 4 4
58416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58418+4 4 4 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
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 4 4 4 4 4 4 4 4 4 4 4 4
58430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
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 4 4 4 4 4 4 4 4 4 4 4 4
58444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58445+4 4 4 4 4 4 4 4 4 4 4 4 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
58456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58458+4 4 4 4 4 4 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
58470+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58472+4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4
58477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58483+4 4 4 4 4 4
58484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58486+4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58497+4 4 4 4 4 4
58498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58500+4 4 4 4 4 4 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 3 3 3 0 0 0 0 0 0
58503+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58507+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58508+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58509+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
58510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58511+4 4 4 4 4 4
58512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58514+4 4 4 4 4 4 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 2 2 2 0 0 0 3 4 3 26 28 28
58517+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58518+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58521+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58522+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58523+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58524+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58525+4 4 4 4 4 4
58526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58528+4 4 4 4 4 4 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+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58531+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58532+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58534+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58535+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
58536+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58537+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58538+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58539+4 4 4 4 4 4
58540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58542+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58543+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
58544+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58545+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58546+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
58547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58548+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58549+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58550+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58551+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58552+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58553+4 4 4 4 4 4
58554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58555+4 4 4 4 4 4 4 4 4 4 4 4 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 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58558+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58559+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58560+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58561+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58562+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58563+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58564+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58565+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58566+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58567+4 4 4 4 4 4
58568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58570+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58571+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58572+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58573+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58574+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58575+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58576+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58577+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58578+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58579+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58580+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58581+4 4 4 4 4 4
58582+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58584+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
58585+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58586+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58587+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58588+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58589+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58590+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58591+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58592+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58593+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58594+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58595+4 4 4 4 4 4
58596+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58598+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
58599+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58600+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58601+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58602+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58603+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58604+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58605+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58606+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58607+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58608+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58609+4 4 4 4 4 4
58610+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58612+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58613+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58614+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58615+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58616+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58617+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58618+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58619+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58620+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58621+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58622+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58623+4 4 4 4 4 4
58624+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58625+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58626+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58627+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58628+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58629+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58630+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58631+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58632+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58633+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58634+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58635+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58636+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58637+4 4 4 4 4 4
58638+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58639+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58640+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58641+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58642+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58643+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58644+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58645+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58646+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58647+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58648+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58649+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58650+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58651+4 4 4 4 4 4
58652+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58653+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58654+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58655+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58656+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58657+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58658+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58659+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58660+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58661+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58662+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58663+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58664+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58665+0 0 0 4 4 4
58666+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58667+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58668+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58669+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58670+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58671+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58672+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58673+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58674+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58675+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58676+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58677+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58678+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58679+2 0 0 0 0 0
58680+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58681+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58682+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58683+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58684+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58685+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58686+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58687+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58688+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58689+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58690+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58691+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58692+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58693+37 38 37 0 0 0
58694+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58695+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58696+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58697+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58698+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58699+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58700+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58701+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58702+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58703+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58704+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58705+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58706+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58707+85 115 134 4 0 0
58708+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58709+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58710+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58711+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58712+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58713+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58714+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58715+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58716+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58717+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58718+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58719+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58720+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58721+60 73 81 4 0 0
58722+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58723+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58724+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58725+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58726+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58727+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58728+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58729+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58730+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58731+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58732+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58733+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58734+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58735+16 19 21 4 0 0
58736+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58737+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58738+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58739+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58740+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58741+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58742+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58743+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58744+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58745+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58746+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58747+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58748+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58749+4 0 0 4 3 3
58750+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58751+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58752+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58754+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58755+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58756+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58757+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58758+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58759+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58760+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58761+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58762+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58763+3 2 2 4 4 4
58764+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58765+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58766+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58767+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58768+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58769+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58770+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58771+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58772+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58773+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58774+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58775+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58776+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58777+4 4 4 4 4 4
58778+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58779+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58780+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58781+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58782+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58783+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58784+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58785+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58786+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58787+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58788+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58789+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58790+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58791+4 4 4 4 4 4
58792+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58793+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
58794+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
58795+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
58796+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
58797+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58798+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
58799+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
58800+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
58801+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
58802+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
58803+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
58804+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
58805+5 5 5 5 5 5
58806+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
58807+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
58808+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
58809+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
58810+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
58811+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58812+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
58813+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
58814+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
58815+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
58816+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
58817+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
58818+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58819+5 5 5 4 4 4
58820+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
58821+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
58822+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
58823+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
58824+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58825+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
58826+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
58827+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
58828+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
58829+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
58830+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
58831+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58833+4 4 4 4 4 4
58834+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
58835+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
58836+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
58837+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
58838+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
58839+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58840+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58841+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
58842+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
58843+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
58844+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
58845+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
58846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58847+4 4 4 4 4 4
58848+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
58849+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
58850+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
58851+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
58852+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58853+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
58854+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
58855+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
58856+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
58857+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
58858+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
58859+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58861+4 4 4 4 4 4
58862+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
58863+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
58864+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
58865+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
58866+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58867+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58868+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58869+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
58870+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
58871+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
58872+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
58873+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58874+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58875+4 4 4 4 4 4
58876+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
58877+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
58878+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
58879+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
58880+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58881+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
58882+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58883+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
58884+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
58885+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
58886+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58887+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58888+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58889+4 4 4 4 4 4
58890+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
58891+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
58892+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
58893+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
58894+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58895+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
58896+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
58897+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
58898+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
58899+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
58900+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
58901+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58902+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58903+4 4 4 4 4 4
58904+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
58905+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
58906+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
58907+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
58908+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58909+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
58910+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
58911+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
58912+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
58913+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
58914+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
58915+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58916+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58917+4 4 4 4 4 4
58918+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
58919+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
58920+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
58921+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58922+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
58923+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
58924+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
58925+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
58926+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
58927+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
58928+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58929+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58930+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58931+4 4 4 4 4 4
58932+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
58933+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
58934+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
58935+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58936+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58937+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
58938+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
58939+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
58940+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
58941+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
58942+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58943+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58944+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58945+4 4 4 4 4 4
58946+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
58947+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
58948+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58949+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58950+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58951+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
58952+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
58953+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
58954+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
58955+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
58956+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58957+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58958+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58959+4 4 4 4 4 4
58960+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
58961+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
58962+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58963+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58964+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58965+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
58966+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
58967+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
58968+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58969+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58970+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58971+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58972+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58973+4 4 4 4 4 4
58974+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58975+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
58976+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58977+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
58978+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
58979+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
58980+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
58981+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
58982+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58983+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58984+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58985+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58986+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58987+4 4 4 4 4 4
58988+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58989+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
58990+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58991+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
58992+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58993+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
58994+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
58995+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
58996+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58997+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58998+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58999+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59000+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59001+4 4 4 4 4 4
59002+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
59003+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
59004+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59005+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
59006+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
59007+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
59008+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
59009+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
59010+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59011+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59012+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59013+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59014+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59015+4 4 4 4 4 4
59016+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
59017+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
59018+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59019+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
59020+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
59021+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
59022+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
59023+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
59024+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59025+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59026+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59027+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59028+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59029+4 4 4 4 4 4
59030+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59031+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
59032+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59033+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
59034+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
59035+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
59036+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
59037+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
59038+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59039+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59040+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59041+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59042+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59043+4 4 4 4 4 4
59044+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
59045+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
59046+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59047+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
59048+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
59049+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
59050+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
59051+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
59052+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
59053+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59054+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59055+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59056+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59057+4 4 4 4 4 4
59058+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59059+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
59060+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
59061+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
59062+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
59063+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
59064+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
59065+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
59066+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59067+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59068+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59069+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59070+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59071+4 4 4 4 4 4
59072+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59073+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
59074+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59075+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
59076+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
59077+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
59078+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
59079+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
59080+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59081+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59082+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59083+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59085+4 4 4 4 4 4
59086+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59087+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
59088+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
59089+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
59090+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
59091+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
59092+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59093+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
59094+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59095+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59096+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59097+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59098+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59099+4 4 4 4 4 4
59100+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59101+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
59102+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
59103+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59104+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
59105+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
59106+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59107+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
59108+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59109+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59110+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59111+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59112+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59113+4 4 4 4 4 4
59114+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59115+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
59116+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
59117+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
59118+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
59119+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
59120+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
59121+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
59122+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
59123+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59124+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59125+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59126+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59127+4 4 4 4 4 4
59128+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59129+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
59130+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
59131+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
59132+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
59133+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
59134+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
59135+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
59136+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
59137+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59138+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59139+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59140+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59141+4 4 4 4 4 4
59142+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59143+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59144+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59145+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59146+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59147+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59148+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59149+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59150+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59151+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59152+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59153+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59154+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59155+4 4 4 4 4 4
59156+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59157+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59158+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59159+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59160+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59161+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59162+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59163+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59164+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59165+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59166+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59167+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59168+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59169+4 4 4 4 4 4
59170+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59171+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59172+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59173+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59174+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59175+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59176+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59177+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59178+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59179+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59180+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59181+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59182+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59183+4 4 4 4 4 4
59184+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59185+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59186+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59187+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59188+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59189+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59190+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59191+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59192+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59193+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59194+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59195+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59196+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59197+4 4 4 4 4 4
59198+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59199+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59200+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59201+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59202+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59203+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59204+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59205+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59206+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59207+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59208+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59209+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59210+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59211+4 4 4 4 4 4
59212+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59213+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59214+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59215+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59216+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59217+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59218+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59219+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59220+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59221+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59222+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59223+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59224+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59225+4 4 4 4 4 4
59226+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59227+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59228+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59229+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59230+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59231+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59232+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59233+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59234+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59235+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
59236+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59237+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59238+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59239+4 4 4 4 4 4
59240+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59241+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59242+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59243+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59244+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59245+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59246+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59247+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59248+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59249+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59250+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59251+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59252+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59253+4 4 4 4 4 4
59254+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59255+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59256+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59257+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59258+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59259+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59260+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59261+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59262+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59263+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
59264+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59265+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59266+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59267+4 4 4 4 4 4
59268+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59269+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59270+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59271+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59272+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59273+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59274+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59275+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59276+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59277+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59278+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59279+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59280+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59281+4 4 4 4 4 4
59282+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59283+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59284+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59285+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59286+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59287+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59288+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59289+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59290+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
59291+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59292+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59293+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59294+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59295+4 4 4 4 4 4
59296+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59297+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59298+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59299+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59300+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59301+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59302+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59303+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59304+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
59305+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59306+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59307+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59308+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59309+4 4 4 4 4 4
59310+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59311+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59312+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59313+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59314+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59315+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59316+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59317+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59318+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59319+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59320+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59321+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59322+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59323+4 4 4 4 4 4
59324+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59325+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59326+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59327+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59328+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59329+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59330+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59331+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
59332+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59333+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59334+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59335+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59336+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59337+4 4 4 4 4 4
59338+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59339+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59340+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59341+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59342+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59343+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59344+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59345+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59346+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59347+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59348+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59349+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59350+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59351+4 4 4 4 4 4
59352+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59353+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59354+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59355+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59356+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59357+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59358+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59359+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
59360+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59361+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59362+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59363+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59364+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59365+4 4 4 4 4 4
59366+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59367+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59368+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59369+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59370+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59371+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59372+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59373+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
59374+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59375+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59376+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59377+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59378+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59379+4 4 4 4 4 4
59380+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59381+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59382+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59383+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59384+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59385+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59386+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59387+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59388+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59391+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59393+4 4 4 4 4 4
59394+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59395+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59396+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59397+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59398+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59399+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59400+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59401+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
59408+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59409+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59411+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59412+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59413+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59414+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
59415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
59422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59423+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59425+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59426+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59427+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59428+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
59429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
59436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59439+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59440+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59441+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59442+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
59443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59444+4 4 4 4 4 4 4 4 4 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
59450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59453+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59454+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59455+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59456+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
59457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59458+4 4 4 4 4 4 4 4 4 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
59464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59466+4 4 4 4 4 4 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 5 5 5
59468+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59469+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59470+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59472+4 4 4 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
59478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59480+4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59483+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59484+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
59485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
59492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59494+4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59497+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59498+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59499+4 4 4 4 4 4 4 4 4 4 4 4 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
59506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59510+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59511+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
59512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59519+4 4 4 4 4 4
59520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59522+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59524+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59525+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
59526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59533+4 4 4 4 4 4
59534diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59535index 3838795..0d48d61 100644
59536--- a/drivers/xen/events/events_base.c
59537+++ b/drivers/xen/events/events_base.c
59538@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59539 restore_pirqs();
59540 }
59541
59542-static struct irq_chip xen_dynamic_chip __read_mostly = {
59543+static struct irq_chip xen_dynamic_chip = {
59544 .name = "xen-dyn",
59545
59546 .irq_disable = disable_dynirq,
59547@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59548 .irq_retrigger = retrigger_dynirq,
59549 };
59550
59551-static struct irq_chip xen_pirq_chip __read_mostly = {
59552+static struct irq_chip xen_pirq_chip = {
59553 .name = "xen-pirq",
59554
59555 .irq_startup = startup_pirq,
59556@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59557 .irq_retrigger = retrigger_dynirq,
59558 };
59559
59560-static struct irq_chip xen_percpu_chip __read_mostly = {
59561+static struct irq_chip xen_percpu_chip = {
59562 .name = "xen-percpu",
59563
59564 .irq_disable = disable_dynirq,
59565diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
59566index 00f40f0..e3c0b15 100644
59567--- a/drivers/xen/evtchn.c
59568+++ b/drivers/xen/evtchn.c
59569@@ -201,8 +201,8 @@ static ssize_t evtchn_read(struct file *file, char __user *buf,
59570
59571 /* Byte lengths of two chunks. Chunk split (if any) is at ring wrap. */
59572 if (((c ^ p) & EVTCHN_RING_SIZE) != 0) {
59573- bytes1 = (EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c)) *
59574- sizeof(evtchn_port_t);
59575+ bytes1 = EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c);
59576+ bytes1 *= sizeof(evtchn_port_t);
59577 bytes2 = EVTCHN_RING_MASK(p) * sizeof(evtchn_port_t);
59578 } else {
59579 bytes1 = (p - c) * sizeof(evtchn_port_t);
59580diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59581index fef20db..d28b1ab 100644
59582--- a/drivers/xen/xenfs/xenstored.c
59583+++ b/drivers/xen/xenfs/xenstored.c
59584@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59585 static int xsd_kva_open(struct inode *inode, struct file *file)
59586 {
59587 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59588+#ifdef CONFIG_GRKERNSEC_HIDESYM
59589+ NULL);
59590+#else
59591 xen_store_interface);
59592+#endif
59593+
59594 if (!file->private_data)
59595 return -ENOMEM;
59596 return 0;
59597diff --git a/firmware/Makefile b/firmware/Makefile
59598index e297e1b..aeb0982 100644
59599--- a/firmware/Makefile
59600+++ b/firmware/Makefile
59601@@ -35,9 +35,11 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59602 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59603 bnx2x/bnx2x-e2-6.2.9.0.fw
59604 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59605+ bnx2/bnx2-mips-09-6.2.1b.fw \
59606 bnx2/bnx2-rv2p-09-6.0.17.fw \
59607 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59608 bnx2/bnx2-mips-06-6.2.1.fw \
59609+ bnx2/bnx2-mips-06-6.2.3.fw \
59610 bnx2/bnx2-rv2p-06-6.0.15.fw
59611 fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
59612 fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
59613diff --git a/firmware/WHENCE b/firmware/WHENCE
59614index 0c4d96d..b17700f 100644
59615--- a/firmware/WHENCE
59616+++ b/firmware/WHENCE
59617@@ -653,21 +653,23 @@ Found in hex form in kernel source.
59618 Driver: BNX2 - Broadcom NetXtremeII
59619
59620 File: bnx2/bnx2-mips-06-6.2.1.fw
59621+File: bnx2/bnx2-mips-06-6.2.3.fw
59622 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59623 File: bnx2/bnx2-mips-09-6.2.1a.fw
59624+File: bnx2/bnx2-mips-09-6.2.1b.fw
59625 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59626 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59627
59628 Licence:
59629-
59630- This file contains firmware data derived from proprietary unpublished
59631- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59632-
59633- Permission is hereby granted for the distribution of this firmware data
59634- in hexadecimal or equivalent format, provided this copyright notice is
59635- accompanying it.
59636-
59637-Found in hex form in kernel source.
59638+
59639+ This file contains firmware data derived from proprietary unpublished
59640+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59641+
59642+ Permission is hereby granted for the distribution of this firmware data
59643+ in hexadecimal or equivalent format, provided this copyright notice is
59644+ accompanying it.
59645+
59646+Found in hex form in kernel source.
59647
59648 --------------------------------------------------------------------------
59649
59650diff --git a/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59651new file mode 100644
59652index 0000000..da72bf1
59653--- /dev/null
59654+++ b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59655@@ -0,0 +1,5804 @@
59656+:10000000080001180800000000004A68000000C84D
59657+:1000100000000000000000000000000008004A6826
59658+:100020000000001400004B30080000A00800000091
59659+:100030000000569400004B44080058200000008443
59660+:100040000000A1D808005694000001580000A25CEE
59661+:100050000800321008000000000072F00000A3B495
59662+:10006000000000000000000000000000080072F026
59663+:1000700000000024000116A40800049008000400F9
59664+:10008000000017D4000116C80000000000000000A6
59665+:100090000000000000000000000000000000000060
59666+:1000A000080000A80800000000003BFC00012E9C96
59667+:1000B0000000000000000000000000000000000040
59668+:1000C00000000000000000000A00004600000000E0
59669+:1000D000000000000000000D636F6D362E322E33DD
59670+:1000E0000000000006020302000000000000000300
59671+:1000F000000000C800000032000000030000000003
59672+:1001000000000000000000000000000000000000EF
59673+:1001100000000010000001360000EA600000000549
59674+:1001200000000000000000000000000000000008C7
59675+:1001300000000000000000000000000000000000BF
59676+:1001400000000000000000000000000000000000AF
59677+:10015000000000000000000000000000000000009F
59678+:10016000000000020000000000000000000000008D
59679+:10017000000000000000000000000000000000007F
59680+:10018000000000000000000000000010000000005F
59681+:10019000000000000000000000000000000000005F
59682+:1001A000000000000000000000000000000000004F
59683+:1001B000000000000000000000000000000000003F
59684+:1001C000000000000000000000000000000000002F
59685+:1001D000000000000000000000000000000000001F
59686+:1001E0000000000010000003000000000000000DEF
59687+:1001F0000000000D3C02080024424AA03C03080015
59688+:1002000024634B9CAC4000000043202B1480FFFD76
59689+:10021000244200043C1D080037BD7FFC03A0F021F0
59690+:100220003C100800261001183C1C0800279C4AA01E
59691+:100230000E000168000000000000000D27470100CB
59692+:1002400090E3000B2402001A94E5000814620028D1
59693+:10025000000020218CE200003C0308008C63004475
59694+:1002600094E60014000211C20002104030A4000203
59695+:10027000005A10212463000130A50004A446008028
59696+:100280003C010800AC23004410A000190004202BFE
59697+:100290008F4202B804410008240400013C02080017
59698+:1002A0008C420060244200013C010800AC22006046
59699+:1002B00003E00008008010218CE2002094E3001687
59700+:1002C00000002021AF4202808CE20004A743028498
59701+:1002D000AF4202883C021000AF4202B83C02080064
59702+:1002E0008C42005C244200013C010800AC22005C0E
59703+:1002F00003E00008008010212747010090E3000B75
59704+:100300002402000394E50008146200280000202164
59705+:100310008CE200003C0308008C63004494E6001467
59706+:10032000000211C20002104030A40002005A102145
59707+:100330002463000130A50004A44600803C010800AD
59708+:10034000AC23004410A000190004202B8F4202B8F7
59709+:1003500004410008240400013C0208008C420060B3
59710+:10036000244200013C010800AC22006003E00008C8
59711+:10037000008010218CE2002094E300160000202170
59712+:10038000AF4202808CE20004A7430284AF4202889D
59713+:100390003C021000AF4202B83C0208008C42005CF4
59714+:1003A000244200013C010800AC22005C03E000088C
59715+:1003B000008010218F4301002402010050620003DD
59716+:1003C000000311C20000000D000311C20002104022
59717+:1003D000005A1021A440008003E000080000102112
59718+:1003E0009362000003E00008AF80000003E0000813
59719+:1003F0000000102103E00008000010212402010089
59720+:1004000014820008000000003C0208008C4200FC3E
59721+:10041000244200013C010800AC2200FC0A0000DD7F
59722+:1004200030A200203C0208008C42008424420001DB
59723+:100430003C010800AC22008430A2002010400008DB
59724+:1004400030A300103C0208008C4201082442000145
59725+:100450003C010800AC22010803E000080000000095
59726+:1004600010600008000000003C0208008C420104FB
59727+:10047000244200013C010800AC22010403E0000812
59728+:10048000000000003C0208008C42010024420001F0
59729+:100490003C010800AC22010003E00008000000005D
59730+:1004A00027BDFFE8AFBF0010274401009483000878
59731+:1004B000306200041040001B306600028F4202B818
59732+:1004C00004410008240500013C0208008C42006041
59733+:1004D000244200013C010800AC2200600A0001290E
59734+:1004E0008FBF00108C82002094830016000028210A
59735+:1004F000AF4202808C820004A7430284AF4202888C
59736+:100500003C021000AF4202B83C0208008C42005C82
59737+:10051000244200013C010800AC22005C0A000129D1
59738+:100520008FBF001010C00006006028218F4401001A
59739+:100530000E0000CD000000000A0001282405000183
59740+:100540008F8200088F4301045043000700002821D8
59741+:100550008F4401000E0000CD000000008F42010416
59742+:10056000AF820008000028218FBF001000A01021DA
59743+:1005700003E0000827BD001827BDFFE8AFBF001447
59744+:10058000AFB00010974201083043700024022000F1
59745+:100590001062000B286220011440002F000010217F
59746+:1005A00024024000106200250000000024026000C8
59747+:1005B00010620026000010210A0001658FBF0014A0
59748+:1005C00027500100920200091040001A2403000184
59749+:1005D0003C0208008C420020104000160000182148
59750+:1005E0000E00049300000000960300083C0608007B
59751+:1005F00094C64B5E8E0400188F8200209605000C76
59752+:1006000000031C0000661825AC440000AC45000443
59753+:1006100024040001AC400008AC40000CAC400010C9
59754+:10062000AC400014AC4000180E0004B8AC43001CF1
59755+:10063000000018210A000164006010210E0003254B
59756+:10064000000000000A000164000010210E000EE905
59757+:1006500000000000000010218FBF00148FB00010B8
59758+:1006600003E0000827BD001827BDFFE0AFB2001867
59759+:100670003C036010AFBF001CAFB10014AFB000105E
59760+:100680008C6450002402FF7F3C1A800000822024EA
59761+:100690003484380C24020037AC6450003C1208004B
59762+:1006A00026524AD8AF42000824020C80AF420024F0
59763+:1006B0003C1B80083C06080024C60324024010218D
59764+:1006C0002404001D2484FFFFAC4600000481FFFDCC
59765+:1006D000244200043C020800244204B03C0108000B
59766+:1006E000AC224AE03C020800244202303C010800EF
59767+:1006F000AC224AE43C020800244201743C03080096
59768+:100700002463032C3C040800248403D83C0508001F
59769+:1007100024A538F03C010800AC224B403C02080004
59770+:10072000244202EC3C010800AC264B243C010800AA
59771+:10073000AC254B343C010800AC234B3C3C01080089
59772+:10074000AC244B443C010800AC224B483C0108005F
59773+:10075000AC234ADC3C010800AC204AE83C0108001C
59774+:10076000AC204AEC3C010800AC204AF03C010800F7
59775+:10077000AC204AF43C010800AC204AF83C010800D7
59776+:10078000AC204AFC3C010800AC204B003C010800B6
59777+:10079000AC244B043C010800AC204B083C01080091
59778+:1007A000AC204B0C3C010800AC204B103C01080075
59779+:1007B000AC204B143C010800AC204B183C01080055
59780+:1007C000AC264B1C3C010800AC264B203C01080029
59781+:1007D000AC254B303C010800AC234B380E000623FF
59782+:1007E000000000003C028000344200708C42000097
59783+:1007F000AF8200143C0308008C6300208F82000449
59784+:10080000104300043C0280000E00045BAF83000430
59785+:100810003C028000344600703C0308008C6300A05A
59786+:100820003C0208008C4200A4104300048F84001492
59787+:100830003C010800AC2300A4A743009E8CCA000022
59788+:100840003C0308008C6300BC3C0208008C4200B8EA
59789+:100850000144202300641821000040210064202B63
59790+:1008600000481021004410213C010800AC2300BCCA
59791+:100870003C010800AC2200B88F5100003222000772
59792+:100880001040FFDCAF8A00148CC600003C05080055
59793+:100890008CA500BC3C0408008C8400B800CA30233E
59794+:1008A00000A628210000102100A6302B0082202164
59795+:1008B00000862021322700013C010800AC2500BC45
59796+:1008C0003C010800AC2400B810E0001F32220002F6
59797+:1008D0008F420100AF4200208F420104AF4200A8C6
59798+:1008E0009342010B0E0000C6305000FF2E02001E86
59799+:1008F00054400004001010800E0000C90A000213CA
59800+:1009000000000000005210218C4200000040F80955
59801+:1009100000000000104000053C0240008F4301042D
59802+:100920003C026020AC4300143C024000AF4201385E
59803+:100930003C0208008C420034244200013C010800C3
59804+:10094000AC220034322200021040000E3222000499
59805+:100950008F4201400E0000C6AF4200200E000295FB
59806+:10096000000000003C024000AF4201783C02080059
59807+:100970008C420038244200013C010800AC220038BF
59808+:10098000322200041040FF983C0280008F42018018
59809+:100990000E0000C6AF4200208F43018024020F00EA
59810+:1009A00014620005000000008F420188A742009CED
59811+:1009B0000A0002483C0240009362000024030050F9
59812+:1009C000304200FF144300083C0240000E00027B4E
59813+:1009D00000000000544000043C0240000E000D7571
59814+:1009E000000000003C024000AF4201B83C02080099
59815+:1009F0008C42003C244200013C010800AC22003C37
59816+:100A00000A0001C83C0280003C0290003442000110
59817+:100A100000822025AF4400208F4200200440FFFECA
59818+:100A20000000000003E00008000000003C0280001D
59819+:100A3000344200010082202503E00008AF4400207A
59820+:100A400027BDFFE0AFB10014AFB0001000808821D7
59821+:100A5000AFBF00180E00025030B000FF9362007D5F
59822+:100A60000220202102028025A370007D8F70007477
59823+:100A70003C0280000E000259020280241600000988
59824+:100A80008FBF00188F4201F80440FFFE24020002CD
59825+:100A9000AF5101C0A34201C43C021000AF4201F8B3
59826+:100AA0008FBF00188FB100148FB0001003E0000852
59827+:100AB00027BD002027BDFFE8AFBF0010974201848B
59828+:100AC0008F440188304202001040000500002821B8
59829+:100AD0000E000FAA000000000A00028D240500018C
59830+:100AE0003C02FF0004800005008218243C02040040
59831+:100AF000506200019362003E240500018FBF001088
59832+:100B000000A0102103E0000827BD0018A360002208
59833+:100B10008F4401400A00025E2405000127BDFFE862
59834+:100B2000AFBF0014AFB0001093620000304400FF6C
59835+:100B300038830020388200300003182B0002102B6D
59836+:100B40000062182410600003240200501482008008
59837+:100B50008FBF001493620005304200011040007CFA
59838+:100B60008FBF0014934201482443FFFF2C6200050D
59839+:100B7000104000788FB00010000310803C03080084
59840+:100B800024634A68004310218C42000000400008A2
59841+:100B9000000000000E0002508F4401408F70000CD6
59842+:100BA0008F4201441602000224020001AF62000CD1
59843+:100BB0000E0002598F4401408F420144145000043A
59844+:100BC0008FBF00148FB000100A000F2027BD00183F
59845+:100BD0008F62000C0A0003040000000097620010FE
59846+:100BE0008F4301443042FFFF1462001A00000000EE
59847+:100BF00024020001A76200108F4202380443001053
59848+:100C00008F4201403C02003F3446F0003C0560004A
59849+:100C10003C04FFC08CA22BBC0044182400461024C6
59850+:100C20000002130200031D82106200390000000060
59851+:100C30008F4202380440FFF7000000008F4201405D
59852+:100C4000AF4202003C021000AF4202380A00032209
59853+:100C50008FBF0014976200100A0003040000000018
59854+:100C60000E0002508F440140976200128F430144EE
59855+:100C70003050FFFF1603000224020001A762001299
59856+:100C80000E0002598F4401408F42014416020004B5
59857+:100C90008FBF00148FB000100A00029127BD00180A
59858+:100CA000976200120A00030400000000976200141B
59859+:100CB0008F4301443042FFFF14620006240200010A
59860+:100CC0008FBF00148FB00010A76200140A00124AF0
59861+:100CD00027BD0018976200141440001D8FBF001438
59862+:100CE0000A00031C00000000976200168F430144B5
59863+:100CF0003042FFFF1462000B240200018FBF00147A
59864+:100D00008FB00010A76200160A000B1227BD001852
59865+:100D10009742007824420004A76200100A000322D0
59866+:100D20008FBF001497620016240300013042FFFFBA
59867+:100D3000144300078FBF00143C0208008C4200706F
59868+:100D4000244200013C010800AC2200708FBF001457
59869+:100D50008FB0001003E0000827BD001827BDFFE892
59870+:100D6000AFBF0014AFB000108F50010093620000BD
59871+:100D700093430109304400FF2402001F106200A5C4
59872+:100D80002862002010400018240200382862000A5F
59873+:100D90001040000C2402000B286200081040002CB8
59874+:100DA00000000000046000E52862000214400028F2
59875+:100DB00024020006106200268FBF00140A00041FE0
59876+:100DC0008FB000101062005E2862000B144000DC3F
59877+:100DD0008FBF00142402000E106200738FB0001049
59878+:100DE0000A00041F00000000106200C028620039E1
59879+:100DF0001040000A2402008024020036106200CA5B
59880+:100E000028620037104000B424020035106200C18F
59881+:100E10008FBF00140A00041F8FB000101062002B57
59882+:100E20002862008110400006240200C82402003914
59883+:100E3000106200B48FBF00140A00041F8FB00010AE
59884+:100E4000106200998FBF00140A00041F8FB00010B9
59885+:100E50003C0208008C420020104000B98FBF0014F3
59886+:100E60000E000493000000008F4201008F830020D9
59887+:100E70009745010C97460108AC6200008F420104BF
59888+:100E80003C04080094844B5E00052C00AC62000416
59889+:100E90008F4201180006340000C43025AC620008FF
59890+:100EA0008F42011C24040001AC62000C9342010A31
59891+:100EB00000A22825AC650010AC600014AC600018DE
59892+:100EC000AC66001C0A0003F58FBF00143C0208004A
59893+:100ED0008C4200201040009A8FBF00140E00049333
59894+:100EE00000000000974401083C03080094634B5E37
59895+:100EF0009745010C000422029746010E8F820020C4
59896+:100F0000000426000083202500052C003C030080FF
59897+:100F100000A6282500832025AC400000AC4000043A
59898+:100F2000AC400008AC40000CAC450010AC400014D4
59899+:100F3000AC400018AC44001C0A0003F42404000177
59900+:100F40009742010C14400015000000009362000558
59901+:100F50003042001014400011000000000E0002504A
59902+:100F6000020020219362000502002021344200107B
59903+:100F70000E000259A36200059362000024030020C2
59904+:100F8000304200FF1043006D020020218FBF00148B
59905+:100F90008FB000100A000FC027BD00180000000D20
59906+:100FA0000A00041E8FBF00143C0208008C4200207F
59907+:100FB000104000638FBF00140E0004930000000077
59908+:100FC0008F4201048F8300209744010C3C050800E8
59909+:100FD00094A54B5EAC6200009762002C00042400D4
59910+:100FE0003042FFFF008220253C02400E00A228254F
59911+:100FF000AC640004AC600008AC60000CAC60001095
59912+:10100000AC600014AC600018AC65001C0A0003F46E
59913+:10101000240400010E00025002002021A7600008F5
59914+:101020000E00025902002021020020210E00025E63
59915+:10103000240500013C0208008C42002010400040C2
59916+:101040008FBF00140E000493000000009742010CB3
59917+:101050008F8300203C05080094A54B5E000214001D
59918+:10106000AC700000AC620004AC6000088F64004CFF
59919+:101070003C02401F00A22825AC64000C8F62005087
59920+:1010800024040001AC6200108F620054AC620014B2
59921+:10109000AC600018AC65001C8FBF00148FB000104E
59922+:1010A0000A0004B827BD0018240200205082002541
59923+:1010B0008FB000100E000F0A020020211040002007
59924+:1010C0008FBF0014020020218FB0001000002821E3
59925+:1010D0000A00025E27BD0018020020218FBF001405
59926+:1010E0008FB000100A00058027BD00189745010C3D
59927+:1010F000020020218FBF00148FB000100A0005A04D
59928+:1011000027BD0018020020218FB000100A0005C57D
59929+:1011100027BD00189345010D020020218FB000105B
59930+:101120000A00060F27BD0018020020218FBF0014FF
59931+:101130008FB000100A0005EB27BD00188FBF001408
59932+:101140008FB0001003E0000827BD00188F4202781E
59933+:101150000440FFFE2402000234840080AF440240B9
59934+:10116000A34202443C02100003E00008AF420278B0
59935+:101170003C04080094844B6A3C0208008C424B7487
59936+:101180003083FFFF000318C000431021AF42003C32
59937+:101190003C0208008C424B70AF4200383C020050C9
59938+:1011A00034420008AF4200300000000000000000A0
59939+:1011B000000000008F420000304200201040FFFD80
59940+:1011C000000000008F4204003C010800AC224B608C
59941+:1011D0008F4204043C010800AC224B643C02002016
59942+:1011E000AF420030000000003C02080094424B680F
59943+:1011F0003C03080094634B6C3C05080094A54B6EBF
59944+:1012000024840001004310213083FFFF3C010800CB
59945+:10121000A4224B683C010800A4244B6A1465000317
59946+:10122000000000003C010800A4204B6A03E0000815
59947+:10123000000000003C05000A27BDFFE80345282107
59948+:101240003C04080024844B50AFBF00100E00051D65
59949+:101250002406000A3C02080094424B523C0308005A
59950+:1012600094634B6E3042000F244200030043180485
59951+:1012700024027FFF0043102B10400002AF83001CAC
59952+:101280000000000D0E00042A000000003C020800CF
59953+:1012900094424B5A8FBF001027BD001803E000088E
59954+:1012A000A74200A23C02000A034210219443000618
59955+:1012B0003C02080094424B5A3C010800A4234B56C0
59956+:1012C000004310238F83001C00021400000214034B
59957+:1012D0000043102B03E000083842000127BDFFE85F
59958+:1012E000AFBF00103C02000A0342102194420006E6
59959+:1012F0003C010800A4224B560E00047700000000B9
59960+:101300005440FFF93C02000A8FBF001003E00008C0
59961+:1013100027BD001827BDFFE8AFBF00100E000477FF
59962+:101320000000000010400003000000000E000485D3
59963+:10133000000000003C0208008C424B608FBF001090
59964+:1013400027430400AF4200383C0208008C424B6443
59965+:1013500027BD0018AF830020AF42003C3C020005CF
59966+:10136000AF42003003E00008AF8000188F82001801
59967+:101370003C0300060002114000431025AF4200303C
59968+:101380000000000000000000000000008F4200008C
59969+:10139000304200101040FFFD27420400AF820020C1
59970+:1013A00003E00008AF8000183C0608008CC64B64C0
59971+:1013B0008F8500188F8300203C02080094424B5A0E
59972+:1013C00027BDFFE024A50001246300202442000182
59973+:1013D00024C70020AFB10014AFB00010AFBF001899
59974+:1013E000AF850018AF8300203C010800A4224B5AAF
59975+:1013F000309000FF3C010800AC274B6404C100089A
59976+:101400000000882104E00006000000003C02080003
59977+:101410008C424B60244200013C010800AC224B602E
59978+:101420003C02080094424B5A3C03080094634B680A
59979+:101430000010202B004310262C42000100441025F0
59980+:10144000144000048F830018240200101462000F5F
59981+:10145000000000000E0004A9241100013C03080054
59982+:1014600094634B5A3C02080094424B681462000398
59983+:10147000000000000E00042A000000001600000317
59984+:10148000000000000E000493000000003C03080070
59985+:1014900094634B5E3C02080094424B5C2463000161
59986+:1014A0003064FFFF3C010800A4234B5E148200035C
59987+:1014B000000000003C010800A4204B5E1200000662
59988+:1014C000000000003C02080094424B5AA74200A2D0
59989+:1014D0000A00050B022010210E0004770000000016
59990+:1014E00010400004022010210E00048500000000BE
59991+:1014F000022010218FBF00188FB100148FB0001090
59992+:1015000003E0000827BD00203084FFFF30A5FFFF67
59993+:101510000000182110800007000000003082000148
59994+:101520001040000200042042006518210A00051343
59995+:101530000005284003E000080060102110C00006EC
59996+:1015400024C6FFFF8CA2000024A50004AC8200008A
59997+:101550000A00051D2484000403E0000800000000C8
59998+:1015600010A0000824A3FFFFAC86000000000000CC
59999+:10157000000000002402FFFF2463FFFF1462FFFA53
60000+:101580002484000403E0000800000000240200019D
60001+:10159000AF62000CA7620010A7620012A7620014DD
60002+:1015A00003E00008A76200163082007F034210218A
60003+:1015B0003C08000E004818213C0208008C42002024
60004+:1015C00027BDFFD82407FF80AFB3001CAFB20018BF
60005+:1015D000AFB10014AFB00010AFBF00200080802179
60006+:1015E00030B100FF0087202430D200FF1040002FD0
60007+:1015F00000009821AF44002C9062000024030050AA
60008+:10160000304200FF1443000E000000003C020800BE
60009+:101610008C4200E00202102100471024AF42002C4F
60010+:101620003C0208008C4200E0020210213042007FA0
60011+:101630000342102100481021944200D43053FFFF90
60012+:101640000E000493000000003C02080094424B5E30
60013+:101650008F8300200011340000C2302500122C00BE
60014+:101660003C02400000C2302534A50001AC700000EF
60015+:101670008FBF0020AC6000048FB20018AC7300086C
60016+:101680008FB10014AC60000C8FB3001CAC6500106F
60017+:101690008FB00010AC60001424040001AC6000188E
60018+:1016A00027BD00280A0004B8AC66001C8FBF0020CC
60019+:1016B0008FB3001C8FB200188FB100148FB00010D0
60020+:1016C00003E0000827BD00289343010F2402001007
60021+:1016D0001062000E2865001110A0000724020012FD
60022+:1016E000240200082405003A1062000600003021A0
60023+:1016F00003E0000800000000240500351462FFFC30
60024+:10170000000030210A000538000000008F420074FC
60025+:1017100024420FA003E00008AF62000C27BDFFE8E1
60026+:10172000AFBF00100E00025E240500018FBF001045
60027+:1017300024020001A762001227BD00182402000144
60028+:1017400003E00008A360002227BDFFE0AFB1001452
60029+:10175000AFB00010AFBF001830B1FFFF0E00025055
60030+:10176000008080219362003F24030004304200FF88
60031+:101770001443000C02002021122000082402000A59
60032+:101780000E00053100000000936200052403FFFEF7
60033+:1017900000431024A362000524020012A362003F4C
60034+:1017A000020020210E000259A360008116200003D0
60035+:1017B000020020210E0005950000000002002021FB
60036+:1017C000322600FF8FBF00188FB100148FB00010B9
60037+:1017D000240500380A00053827BD002027BDFFE09A
60038+:1017E000AFBF001CAFB20018AFB10014AFB0001013
60039+:1017F0000E000250008080210E0005310000000024
60040+:101800009362003F24120018305100FF123200038F
60041+:101810000200202124020012A362003F936200050F
60042+:101820002403FFFE004310240E000259A3620005AA
60043+:10183000020020212405002016320007000030217C
60044+:101840008FBF001C8FB200188FB100148FB0001032
60045+:101850000A00025E27BD00208FBF001C8FB2001857
60046+:101860008FB100148FB00010240500390A0005382C
60047+:1018700027BD002027BDFFE8AFB00010AFBF0014A8
60048+:101880009742010C2405003600808021144000108E
60049+:10189000304600FF0E00025000000000240200123B
60050+:1018A000A362003F93620005344200100E00053130
60051+:1018B000A36200050E00025902002021020020212F
60052+:1018C0000E00025E240500200A000604000000004D
60053+:1018D0000E000538000000000E000250020020211A
60054+:1018E000936200232403FF9F020020210043102461
60055+:1018F0008FBF00148FB00010A36200230A000259AA
60056+:1019000027BD001827BDFFE0AFBF0018AFB100141E
60057+:10191000AFB0001030B100FF0E00025000808021F7
60058+:10192000240200120E000531A362003F0E0002598E
60059+:101930000200202102002021022030218FBF001848
60060+:101940008FB100148FB00010240500350A0005384F
60061+:1019500027BD0020A380002C03E00008A380002DF9
60062+:101960008F4202780440FFFE8F820034AF42024073
60063+:1019700024020002A34202443C02100003E00008DB
60064+:10198000AF4202783C0360008C6254003042000891
60065+:101990001440FFFD000000008C625408AF82000C70
60066+:1019A00024020052AC605408AC645430AC6254342D
60067+:1019B0002402000803E00008AC6254003C0260000E
60068+:1019C0008C42540030420008104000053C03600087
60069+:1019D0008C625400304200081440FFFD00000000FB
60070+:1019E0008F83000C3C02600003E00008AC43540805
60071+:1019F00090A3000024020005008040213063003FD6
60072+:101A000000004821146200050000502190A2001C33
60073+:101A100094A3001E304900FF306AFFFFAD00000CA8
60074+:101A2000AD000010AD000024950200148D05001CCF
60075+:101A30008D0400183042FFFF0049102300021100FE
60076+:101A4000000237C3004038210086202300A2102B5B
60077+:101A50000082202300A72823AD05001CAD04001838
60078+:101A6000A5090014A5090020A50A001603E0000836
60079+:101A7000A50A00228F4201F80440FFFE2402000262
60080+:101A8000AF4401C0A34201C43C02100003E00008BF
60081+:101A9000AF4201F83C0208008C4200B427BDFFE8C9
60082+:101AA000AFBF001424420001AFB000103C01080099
60083+:101AB000AC2200B48F4300243C02001F30AA00FF78
60084+:101AC0003442FF8030D800FF006280240080F8217B
60085+:101AD00030EF00FF1158003B01405821240CFF80DB
60086+:101AE0003C19000A3163007F000310C00003194055
60087+:101AF000006218213C0208008C4200DC25680001CD
60088+:101B0000310D007F03E21021004310213043007F9C
60089+:101B100003431821004C102400794821AF420024CF
60090+:101B20008D220024016C1824006C7026AD22000C5C
60091+:101B30008D220024310800FFAD22001095220014F0
60092+:101B4000952300208D27001C3042FFFF3063FFFFEC
60093+:101B50008D2600180043102300021100000227C345
60094+:101B60000040282100C4302300E2102B00C23023A3
60095+:101B700000E53823AD27001CAD2600189522002073
60096+:101B8000A522001495220022154B000AA52200165A
60097+:101B90008D2300248D220008254600013145008058
60098+:101BA0001462000430C4007F108F000238AA008045
60099+:101BB00000C0502151AF000131C800FF1518FFC906
60100+:101BC000010058218F8400343082007F03421821A5
60101+:101BD0003C02000A006218212402FF8000822024B7
60102+:101BE000AF440024A06A0079A06A00838C62005090
60103+:101BF0008F840034AC6200708C6500743C027FFFFF
60104+:101C00003442FFFF00A228240E00066BAC6500746E
60105+:101C1000AF5000248FBF00148FB0001003E0000805
60106+:101C200027BD001827BDFFC0AFBE0038AFB70034D6
60107+:101C3000AFB5002CAFB20020AFB1001CAFB00018A0
60108+:101C4000AFBF003CAFB60030AFB40028AFB3002444
60109+:101C50008F4500248F4600288F43002C3C02001F34
60110+:101C60003442FF800062182400C230240080A82182
60111+:101C7000AFA3001400A2F0240E00062FAFA60010A0
60112+:101C80003C0208008C4200E02410FF8003608821A1
60113+:101C900002A2102100501024AF4200243C02080090
60114+:101CA0008C4200E002A210213042007F0342182142
60115+:101CB0003C02000A00629021924200D293630084A9
60116+:101CC000305700FF306300FF24020001106200342F
60117+:101CD000036020212402000214620036000000008C
60118+:101CE0000E001216024028219223008392220083C4
60119+:101CF0003063007F3042007F000210C000031940B3
60120+:101D0000006218213C0208008C4200DC02A2102173
60121+:101D10000043382100F01024AF42002892250078BB
60122+:101D20009224008330E2007F034218213C02000C21
60123+:101D300014850007006280212402FFFFA24200F107
60124+:101D40002402FFFFA64200F20A0007272402FFFF39
60125+:101D500096020020A24200F196020022A64200F262
60126+:101D60008E020024AE4200F492220083A24200F0D0
60127+:101D70008E4200C8AE4200FC8E4200C4AE4200F863
60128+:101D80008E220050AE4201008E4200CCAE420104D1
60129+:101D9000922200853042003F0A0007823442004010
60130+:101DA0000E00123902402821922200850A00078283
60131+:101DB0003042003F936200852403FFDF3042003F42
60132+:101DC000A36200859362008500431024A36200850E
60133+:101DD0009363008393620078307400FF304200FF09
60134+:101DE00010540036240AFF803C0C000C3283007F24
60135+:101DF000000310C000031940006218213C020800D3
60136+:101E00008C4200DC268800013109007F02A21021EB
60137+:101E10000043382130E2007F0342182100EA1024F9
60138+:101E2000AF420028006C80218E020024028A182410
60139+:101E3000006A5826AE02000C8E020024310800FF12
60140+:101E4000AE02001096020014960300208E07001CBC
60141+:101E50003042FFFF3063FFFF8E060018004310235F
60142+:101E600000021100000227C30040282100C43023D3
60143+:101E700000E2102B00C2302300E53823AE07001C1F
60144+:101E8000AE06001896020020A60200149602002258
60145+:101E9000A602001692220079304200FF105400077B
60146+:101EA0000000000051370001316800FF92220078E5
60147+:101EB000304200FF1448FFCD0100A0219222008390
60148+:101EC000A22200798E2200500A0007E2AE220070A2
60149+:101ED000A22200858E22004C2405FF80AE42010C18
60150+:101EE0009222008534420020A2220085924200D135
60151+:101EF0003C0308008C6300DC305400FF3C02080007
60152+:101F00008C4200E400143140001420C002A31821C8
60153+:101F100000C4202102A210210064382100461021B3
60154+:101F20000045182400E52824AF450028AF43002CC5
60155+:101F30003042007F924400D030E3007F03422821EA
60156+:101F4000034318213C02000C006280213C02000E79
60157+:101F5000309600FF00A298211296002A000000008F
60158+:101F60008E02000C02002021026028211040002572
60159+:101F7000261000280E00064A000000009262000DA4
60160+:101F800026830001307400FF3042007FA262000D02
60161+:101F90002404FF801697FFF0267300203C020800FF
60162+:101FA0008C4200DC0000A02102A210210044102479
60163+:101FB000AF4200283C0208008C4200E43C030800C9
60164+:101FC0008C6300DC02A2102100441024AF42002CDC
60165+:101FD0003C0208008C4200E402A318213063007F19
60166+:101FE00002A210213042007F034220210343182126
60167+:101FF0003C02000C006280213C02000E0A0007A493
60168+:10200000008298218E4200D8AE2200508E4200D825
60169+:10201000AE22007092250083924600D19223008365
60170+:10202000924400D12402FF8000A228243063007F64
60171+:10203000308400FF00A628250064182A10600002E2
60172+:1020400030A500FF38A50080A2250083A2250079D5
60173+:102050000E00063D000000009222007E02A020211A
60174+:10206000A222007A8E2300743C027FFF3442FFFFDD
60175+:10207000006218240E00066BAE2300748FA20010BD
60176+:10208000AF5E00248FBF003CAF4200288FBE0038F7
60177+:102090008FA200148FB700348FB600308FB5002C9C
60178+:1020A0008FB400288FB300248FB200208FB1001CA2
60179+:1020B0008FB0001827BD004003E00008AF42002C9D
60180+:1020C00090A2000024420001A0A200003C030800EE
60181+:1020D0008C6300F4304200FF1443000F0080302175
60182+:1020E000A0A000003C0208008C4200E48F84003471
60183+:1020F000008220213082007F034218213C02000C24
60184+:10210000006218212402FF8000822024ACC300005A
60185+:1021100003E00008AF4400288C8200002442002025
60186+:1021200003E00008AC82000094C200003C080800F4
60187+:10213000950800CA30E7FFFF008048210102102106
60188+:10214000A4C2000094C200003042FFFF00E2102B46
60189+:1021500054400001A4C7000094A200003C03080002
60190+:102160008C6300CC24420001A4A2000094A20000D1
60191+:102170003042FFFF544300078F8600280107102BD1
60192+:10218000A4A000005440000101003821A4C70000B1
60193+:102190008F8600288CC4001CAF44003C94A2000031
60194+:1021A0008F43003C3042FFFF000210C00062182144
60195+:1021B000AF43003C8F42003C008220231880000483
60196+:1021C000000000008CC200180A00084324420001ED
60197+:1021D0008CC20018AF4200383C020050344200105C
60198+:1021E000AF420030000000000000000000000000CE
60199+:1021F0008F420000304200201040FFFD0000000030
60200+:102200008F420404AD2200048F420400AD2200007E
60201+:102210003C020020AF42003003E000080000000054
60202+:1022200027BDFFE0AFB20018AFB10014AFB000108F
60203+:10223000AFBF001C94C2000000C080213C12080007
60204+:10224000965200C624420001A60200009603000038
60205+:1022500094E2000000E03021144300058FB100300B
60206+:102260000E000818024038210A000875000000001E
60207+:102270008C8300048C820004244200400461000727
60208+:10228000AC8200048C8200040440000400000000C2
60209+:102290008C82000024420001AC8200009602000003
60210+:1022A0003042FFFF50520001A600000096220000BD
60211+:1022B00024420001A62200008F82002896230000FD
60212+:1022C00094420016144300048FBF001C2402000136
60213+:1022D000A62200008FBF001C8FB200188FB100141F
60214+:1022E0008FB0001003E0000827BD00208F89002870
60215+:1022F00027BDFFE0AFBF00188D220028274804004B
60216+:1023000030E700FFAF4200388D22002CAF8800304C
60217+:10231000AF42003C3C020005AF420030000000002C
60218+:1023200000000000000000000000000000000000AD
60219+:10233000000000008C82000C8C82000CAD020000BA
60220+:102340008C820010AD0200048C820018AD020008DF
60221+:102350008C82001CAD02000C8CA20014AD02001097
60222+:102360008C820020AD02001490820005304200FFF4
60223+:1023700000021200AD0200188CA20018AD02001C71
60224+:102380008CA2000CAD0200208CA20010AD02002433
60225+:102390008CA2001CAD0200288CA20020AD02002CF3
60226+:1023A000AD060030AD000034978300263402FFFFF5
60227+:1023B00014620002006020213404FFFF10E00011CD
60228+:1023C000AD04003895230036952400362402000120
60229+:1023D0003063FFFF000318C20069182190650040B8
60230+:1023E000308400070082100400451025A0620040E0
60231+:1023F0008F820028944200563042FFFF0A0008DC1A
60232+:10240000AD02003C952300369524003624020001DD
60233+:102410003063FFFF000318C2006918219065004077
60234+:1024200030840007008210040002102700451024A9
60235+:10243000A0620040AD00003C000000000000000071
60236+:10244000000000003C02000634420040AF42003071
60237+:102450000000000000000000000000008F420000AB
60238+:10246000304200101040FFFD8F860028AF880030FA
60239+:1024700024C2005624C7003C24C4002824C50032CE
60240+:1024800024C600360E000856AFA200108FBF0018F9
60241+:1024900003E0000827BD00208F8300243C060800CD
60242+:1024A0008CC600E88F82003430633FFF0003198040
60243+:1024B00000461021004310212403FF803046007F96
60244+:1024C00000431024AF420028034618213C02000CB0
60245+:1024D0000062302190C2000D30A500FF00003821BD
60246+:1024E00034420010A0C2000D8F8900288F8A00247A
60247+:1024F00095230036000A13823048000324020001AD
60248+:10250000A4C3000E1102000B2902000210400005B6
60249+:10251000240200021100000C240300010A0009201B
60250+:102520000000182111020006000000000A00092026
60251+:10253000000018218CC2002C0A000920244300014D
60252+:102540008CC20014244300018CC200180043102BDD
60253+:1025500050400009240700012402002714A20003B0
60254+:10256000000000000A00092C240700019522003E0B
60255+:1025700024420001A522003E000A138230430003DA
60256+:102580002C62000210400009008028211460000421
60257+:102590000000000094C200360A00093C3046FFFFEC
60258+:1025A0008CC600380A00093C008028210000302138
60259+:1025B0003C04080024844B780A00088900000000CD
60260+:1025C000274901008D22000C9523000601202021BF
60261+:1025D000000216023046003F3063FFFF240200274E
60262+:1025E00000C0282128C7002810C2000EAF83002495
60263+:1025F00010E00008240200312402002110C200096A
60264+:102600002402002510C200079382002D0A00095BF6
60265+:102610000000000010C200059382002D0A00095B33
60266+:10262000000000000A0008F4000000000A0006266E
60267+:102630000000000095230006912400058D25000C64
60268+:102640008D2600108D2700188D28001C8D29002054
60269+:10265000244200013C010800A4234B7E3C010800F9
60270+:10266000A0244B7D3C010800AC254B843C010800B4
60271+:10267000AC264B883C010800AC274B903C0108007D
60272+:10268000AC284B943C010800AC294B9803E00008AF
60273+:10269000A382002D8F87002827BDFFC0AFB3003471
60274+:1026A000AFB20030AFB1002CAFB00028AFBF0038E0
60275+:1026B0003C0208008C4200D094E3003030B0FFFFB1
60276+:1026C000005010073045FFFF3063FFFF00C0982126
60277+:1026D000A7A200103C110800963100C614A3000602
60278+:1026E0003092FFFF8CE2002424420030AF42003CD5
60279+:1026F0000A0009948CE2002094E200323042FFFF8D
60280+:1027000054A2000827A400188CE2002C24420030B8
60281+:10271000AF42003C8CE20028AF4200380A0009A218
60282+:102720008F84002827A5001027A60020022038212A
60283+:102730000E000818A7A000208FA200182442003025
60284+:10274000AF4200388FA2001CAF42003C8F840028AB
60285+:102750003C020005AF42003094820034274304005D
60286+:102760003042FFFF0202102B14400007AF830030FD
60287+:1027700094820054948300340202102100431023F9
60288+:102780000A0009B63043FFFF94830054948200345A
60289+:102790000223182100501023006218233063FFFF2A
60290+:1027A000948200163042FFFF144300030000000033
60291+:1027B0000A0009C424030001948200163042FFFF7E
60292+:1027C0000043102B104000058F82003094820016C9
60293+:1027D000006210233043FFFF8F820030AC530000B3
60294+:1027E000AC400004AC520008AC43000C3C020006B4
60295+:1027F00034420010AF420030000000000000000032
60296+:10280000000000008F420000304200101040FFFD29
60297+:10281000001018C2006418219065004032040007BF
60298+:10282000240200018FBF00388FB300348FB2003014
60299+:102830008FB1002C8FB000280082100400451025B5
60300+:1028400027BD004003E00008A062004027BDFFA8AC
60301+:10285000AFB60050AFB5004CAFB40048AFB30044C2
60302+:10286000AFB1003CAFBF0054AFB20040AFB00038D2
60303+:102870008C9000003C0208008C4200E88F860034F7
60304+:10288000960300022413FF8000C2302130633FFF13
60305+:102890000003198000C3382100F3102490B2000017
60306+:1028A000AF42002C9203000230E2007F034230214D
60307+:1028B0003C02000E00C28821306300C024020040A8
60308+:1028C0000080A82100A0B021146200260000A021F1
60309+:1028D0008E3400388E2200181440000224020001B9
60310+:1028E000AE2200189202000D304200201440001564
60311+:1028F0008F8200343C0308008C6300DC001238C077
60312+:10290000001231400043102100C730210046382119
60313+:1029100030E300073C02008030E6007800C230253A
60314+:102920000343182100F31024AF4208002463090078
60315+:10293000AF4608108E2200188C6300080043102157
60316+:10294000AE2200188E22002C8E2300182442000193
60317+:102950000062182B1060003D000000000A000A7899
60318+:1029600000000000920300022402FFC00043102474
60319+:10297000304200FF1440000524020001AE2200187E
60320+:10298000962200360A000A613054FFFF8E2200149E
60321+:1029900024420001AE22001892020000000216003C
60322+:1029A0000002160304410029000000009602000204
60323+:1029B00027A4001000802821A7A20016960200027A
60324+:1029C00024070001000030213042FFFFAF820024C5
60325+:1029D0000E000889AFA0001C960300023C0408000A
60326+:1029E0008C8400E88F82003430633FFF000319803D
60327+:1029F00000441021004310213043007F3C05000CAF
60328+:102A00000053102403431821AF4200280065182109
60329+:102A10009062000D001221403042007FA062000D44
60330+:102A20003C0308008C6300E48F82003400431021D3
60331+:102A30000044382130E2007F03421021004510217C
60332+:102A400000F31824AF430028AEA200009222000D2C
60333+:102A5000304200101040001302A020218F83002874
60334+:102A60008EA40000028030219462003E2442FFFFC9
60335+:102A7000A462003E948400029625000E3084FFFF7D
60336+:102A80000E00097330A5FFFF8F82002894430034A5
60337+:102A90009622000E1443000302A02021240200010C
60338+:102AA000A382002C02C028210E0007FE00000000B7
60339+:102AB0008FBF00548FB600508FB5004C8FB40048C4
60340+:102AC0008FB300448FB200408FB1003C8FB000380C
60341+:102AD00003E0000827BD00588F82002827BDFFD0E3
60342+:102AE000AFB40028AFB20020AFBF002CAFB30024BA
60343+:102AF000AFB1001CAFB00018904400D0904300D19B
60344+:102B00000000A021309200FFA3A30010306300FF5B
60345+:102B10008C5100D88C5300DC1072002B2402000171
60346+:102B20003C0308008C6300E493A400108F820034FF
60347+:102B30002406FF800004214000431021004410219E
60348+:102B40003043007F00461024AF4200280343182181
60349+:102B50003C02000C006218218C62000427A40014BF
60350+:102B600027A50010022280210270102304400015C6
60351+:102B7000AFA300149062000D00C21024304200FF89
60352+:102B800014400007020088219062000D344200408A
60353+:102B90000E0007FEA062000D0A000ABD93A20010FD
60354+:102BA0000E0009E1241400018F830028AC7000D8C6
60355+:102BB00093A20010A06200D193A200101452FFD87B
60356+:102BC0000000000024020001168200048FBF002CC8
60357+:102BD0000E000626000000008FBF002C8FB40028D6
60358+:102BE0008FB300248FB200208FB1001C8FB000186B
60359+:102BF00003E0000827BD003027BDFFD8AFB3001C9D
60360+:102C0000AFB20018AFB10014AFB00010AFBF0020DA
60361+:102C10000080982100E0802130B1FFFF0E00049376
60362+:102C200030D200FF000000000000000000000000A3
60363+:102C30008F820020AC510000AC520004AC5300085D
60364+:102C4000AC40000CAC400010AC400014AC4000188C
60365+:102C50003C03080094634B5E02038025AC50001CCB
60366+:102C6000000000000000000000000000240400013B
60367+:102C70008FBF00208FB3001C8FB200188FB10014DB
60368+:102C80008FB000100A0004B827BD002827BDFFE858
60369+:102C9000AFB00010AFBF001430A5FFFF30C600FF7B
60370+:102CA0000080802124020C80AF420024000000003C
60371+:102CB0000000000000000000000000000000000014
60372+:102CC0000E000ACC000000003C040800248400E050
60373+:102CD0008C8200002403FF808FBF001402021021A9
60374+:102CE00000431024AF4200248C8200003C03000A01
60375+:102CF000020280213210007F035010218FB000109B
60376+:102D00000043102127BD001803E00008AF8200280F
60377+:102D100027BDFFE8AFBF00108F4401403C0308000F
60378+:102D20008C6300E02402FF80AF840034008318210C
60379+:102D300000621024AF4200243C02000803424021FC
60380+:102D4000950500023063007F3C02000A034318210E
60381+:102D50000062182130A5FFFF3402FFFF0000302180
60382+:102D60003C07602010A20006AF8300282402FFFF6A
60383+:102D7000A5020002946500D40E000AF130A5FFFF01
60384+:102D80008FBF001024020C8027BD001803E000084C
60385+:102D9000AF4200243C020008034240219502000299
60386+:102DA0003C0A0800954A00C63046FFFF14C00007E1
60387+:102DB0003402FFFF8F8200288F8400343C0760209C
60388+:102DC000944500D40A000B5A30A5FFFF10C200241E
60389+:102DD0008F87002894E2005494E400163045FFFFEA
60390+:102DE00000A6102300A6182B3089FFFF10600004F6
60391+:102DF0003044FFFF00C51023012210233044FFFFA1
60392+:102E0000008A102B1040000C012A1023240200011C
60393+:102E1000A50200162402FFFFA502000294E500D4DB
60394+:102E20008F8400340000302130A5FFFF3C07602074
60395+:102E30000A000AF1000000000044102A10400008B7
60396+:102E4000000000009502001630420001104000040E
60397+:102E5000000000009742007E24420014A5020016E4
60398+:102E600003E00008000000008F84002827BDFFE079
60399+:102E7000AFBF0018948200349483003E1060001AA3
60400+:102E80003048FFFF9383002C2402000114620027C6
60401+:102E90008FBF00188F820028000818C23108000771
60402+:102EA000006218212447003A244900542444002099
60403+:102EB000244500302446003490620040304200FF38
60404+:102EC0000102100730420001104000168FBF0018A9
60405+:102ED0000E000856AFA900108F82002894420034DB
60406+:102EE0000A000B733048FFFF94830036948200344D
60407+:102EF0001043000E8FBF001894820036A482003465
60408+:102F000094820056A48200548C82002CAC8200244F
60409+:102F100094820032A48200309482003CA482003A61
60410+:102F20008FBF00180A000B3327BD002003E0000804
60411+:102F300027BD002027BDFFE8AFBF00108F4A01006A
60412+:102F40003C0508008CA500E03C02080090424B8440
60413+:102F50003C0C0800958C4B7E01452821304B003FEE
60414+:102F600030A2007F03424021396900323C02000A4E
60415+:102F70003963003F2C630001010240212D2900012B
60416+:102F80002402FF8000A2282401234825AF8A0034B0
60417+:102F900000801821AF450024000030210080282146
60418+:102FA00024070001AF8800283C04080024844B78E3
60419+:102FB000AF8C002415200007A380002D24020020E0
60420+:102FC0005562000F006020213402FFFF5582000C83
60421+:102FD000006020212402002015620005000000008E
60422+:102FE0008C6300142402FFFF106200070000000041
60423+:102FF0000E000889000000000A000BD0000000004D
60424+:103000000E0008F4016028210E000B68000000008B
60425+:103010008FBF001024020C8027BD001803E00008B9
60426+:10302000AF4200243C0208008C4200E027BDFFA014
60427+:10303000AFB1003C008210212411FF80AFBE0058C8
60428+:10304000AFB70054AFB20040AFB00038AFBF005CC4
60429+:10305000AFB60050AFB5004CAFB40048AFB30044BA
60430+:10306000005110248F4800248F4900288F470028E2
60431+:10307000AF4200243C0208008C4200E00080902116
60432+:1030800024060006008210213042007F03421821EE
60433+:103090003C02000A006280213C02001F3442FF8093
60434+:1030A00000E2382427A40010260500F00122F024B5
60435+:1030B0000102B8240E00051DAFA700308FA2001832
60436+:1030C000AE0200C48FA2001CAE0200C88FA2002472
60437+:1030D000AE0200CC93A40010920300D12402FF8022
60438+:1030E0000082102400431025304900FF3083007F08
60439+:1030F0003122007F0062102A10400004000310C03B
60440+:1031000001311026304900FF000310C000031940B0
60441+:10311000006218213C0208008C4200DC920400D2BC
60442+:10312000024210210043102100511024AF42002818
60443+:1031300093A300103063007F000310C00003194008
60444+:10314000006218213C0208008C4200DC024210217F
60445+:10315000004310213042007F034218213C02000C42
60446+:10316000006240218FA300142402FFFF1062003090
60447+:10317000309500FF93A2001195030014304400FF26
60448+:103180003063FFFF0064182B1060000D000000008A
60449+:10319000950400148D07001C8D0600183084FFFF75
60450+:1031A00000442023000421000000102100E4382105
60451+:1031B00000E4202B00C230210A000C4A00C4302158
60452+:1031C000950400148D07001C8D0600183084FFFF45
60453+:1031D000008220230004210000001021008018211B
60454+:1031E00000C2302300E4202B00C4302300E3382346
60455+:1031F000AD07001CAD06001893A20011A502001433
60456+:1032000097A20012A50200168FA20014AD020010B2
60457+:103210008FA20014AD02000C93A20011A5020020A1
60458+:1032200097A20012A50200228FA20014AD02002472
60459+:103230002406FF80024610243256007FAF4200244D
60460+:10324000035618213C02000A006280218E02004CC5
60461+:103250008FA200203124007F000428C0AE0200505D
60462+:103260008FA200200004214000852821AE020070BA
60463+:1032700093A2001001208821A202008393A20010D3
60464+:10328000A2020079920200853042003FA20200852E
60465+:103290003C0208008C4200DC024210210045102153
60466+:1032A00000461024AF42002C3C0208008C4200E48F
60467+:1032B0003C0308008C6300DC024210210044102112
60468+:1032C00000461024AF4200283C0208008C4200E473
60469+:1032D00002431821006518210242102100441021E8
60470+:1032E0003042007F3063007F93A50010034220210D
60471+:1032F000034318213C02000E006240213C02000CF6
60472+:1033000010B1008C008248213233007F1660001912
60473+:103310002404FF803C0208008C4200DC02421021A1
60474+:1033200000441024AF42002C3C0208008C4200E410
60475+:103330003C0308008C6300DC02421021004410248E
60476+:10334000AF4200283C0208008C4200E402431821EE
60477+:103350003063007F024210213042007F034220216F
60478+:10336000034318213C02000E006240213C02000C85
60479+:10337000008248219124000D2414FF8000001021B8
60480+:1033800000942025A124000D950400029505001449
60481+:103390008D07001C3084FFFF30A5FFFF8D0600184D
60482+:1033A000008520230004210000E4382100C23021E0
60483+:1033B00000E4202B00C43021AD07001CAD0600182E
60484+:1033C00095020002A5020014A50000168D02000857
60485+:1033D000AD0200108D020008AD02000C9502000243
60486+:1033E000A5020020A50000228D020008AD020024E5
60487+:1033F0009122000D30420040104000422622000180
60488+:103400003C0208008C4200E0A3B300283C10000AF4
60489+:103410000242102100541024AF4200243C02080054
60490+:103420008C4200E0A380002C27A4002C0242102133
60491+:103430003042007F03421821007018218C6200D8AE
60492+:103440008D26000427A50028AFA9002C00461021D6
60493+:10345000AC6200D80E0009E1AF83002893A30028D6
60494+:103460008F8200280E000626A04300D10E000B68B4
60495+:103470000000000002541024AF4200243C02080067
60496+:103480008C4200DC00132940001320C000A420213E
60497+:10349000024210210044102100541024AF42002C9D
60498+:1034A0003C0208008C4200E43C0308008C6300DC12
60499+:1034B00003563021024210210045102100541024EF
60500+:1034C000AF4200283C0208008C4200E4024318216D
60501+:1034D0000064182102421021004510213042007F73
60502+:1034E0003063007F03422021034318213C02000E79
60503+:1034F000006240213C02000C00D080210082482163
60504+:10350000262200013043007F14750005304400FF7F
60505+:103510002403FF800223102400431026304400FFC0
60506+:1035200093A2001000808821250800281444FF760B
60507+:103530002529002093A400108FA300142402FFFF6C
60508+:103540001062000A308900FF2482000124830001F8
60509+:103550003042007F14550005306900FF2403FF80CE
60510+:103560000083102400431026304900FF92020078A7
60511+:10357000305300FF11330032012088213C02080043
60512+:103580008C4200DC3225007F000520C00005294068
60513+:1035900000A42021024210212406FF8000441021B3
60514+:1035A00000461024AF42002C3C0308008C6300DC72
60515+:1035B0003C0208008C4200E4024318210242102120
60516+:1035C0000045102100641821004610243063007F5C
60517+:1035D000AF420028034318213C02000E0062402144
60518+:1035E0003C0208008C4200E48D06000C0100202102
60519+:1035F00002421021004510213042007F0342182171
60520+:103600003C02000C0062482110C0000D012028215E
60521+:103610000E00064A000000002402FF800222182447
60522+:1036200026240001006228263082007F1455000203
60523+:10363000308300FF30A300FF1473FFD000608821A7
60524+:103640008E0300743C027FFF3442FFFF00621824A7
60525+:10365000AE0300740E00066B02402021AF57002419
60526+:103660008FA20030AF5E00288FBF005C8FBE005875
60527+:103670008FB700548FB600508FB5004C8FB4004800
60528+:103680008FB300448FB200408FB1003C8FB0003840
60529+:1036900027BD006003E00008AF42002C27BDFFD823
60530+:1036A000AFB1001CAFBF0020AFB000182751018898
60531+:1036B000922200032408FF803C03000A3047007F69
60532+:1036C000A3A700108F4601803C0208008C4200E056
60533+:1036D000AF86003400C2282100A81024AF42002485
60534+:1036E0009224000030A2007F0342102100431021E9
60535+:1036F000AF8200283084007F24020002148200255B
60536+:10370000000719403C0208008C4200E400C210216E
60537+:103710000043282130A2007F0342182100A8102472
60538+:10372000AF4200283C02000C006218219062000D9C
60539+:10373000AFA3001400481025A062000D8FA3001451
60540+:103740009062000D304200405040006A8FBF002060
60541+:103750008F860028A380002C27A400148CC200D8D8
60542+:103760008C63000427A50010004310210E0009E11E
60543+:10377000ACC200D893A300108F8200280E0006264A
60544+:10378000A04300D10E000B68000000000A000E0BE1
60545+:103790008FBF00200E00062F00C020210E00063D26
60546+:1037A000000000003C020008034280219223000137
60547+:1037B0009202007B1443004F8FBF00209222000032
60548+:1037C0003044007F24020004108200172882000584
60549+:1037D00010400006240200052402000310820007A6
60550+:1037E0008FB1001C0A000E0C0000000010820012B5
60551+:1037F0008FBF00200A000E0C8FB1001C92050083C1
60552+:10380000920600788E0700748F84003430A500FF84
60553+:1038100000073E0230C600FF0E00067330E7007F4F
60554+:103820000A000E0B8FBF00200E000BD78F840034D0
60555+:103830000A000E0B8FBF002024020C80AF42002430
60556+:103840009202003E30420040104000200000000084
60557+:103850009202003E00021600000216030441000618
60558+:10386000000000008F8400340E0005A024050093A2
60559+:103870000A000E0B8FBF00209202003F24030018A5
60560+:10388000304200FF1443000C8F84003424050039BB
60561+:103890000E000538000030210E0002508F840034E5
60562+:1038A00024020012A202003F0E0002598F8400344D
60563+:1038B0000A000E0B8FBF0020240500360E000538CD
60564+:1038C000000030210A000E0B8FBF00200E000250B6
60565+:1038D0008F8400349202000534420020A2020005C9
60566+:1038E0000E0002598F8400340E000FC08F84003404
60567+:1038F0008FBF00208FB1001C8FB0001824020C80F5
60568+:1039000027BD002803E00008AF42002427BDFFE8E0
60569+:10391000AFB00010AFBF001427430100946200084D
60570+:103920000002140000021403044100020000802180
60571+:103930002410000194620008304200801040001AF8
60572+:10394000020010219462000830422000104000164E
60573+:10395000020010218C6300183C021C2D344219ED2A
60574+:10396000240600061062000F3C0760213C0208009C
60575+:103970008C4200D4104000078F8200288F830028DB
60576+:10398000906200623042000F34420040A062006248
60577+:103990008F8200288F840034944500D40E000AF1F1
60578+:1039A00030A5FFFF020010218FBF00148FB0001060
60579+:1039B00003E0000827BD001827BDFFE0AFB10014E9
60580+:1039C000AFB00010A380002CAFBF00188F450100DE
60581+:1039D0003C0308008C6300E02402FF80AF850034C4
60582+:1039E00000A318213064007F0344202100621824C2
60583+:1039F0003C02000A00822021AF430024275001002E
60584+:103A00008E0200148C8300DCAF8400280043102356
60585+:103A100018400004000088218E0200140E000A8461
60586+:103A2000AC8200DC9202000B24030002304200FF53
60587+:103A30001443002F0000000096020008304300FFEE
60588+:103A40002402008214620005240200840E00093E54
60589+:103A5000000000000A000E97000000001462000938
60590+:103A6000240200818F8200288F8400343C0760216B
60591+:103A7000944500D49206000530A5FFFF0A000E868B
60592+:103A800030C600FF14620027000000009202000A06
60593+:103A9000304300FF306200201040000430620040DC
60594+:103AA0008F8400340A000E82240600401040000477
60595+:103AB000000316008F8400340A000E8224060041A1
60596+:103AC00000021603044100178F84003424060042CC
60597+:103AD0008F8200283C076019944500D430A5FFFF71
60598+:103AE0000E000AF1000000000A000E97000000001E
60599+:103AF0009202000B24030016304200FF1043000620
60600+:103B0000000000009202000B24030017304200FF67
60601+:103B100014430004000000000E000E11000000001D
60602+:103B2000004088210E000B68000000009202000A8D
60603+:103B3000304200081040000624020C808F850028C7
60604+:103B40003C0400080E0011EE0344202124020C80E6
60605+:103B5000AF4200248FBF0018022010218FB0001048
60606+:103B60008FB1001403E0000827BD002027BDFFE847
60607+:103B7000AFBF0014AFB000108F5000243C0308000A
60608+:103B80008C6300E08F4501002402FF8000A3182110
60609+:103B90003064007F03442021006218243C02000AA4
60610+:103BA00000822021AF850034AF4300249082006260
60611+:103BB000AF8400283042000F34420050A0820062DF
60612+:103BC0003C02001F3442FF800E00062602028024C1
60613+:103BD000AF5000248FBF00148FB0001003E0000826
60614+:103BE00027BD00183C0208008C4200201040001D38
60615+:103BF0002745010090A300093C0200080342202150
60616+:103C000024020018546200033C0200080A000ED887
60617+:103C10002402000803422021240200161462000539
60618+:103C20002402001724020012A082003F0A000EE2C4
60619+:103C300094A700085462000694A700089362000548
60620+:103C40002403FFFE00431024A362000594A700088C
60621+:103C500090A6001B8CA4000094A500060A000ACCC4
60622+:103C600000073C0003E000080000000027440100BA
60623+:103C700094820008304500FF38A3008238A20084F7
60624+:103C80002C6300012C420001006218251060000620
60625+:103C9000240200839382002D1040000D00000000DC
60626+:103CA0000A000B9B0000000014A2000524A2FF8064
60627+:103CB0008F4301043C02602003E00008AC43001481
60628+:103CC000304200FF2C420002104000032402002278
60629+:103CD0000A000E3C0000000014A2000300000000D7
60630+:103CE0000A000EA9000000000A000EC70000000034
60631+:103CF0009363007E9362007A144300090000202140
60632+:103D00009362000024030050304200FF144300047B
60633+:103D1000240400019362007E24420001A362007E1D
60634+:103D200003E00008008010218F4201F80440FFFEEC
60635+:103D300024020002AF4401C0A34201C43C021000AF
60636+:103D400003E00008AF4201F827BDFFE8AFBF001055
60637+:103D50009362003F2403000A304200FF14430046F0
60638+:103D6000000000008F6300548F62004C1062007DE1
60639+:103D7000036030219362000024030050304200FFB2
60640+:103D80001443002F000000008F4401403C02080053
60641+:103D90008C4200E02403FF800082102100431024A5
60642+:103DA000AF4200243C0208008C4200E08F650054C2
60643+:103DB0003C03000A008220213084007F034410214C
60644+:103DC00000431021AC4501089762003C8F63004C12
60645+:103DD0003042FFFF0002104000621821AF63005C18
60646+:103DE0008F6300548F64004C9762003C006418237A
60647+:103DF0003042FFFF00031843000210400043102A26
60648+:103E000010400006000000008F6200548F63004CD9
60649+:103E1000004310230A000F58000210439762003C31
60650+:103E20003042FFFF00021040ACC2006424020001D7
60651+:103E3000A0C0007CA0C2008424020C80AF420024F9
60652+:103E40000E000F0A8F440140104000478FBF001042
60653+:103E50008F4301408F4201F80440FFFE240200021C
60654+:103E6000AF4301C0A34201C43C021000AF4201F8BD
60655+:103E70000A000FA88FBF00109362003F24030010B8
60656+:103E8000304200FF14430004000000008F44014052
60657+:103E90000A000F94000028219362003F24030016BB
60658+:103EA000304200FF1443000424020014A362003FC8
60659+:103EB0000A000FA2000000008F62004C8F630050C8
60660+:103EC00000431023044100288FBF0010936200813B
60661+:103ED00024420001A3620081936200812C4200040D
60662+:103EE00014400010000000009362003F240300040F
60663+:103EF000304200FF14430006000000008F440140E0
60664+:103F00008FBF0010240500930A0005A027BD0018EC
60665+:103F10008F440140240500938FBF00100A00060F54
60666+:103F200027BD00188F4401400E0002500000000021
60667+:103F30008F6200542442FFFFAF6200548F62005032
60668+:103F40002442FFFFAF6200500E0002598F4401402F
60669+:103F50008F4401408FBF0010240500040A00025E58
60670+:103F600027BD00188FBF001003E0000827BD001810
60671+:103F70008F4201889363007E00021402304400FFE8
60672+:103F8000306300FF1464000D0000000093620080A5
60673+:103F9000304200FF1044000900000000A3640080CC
60674+:103FA0009362000024030050304200FF14430004D9
60675+:103FB000000000000A0006D78F440180A36400803F
60676+:103FC00003E000080000000027BDFFE8AFB00010CC
60677+:103FD000AFBF00149362000524030030304200306C
60678+:103FE00014430089008080213C0208008C4200209C
60679+:103FF00010400080020020210E0004930000000009
60680+:104000008F850020ACB000009362003E9363003FB8
60681+:10401000304200FF00021200306300FF0043102511
60682+:10402000ACA2000493620082000216000002160394
60683+:1040300004410005000000003C0308008C630048B8
60684+:104040000A000FE6000000009362003E304200408C
60685+:10405000144000030000182193620081304300FFE8
60686+:104060009362008200031E00304200FF0002140031
60687+:1040700000621825ACA300088F620040ACA2000CBF
60688+:104080008F620048ACA200108F62004CACA20014FA
60689+:104090008F6200508F63004C0043102304410003E3
60690+:1040A000000000000A000FFA8F62004C8F6200507F
60691+:1040B000ACA200183C02080094424B5E3C03C00BCB
60692+:1040C00000002021004310250E0004B8ACA2001C03
60693+:1040D0008F6200548F840020AC8200008F620058F1
60694+:1040E000AC8200048F62005CAC8200088F620060CA
60695+:1040F0008F43007400431021AC82000C8F62006477
60696+:10410000AC820010976300689762006A00031C008D
60697+:104110003042FFFF00621825AC83001493620082D6
60698+:1041200024030080304200FF14430003000000001D
60699+:104130000A00102EAC8000188F63000C24020001CE
60700+:104140001062000E2402FFFF9362003E30420040E6
60701+:104150001440000A2402FFFF8F63000C8F4200749A
60702+:10416000006218233C020800006210241440000280
60703+:10417000000028210060282100051043AC820018AF
60704+:104180003C02080094424B5E3C03C00C000020211E
60705+:10419000004310258F8300200E0004B8AC62001C81
60706+:1041A0008F6200188F8300203C05080094A54B5EA9
60707+:1041B00024040001AC620000AC6000048F66006C57
60708+:1041C0003C02400D00A22825AC6600088F6200DC8E
60709+:1041D000AC62000CAC600010936200050002160097
60710+:1041E000AC620014AC6000180E0004B8AC65001C92
60711+:1041F000020020218FBF00148FB00010A3600005C3
60712+:104200000A00042127BD00188FBF00148FB00010D2
60713+:1042100003E0000827BD00189742007C30C600FF6D
60714+:10422000A08600843047FFFF2402000514C2000B63
60715+:1042300024E3465090A201122C42000710400007D0
60716+:1042400024E30A0090A30112240200140062100467
60717+:1042500000E210210A0010663047FFFF3067FFFFC1
60718+:1042600003E00008A4870014AC87004C8CA201086E
60719+:104270000080402100A0482100E2102330C600FF4A
60720+:104280001840000393AA001324E2FFFCACA201082B
60721+:1042900030C2000110400008000000008D020050F4
60722+:1042A00000E2102304410013240600058D0200548F
60723+:1042B00010E20010000000008D02005414E2001A09
60724+:1042C000000000003C0208008C4200D83042002070
60725+:1042D0001040000A2402000191030078910200833B
60726+:1042E000144300062402000101002021012028219E
60727+:1042F000240600040A00105400000000A1000084FD
60728+:1043000011400009A50200148F4301008F4201F8FB
60729+:104310000440FFFE24020002AF4301C0A34201C4D7
60730+:104320003C021000AF4201F803E00008000000006A
60731+:1043300027BDFFE88FA90028AFBF001000804021F3
60732+:1043400000E918231860007330C600FFA080007CCD
60733+:10435000A08000818CA2010800E210230440004DDF
60734+:10436000000000008C8200509483003C8C84006428
60735+:10437000004748233063FFFF012318210083202BCF
60736+:1043800010800004000000008D0200640A0010B7D5
60737+:1043900000E210219502003C3042FFFF0122102173
60738+:1043A00000E21021AD02005C9502003C8D03005C30
60739+:1043B0003042FFFF0002104000E210210043102BAA
60740+:1043C00010400003000000000A0010C68D02005CCF
60741+:1043D0009502003C3042FFFF0002104000E2102135
60742+:1043E000AD02005CA1000084AD07004C8CA2010866
60743+:1043F00000E210231840000224E2FFFCACA20108F6
60744+:1044000030C200011040000A000000008D02005080
60745+:1044100000E2102304410004010020218D02005419
60746+:1044200014E20003000000000A0010E82406000562
60747+:104430008D02005414E200478FBF00103C020800B8
60748+:104440008C4200D8304200201040000A24020001B3
60749+:1044500091030078910200831443000624020001B6
60750+:1044600001002021240600048FBF00100A00105410
60751+:1044700027BD0018A1000084A50200148F4301008D
60752+:104480008F4201F80440FFFE240200020A00110DD1
60753+:10449000000000008C82005C004910230043102BB8
60754+:1044A00054400001AC87005C9502003C3042FFFFA5
60755+:1044B0000062102B14400007240200029502003C09
60756+:1044C0008D03005C3042FFFF00621821AD03005CE9
60757+:1044D00024020002AD07004CA10200840E000F0A66
60758+:1044E0008F4401001040001B8FBF00108F4301005C
60759+:1044F0008F4201F80440FFFE24020002AF4301C0D6
60760+:10450000A34201C43C021000AF4201F80A0011238B
60761+:104510008FBF001030C200101040000E8FBF00107F
60762+:104520008C83005C9482003C006918233042FFFFBA
60763+:10453000006218213C023FFF3444FFFF0083102B30
60764+:10454000544000010080182101231021AD02005CBD
60765+:104550008FBF001003E0000827BD001827BDFFE84B
60766+:104560008FAA0028AFBF00100080402100EA482336
60767+:104570001920002130C600FF8C83005C8C8200640F
60768+:10458000006A18230043102B5040001000691821C6
60769+:1045900094A2011001221021A4A2011094A20110E2
60770+:1045A0003042FFFF0043102B1440000A3C023FFF43
60771+:1045B00094A2011000431023A4A201109482003C95
60772+:1045C0003042FFFF0A00114200621821A4A001102E
60773+:1045D0003C023FFF3444FFFF0083102B5440000196
60774+:1045E0000080182100671021AD02005CA100007C52
60775+:1045F0000A00118AA100008130C200101040003C66
60776+:10460000000000008C820050004A1023184000383F
60777+:10461000000000009082007C24420001A082007C07
60778+:104620009082007C3C0308008C630024304200FF31
60779+:104630000043102B1440005C8FBF00108CA20108B7
60780+:1046400000E2102318400058000000008C83005442
60781+:104650009482003C006A18233042FFFF0003184395
60782+:10466000000210400043102A104000050000000026
60783+:104670008C820054004A10230A001171000210437A
60784+:104680009482003C3042FFFF00021040AD02006403
60785+:104690009502003C8D0400649503003C3042FFFF0E
60786+:1046A00000021040008220213063FFFF00831821A8
60787+:1046B00001431021AD02005C8D020054ACA2010840
60788+:1046C00024020002A10200840E000F0A8F440100A0
60789+:1046D000104000358FBF00108F4301008F4201F85A
60790+:1046E0000440FFFE240200020A0011B30000000093
60791+:1046F000AD07004C8CA2010800E210231840000214
60792+:1047000024E2FFFCACA2010830C200011040000A04
60793+:10471000000000008D02005000E21023044100045C
60794+:10472000010020218D02005414E20003000000006B
60795+:104730000A0011AA240600058D02005414E2001A92
60796+:104740008FBF00103C0208008C4200D8304200208D
60797+:104750001040000A240200019103007891020083B6
60798+:104760001443000624020001010020212406000455
60799+:104770008FBF00100A00105427BD0018A10000844C
60800+:10478000A50200148F4301008F4201F80440FFFE90
60801+:1047900024020002AF4301C0A34201C43C02100046
60802+:1047A000AF4201F88FBF001003E0000827BD0018DA
60803+:1047B0008FAA00108C8200500080402130C600FF7C
60804+:1047C000004A102300A048211840000700E01821EB
60805+:1047D00024020001A0800084A0A00112A482001481
60806+:1047E0000A001125AFAA0010A0800081AD07004C7F
60807+:1047F0008CA2010800E210231840000224E2FFFC12
60808+:10480000ACA2010830C20001104000080000000006
60809+:104810008D0200500062102304410013240600059D
60810+:104820008D02005410620010000000008D02005440
60811+:1048300014620011000000003C0208008C4200D805
60812+:10484000304200201040000A240200019103007849
60813+:10485000910200831443000624020001010020217C
60814+:1048600001202821240600040A0010540000000042
60815+:10487000A1000084A502001403E00008000000006D
60816+:1048800027BDFFE0AFBF0018274201009046000A95
60817+:104890008C4800148C8B004C9082008430C900FF3F
60818+:1048A00001681823304A00FF1C60001A2D460006DC
60819+:1048B000240200010142100410C00016304300031E
60820+:1048C000012030210100382114600007304C000C19
60821+:1048D00015800009304200301440000B8FBF0018D3
60822+:1048E0000A001214000000000E001125AFAB0010EA
60823+:1048F0000A0012148FBF00180E00109AAFAB001000
60824+:104900000A0012148FBF0018AFAB00100E0011BACE
60825+:10491000AFAA00148FBF001803E0000827BD0020D5
60826+:1049200024020003A08200848C82005403E000086B
60827+:10493000ACA201083C0200080342182190620081E9
60828+:10494000240600433C07601924420001A062008154
60829+:10495000906300813C0208008C4200C0306300FF7D
60830+:10496000146200102403FF803C0208008C4200E027
60831+:104970000082102100431024AF4200243C020800B2
60832+:104980008C4200E03C03000A008210213042007F8C
60833+:104990000342102100431021944500D40A000AF17B
60834+:1049A00030A5FFFF03E000080000000027BDFFE086
60835+:1049B000AFBF0018AFB10014AFB000108F4201803C
60836+:1049C0000080802100A088210E00121B00402021C1
60837+:1049D000A20000848E0200548FBF00188FB0001018
60838+:1049E000AE2201088FB1001403E0000827BD0020AB
60839+:1049F00027BDFFE03C020008AFB00010AFBF0018B9
60840+:104A0000AFB10014034280218F5101409203008412
60841+:104A10008E0400508E02004C14820040306600FF6D
60842+:104A20003C0208008C4200E02403FF800222102197
60843+:104A300000431024AF4200243C0208008C4200E0F6
60844+:104A40009744007C92050081022210213042007FB1
60845+:104A5000034218213C02000A0062182114A0000B36
60846+:104A60003084FFFF2402000554C20014248205DCB8
60847+:104A70009062011224420001A062011224020C8003
60848+:104A8000AF4200240A00127324020005A060011244
60849+:104A90002402000514C20009248205DC9202008170
60850+:104AA0002C4200075040000524820A009203008136
60851+:104AB0002402001400621004008210213044FFFF21
60852+:104AC000A60400140E00121B022020219602003CB6
60853+:104AD0008E03004C022020213042FFFF00021040D4
60854+:104AE000006218210E000250AE03005C9202007DAD
60855+:104AF00002202021344200400E000259A202007D13
60856+:104B00008F4201F80440FFFE24020002AF5101C0B1
60857+:104B1000A34201C43C021000AF4201F88FBF00184D
60858+:104B20008FB100148FB0001003E0000827BD0020F3
60859+:104B300008000ACC08000B1408000B9808000BE4CE
60860+:104B400008000C200A0000280000000000000000FF
60861+:104B50000000000D6370362E322E3300000000007E
60862+:104B60000602030400000000000000000000000036
60863+:104B70000000000000000000000000000000000035
60864+:104B80000000000000000000000000000000002005
60865+:104B90000000000000000000000000000000000015
60866+:104BA0000000000000000000000000000000000005
60867+:104BB00000000000000000000000000000000001F4
60868+:104BC0000000002B000000000000000400030D4066
60869+:104BD00000000000000000000000000000000000D5
60870+:104BE00000000000000000001000000300000000B2
60871+:104BF0000000000D0000000D3C020800244258A4F3
60872+:104C00003C03080024635F70AC4000000043202B8D
60873+:104C10001480FFFD244200043C1D080037BD7FFCCA
60874+:104C200003A0F0213C100800261000A03C1C080046
60875+:104C3000279C58A40E0001AC000000000000000DED
60876+:104C400027BDFFE83C096018AFBF00108D2C500055
60877+:104C5000240DFF7F24080031018D5824356A380C5B
60878+:104C600024070C003C1A8000AD2A50003C04800A46
60879+:104C7000AF4800083C1B8008AF4700240E00091510
60880+:104C8000AF8400100E0008D8000000000E000825B8
60881+:104C9000000000000E001252000000003C046016EC
60882+:104CA0008C8500003C06FFFF3C02535300A61824ED
60883+:104CB0001062004734867C0094C201F2A780002C69
60884+:104CC00010400003A78000CC38581E1EA798002C67
60885+:104CD00094C201F810400004978300CC38591E1E7E
60886+:104CE000A79900CC978300CC2C7F006753E000018C
60887+:104CF000240300669784002C2C82040114400002D7
60888+:104D000000602821240404003C0760008CE904387A
60889+:104D10002403103C3128FFFF1103001F30B9FFFFAF
60890+:104D200057200010A38000CE24020050A38200CEA2
60891+:104D3000939F00CE53E0000FA78500CCA78000CC46
60892+:104D4000978500CC8FBF0010A780002CA78000346F
60893+:104D5000A78000E63C010800AC25008003E00008C5
60894+:104D600027BD0018939F00CE57E0FFF5A78000CC29
60895+:104D7000A78500CC978500CC8FBF0010A784002C9E
60896+:104D8000A7800034A78000E63C010800AC25008025
60897+:104D900003E0000827BD0018A38000CE8CCB003CA8
60898+:104DA000316A00011140000E0000000030A7FFFF33
60899+:104DB00010E0FFDE240200508CCC00C831860001D8
60900+:104DC00014C0FFDC939F00CE0A00007A2402005139
60901+:104DD0008C8F00043C0E60000A00005D01EE302163
60902+:104DE0008CEF0808240D5708000F740211CD000441
60903+:104DF00030B8FFFF240500660A00007B240404008D
60904+:104E00001700FFCC939F00CE0A00007A24020050C6
60905+:104E10008F8600103089FFFF000939408CC30010D5
60906+:104E20003C08005000E82025AF4300388CC5001432
60907+:104E300027420400AF82001CAF45003CAF44003065
60908+:104E40000000000000000000000000000000000062
60909+:104E50000000000000000000000000000000000052
60910+:104E60008F4B0000316A00201140FFFD0000000060
60911+:104E700003E00008000000008F840010948A001AEC
60912+:104E80008C8700243149FFFF000940C000E8302131
60913+:104E9000AF46003C8C8500248F43003C00A31023C8
60914+:104EA00018400029000000008C8B002025620001C2
60915+:104EB0003C0D005035AC0008AF420038AF4C00301C
60916+:104EC00000000000000000000000000000000000E2
60917+:104ED00000000000000000000000000000000000D2
60918+:104EE0008F4F000031EE002011C0FFFD00000000D8
60919+:104EF0008F4A04003C080020AC8A00108F4904044B
60920+:104F0000AC890014AF4800300000000094860018FF
60921+:104F10009487001C00C71821A48300189485001AE8
60922+:104F200024A20001A482001A9498001A9499001EE9
60923+:104F3000133800030000000003E000080000000038
60924+:104F400003E00008A480001A8C8200200A0000DC24
60925+:104F50003C0D00500A0000CD000000003C0308009A
60926+:104F60008C6300208F82001827BDFFE810620008C4
60927+:104F7000AFBF00100E000104AF8300183C0308000F
60928+:104F80008C63002024040001106400048F89001049
60929+:104F90008FBF001003E0000827BD00188FBF00106E
60930+:104FA0003C076012A520000A9528000A34E500108D
60931+:104FB00027BD00183106FFFF03E00008ACA60090F3
60932+:104FC0003C0208008C42002027BDFFC8AFBF003460
60933+:104FD000AFBE0030AFB7002CAFB60028AFB500248D
60934+:104FE000AFB40020AFB3001CAFB20018AFB10014D3
60935+:104FF00010400050AFB000108F840010948600065F
60936+:105000009483000A00C3282330B6FFFF12C0004A71
60937+:105010008FBF003494890018948A000A012A402323
60938+:105020003102FFFF02C2382B14E0000202C020212F
60939+:10503000004020212C8C0005158000020080A0215A
60940+:10504000241400040E0000B3028020218F8700107A
60941+:1050500002809821AF80001494ED000A028088211C
60942+:105060001280004E31B2FFFF3C1770003C1540002B
60943+:105070003C1E60008F8F001C8DEE000001D71824AD
60944+:10508000507500500220202102A3802B160000350D
60945+:105090003C182000507800470220202124100001F5
60946+:1050A0008F83001414600039029158230230F823D2
60947+:1050B0000250C82133F1FFFF1620FFEE3332FFFF0D
60948+:1050C0008F8700103C110020AF510030000000001D
60949+:1050D00094E6000A3C1E601237D5001002662821B3
60950+:1050E000A4E5000A94E2000A94F2000A94F400187D
60951+:1050F0003057FFFF1292003BAEB700908CED0014CA
60952+:105100008CE400100013714001AE4021000E5FC31B
60953+:10511000010E502B008B4821012A1821ACE8001405
60954+:10512000ACE3001002D3382330F6FFFF16C0FFB9FE
60955+:105130008F8400108FBF00348FBE00308FB7002CDB
60956+:105140008FB600288FB500248FB400208FB3001CC9
60957+:105150008FB200188FB100148FB0001003E0000868
60958+:1051600027BD0038107E001B000000001477FFCC24
60959+:10517000241000010E00159B000000008F83001416
60960+:105180001060FFCB0230F823029158238F87001064
60961+:10519000017020210A0001973093FFFF8F830014D4
60962+:1051A0001460FFCB3C110020AF5100300A000163B6
60963+:1051B000000000000E00077D024028210A00015770
60964+:1051C000004080210E00033A024028210A000157C6
60965+:1051D000004080210E001463022020210A000157A4
60966+:1051E000004080210E0000CD000000000A0001797F
60967+:1051F00002D3382327BDFFE8AFB00010AFBF0014C3
60968+:105200000E00003F000000003C028000345000709F
60969+:105210000A0001BA8E0600008F4F000039EE00012F
60970+:1052200031C20001104000248F8600A88E070000C4
60971+:105230003C0C08008D8C003C3C0908008D2900388E
60972+:1052400000E66823018D28210000502100AD302B9D
60973+:10525000012A4021010620213C010800AC25003C28
60974+:10526000AF8700A83C010800AC2400380E000106FE
60975+:10527000000000003C0308008C6300701060FFE633
60976+:10528000006020213C0508008CA500683C06080051
60977+:105290008CC6006C0E00152A000000003C010800BE
60978+:1052A000AC2000708F4F000039EE000131C20001C8
60979+:1052B0001440FFDE8F8600A88E0A00008F8B00A8A6
60980+:1052C0003C0508008CA5003C3C0408008C84003898
60981+:1052D000014B482300A938210082182100E9402B06
60982+:1052E000006810213C010800AC27003C3C0108008C
60983+:1052F000AC2200388F5F01002419FF0024180C0035
60984+:1053000003F9202410980012AF840000AF4400205D
60985+:10531000936D0000240C002031A600FF10CC001279
60986+:10532000240E005010CE00043C194000AF59013843
60987+:105330000A0001B3000000000E0011C800000000C8
60988+:105340003C194000AF5901380A0001B300000000C9
60989+:105350000E00011F000000003C194000AF59013849
60990+:105360000A0001B3000000008F58010000802821CE
60991+:10537000330F00FF01E020210E0002F1AF8F000487
60992+:105380003C194000AF5901380A0001B30000000089
60993+:1053900000A4102B2403000110400009000030215C
60994+:1053A0000005284000A4102B04A0000300031840AF
60995+:1053B0005440FFFC000528405060000A0004182BF0
60996+:1053C0000085382B54E000040003184200C3302548
60997+:1053D00000852023000318421460FFF900052842CD
60998+:1053E0000004182B03E0000800C310218F4201B80D
60999+:1053F0000440FFFE00000000AF4401803C031000A9
61000+:1054000024040040AF450184A3440188A3460189D8
61001+:10541000A747018A03E00008AF4301B83084FFFFCB
61002+:105420000080382130A5FFFF000020210A00022A59
61003+:10543000240600803087FFFF8CA40000240600387B
61004+:105440000A00022A000028218F8300388F8600304E
61005+:105450001066000B008040213C07080024E75A1822
61006+:10546000000328C000A710218C4400002463000121
61007+:10547000108800053063000F5466FFFA000328C04F
61008+:1054800003E00008000010213C07080024E75A1C34
61009+:1054900000A7302103E000088CC200003C0390000C
61010+:1054A0003462000100822025AF4400208F45002097
61011+:1054B00004A0FFFE0000000003E000080000000060
61012+:1054C0003C038000346200010082202503E00008D4
61013+:1054D000AF44002027BDFFE0AFB100143091FFFFC3
61014+:1054E000AFB00010AFBF00181220001300A0802141
61015+:1054F0008CA2000024040002240601401040000F8A
61016+:10550000004028210E000C5C00000000000010216B
61017+:10551000AE000000022038218FBF00188FB10014A8
61018+:105520008FB0001000402021000028210000302111
61019+:105530000A00022A27BD00208CA200000220382188
61020+:105540008FBF00188FB100148FB0001000402021D1
61021+:1055500000002821000030210A00022A27BD002077
61022+:1055600000A010213087FFFF8CA500048C440000B0
61023+:105570000A00022A2406000627BDFFE0AFB0001093
61024+:10558000AFBF0018AFB100149363003E00808021CC
61025+:105590000080282130620040000020211040000FD0
61026+:1055A0008E1100000E000851022020219367000098
61027+:1055B0002404005030E500FF50A400128E0F0000BC
61028+:1055C000022020218FBF00188FB100148FB000106F
61029+:1055D000A762013C0A00091127BD00200E000287C6
61030+:1055E000000000000E0008510220202193670000F7
61031+:1055F0002404005030E500FF14A4FFF20220202113
61032+:105600008E0F00003C1008008E1000503C0D000C66
61033+:10561000240BFF8001F05021314E007F01DA602120
61034+:10562000018D4021014B4824AF4900280220202150
61035+:105630008FBF00188FB100148FB00010A50200D6E4
61036+:1056400027BD00200A000911AF8800D027BDFFE068
61037+:10565000AFBF0018AFB10014AFB0001093660001E7
61038+:10566000008080210E00025630D1000493640005B2
61039+:10567000001029C2A765000034830040A363000521
61040+:105680000E00025F020020210E00091302002021FB
61041+:1056900024020001AF62000C02002821A762001062
61042+:1056A00024040002A762001224060140A76200142D
61043+:1056B0000E000C5CA76200161620000F8FBF0018AA
61044+:1056C000978C00343C0B08008D6B00782588FFFF19
61045+:1056D0003109FFFF256A0001012A382B10E000067E
61046+:1056E000A78800343C0F6006240E001635ED00102C
61047+:1056F000ADAE00508FBF00188FB100148FB00010F6
61048+:1057000003E0000827BD002027BDFFE0AFB1001473
61049+:10571000AFBF0018AFB0001000A088211080000AB1
61050+:105720003C03600024020080108200120000000090
61051+:105730000000000D8FBF00188FB100148FB0001053
61052+:1057400003E0000827BD00208C682BF80500FFFE51
61053+:1057500000000000AC712BC08FBF00188FB1001487
61054+:105760008FB000103C09100027BD002003E00008A6
61055+:10577000AC692BF80E00025600A0202193650005AD
61056+:10578000022020210E00025F30B000FF2403003E03
61057+:105790001603FFE7000000008F4401780480FFFE3D
61058+:1057A000240700073C061000AF51014002202021D1
61059+:1057B000A34701448FBF00188FB100148FB00010B1
61060+:1057C000AF4601780A0002C227BD002027BDFFE8CE
61061+:1057D000AFBF0014AFB000108F50002000000000D9
61062+:1057E0000E000913AF440020AF5000208FBF0014FB
61063+:1057F0008FB0001003E0000827BD00183084FFFFC1
61064+:10580000008038212406003500A020210A00022A49
61065+:10581000000028213084FFFF008038212406003654
61066+:1058200000A020210A00022A0000282127BDFFD065
61067+:10583000AFB3001C3093FFFFAFB50024AFB2001828
61068+:10584000AFBF0028AFB40020AFB10014AFB000105C
61069+:1058500030B5FFFF12600027000090218F90001CE0
61070+:105860008E0300003C0680002402004000033E023C
61071+:1058700000032C0230E4007F006688241482001D9F
61072+:1058800030A500FF8F8300282C68000A510000100B
61073+:105890008F910014000358803C0C0800258C56940E
61074+:1058A000016C50218D49000001200008000000001B
61075+:1058B00002B210213045FFFF0E000236240400849E
61076+:1058C000162000028F90001CAF8000288F910014DA
61077+:1058D000260C002026430001018080213072FFFF4A
61078+:1058E00016200004AF8C001C0253502B1540FFDC27
61079+:1058F00000000000024010218FBF00288FB5002457
61080+:105900008FB400208FB3001C8FB200188FB1001429
61081+:105910008FB0001003E0000827BD0030240E0034D3
61082+:1059200014AE00F9000000009203000E241F168040
61083+:105930003C07000CA36300219202000D0347C8211D
61084+:105940003C066000A3620020961100123C0A7FFF13
61085+:10595000354CFFFFA771003C960B00102403000597
61086+:105960003168FFFFAF6800848E05001CAF5F002820
61087+:105970008F3800008CC4444803057826008F3021FE
61088+:10598000AF66004C8F69004C24CE00013C057F00BF
61089+:10599000AF6900508F740050AF740054AF66007050
61090+:1059A000AF6E00588F6D005824140050AF6D005C2E
61091+:1059B000A3600023AF6C0064A36300378E02001461
61092+:1059C000AF6200488F710048AF7100248E0B001841
61093+:1059D000AF6B006C9208000CA3680036937F003E0A
61094+:1059E00037F90020A379003E8F78007403058024E6
61095+:1059F000360F4000AF6F007493640000308900FFE1
61096+:105A0000513402452404FF803C04080024845A9841
61097+:105A10000E00028D000000003C1008008E105A9805
61098+:105A20000E00025602002021240600042407000173
61099+:105A3000A366007D020020210E00025FA36700051F
61100+:105A40008F5F017807E0FFFE240B0002AF5001409A
61101+:105A5000A34B01448F90001C3C081000AF48017814
61102+:105A60000A000362AF8000282CAD003751A0FF98D8
61103+:105A70008F9100140005A0803C180800271856BC20
61104+:105A8000029878218DEE000001C00008000000009F
61105+:105A90002418000614B80011000000003C0808009B
61106+:105AA0008D085A9824040005AF4800208E1F001866
61107+:105AB000AF7F00188F79004CAF79001C8F650050C4
61108+:105AC000122000C0AF6500700A000362AF84002896
61109+:105AD0002406000710A60083240300063C050800E6
61110+:105AE00024A55A980E000264240400818F90001CA3
61111+:105AF0000011102B0A000362AF8200282407000463
61112+:105B000014A7FFF6240500503C1808008F185A9877
61113+:105B1000AF5800208E0F0008AF6F00408E090008BC
61114+:105B2000AF6900448E14000CAF7400488E0E001054
61115+:105B3000AF6E004C8E0D0010AF6D00848E0A001405
61116+:105B4000AF6A00508E0C0018AF6C00548E04001C1D
61117+:105B5000AF64005893630000306B00FF116501D8FB
61118+:105B6000000000008F7400488F6900400289702394
61119+:105B700005C000042404008C1620FFDE240200036C
61120+:105B8000240400823C05080024A55A980E000287D0
61121+:105B9000000000008F90001C000010210A0003622A
61122+:105BA000AF820028240F000514AFFFCC240520008D
61123+:105BB0003C0708008CE75A98AF4700208E06000487
61124+:105BC000AF66005C9208000824100008A36800215A
61125+:105BD0008F9F001C93F90009A37900208F86001C79
61126+:105BE00090D8000A330400FF10900011000000005C
61127+:105BF0002885000914A0006924020002240A00205C
61128+:105C0000108A000B34058000288D002115A00008A3
61129+:105C100024054000240E0040108E00053C050001C4
61130+:105C200024140080109400023C050002240540006A
61131+:105C30008F7800743C19FF00031980240205782531
61132+:105C4000AF6F007490C4000BA36400818F84001CAC
61133+:105C50009489000C11200192000000009490000C27
61134+:105C60002406FFBF24050004A770003C908F000E9F
61135+:105C7000A36F003E8F84001C9089000FA369003F32
61136+:105C80008F8B001C8D6E00108F54007401D468231C
61137+:105C9000AF6D00608D6A0014AF6A0064956C0018E7
61138+:105CA000A76C00689563001AA763006A8D62001CE8
61139+:105CB000AF62006C9167000EA367003E9368003EE0
61140+:105CC0000106F8241220014BA37F003E8F90001C98
61141+:105CD0000A000362AF8500282407002214A7FF7F73
61142+:105CE000240300073C0B08008D6B5A981220000C0F
61143+:105CF000AF4B00200A000362AF830028240C00335E
61144+:105D000010AC0014240A00283C05080024A55A9869
61145+:105D10000E00023C240400810A0003EB8F90001C5B
61146+:105D20003C04080024845A980E00028D00000000F4
61147+:105D30009363000024110050306200FF10510135C0
61148+:105D4000000000008F90001C000018210A00036270
61149+:105D5000AF8300283C0D08008DAD5A9824040081C3
61150+:105D6000AF4D00203C05080024A55A980E00023CC7
61151+:105D7000A36A00348F90001C240200090A00036209
61152+:105D8000AF82002802B288213225FFFF0E000236C2
61153+:105D9000240400840A0003628F90001C1082FFA478
61154+:105DA00024050400288B000311600170240C0004FA
61155+:105DB000240300015483FF9E240540000A00043B95
61156+:105DC000240501003C04080024845A988F62004C8A
61157+:105DD0000E00028D8F6300508F90001C0000202168
61158+:105DE0000A000362AF8400288E1000042404008A95
61159+:105DF000AF50002093790005333800021700015F8F
61160+:105E0000020028219368002302002821311F00206E
61161+:105E100017E0015A2404008D9367003F2406001206
61162+:105E200030E200FF10460155240400810E000256A6
61163+:105E30000200202193630023240500040200202196
61164+:105E4000346B0042A36B00230E00025FA365007D4C
61165+:105E50008F4401780480FFFE240A0002AF50014005
61166+:105E6000A34A01448F90001C3C0C1000AF4C0178F9
61167+:105E70000A0003EC0011102B8E1000042404008A89
61168+:105E8000AF500020936E000531CD000215A0001622
61169+:105E900002002821936F003F2414000402002821EF
61170+:105EA00031E900FF11340010240400810E00025675
61171+:105EB000020020219362002324080012241FFFFE09
61172+:105EC00034460020A3660023A368003F93790005B1
61173+:105ED00002002021033FC0240E00025FA3780005CA
61174+:105EE00002002821000020210E00033400000000E1
61175+:105EF0000A0003EB8F90001C8E1000043C03000886
61176+:105F00000343A021AF500020928B000024050050D5
61177+:105F1000316400FF10850161240700880200202100
61178+:105F2000000028210E00022A2406000E928D000097
61179+:105F3000240EFF800200282101AE8025A2900000DF
61180+:105F4000240400040E000C5C240600300A0003EB5D
61181+:105F50008F90001C8E0800043C14080026945A9868
61182+:105F60003C010800AC285A98AF480020921F00035B
61183+:105F700033F9000413200002240200122402000658
61184+:105F8000A362003F920B001B2404FFC03165003F59
61185+:105F900000A43825A367003E9206000330C200012A
61186+:105FA00014400132000000008E020008AE8200089A
61187+:105FB0003C0208008C425AA010400131000249C244
61188+:105FC000A76900088E14000C240C0001240300149F
61189+:105FD000AF74002C8E0E0010AF6E0030960D0016C0
61190+:105FE000A76D0038960A0014A76A003AAF6C000C3F
61191+:105FF000A76C0010A76C0012A76C0014A76C001609
61192+:1060000012200136A3630034920F000331F0000226
61193+:106010002E1100018F90001C262200080A00036246
61194+:10602000AF8200288E0400043C0E0008034E30218D
61195+:10603000AF4400208E05000890CD0000240C0050D5
61196+:1060400031AA00FF114C00862407008824060009AD
61197+:106050000E00022A000000000A0003EB8F90001CD3
61198+:106060008E04001C0E00024100000000104000F4ED
61199+:10607000004050218F89001C240700890140202105
61200+:106080008D25001C240600010E00022A00000000DD
61201+:106090000A0003EB8F90001C960D00023C140800D0
61202+:1060A00026945A9831AA0004514000B83C10600070
61203+:1060B0008E0E001C3C010800AC2E5A98AF4E0020FA
61204+:1060C000920700102408001430E200FF144800D6A4
61205+:1060D00000000000960B00023163000114600165AE
61206+:1060E000000000008E020004AE8200083C1408008C
61207+:1060F0008E945AA01280015B000000008F7400741F
61208+:106100003C0380002404000102835825AF6B007417
61209+:10611000A3600005AF64000C3C0708008CE75AA0A0
61210+:106120008F86001CA7640010000711C2A76400122C
61211+:10613000A7640014A7640016A76200088CC80008B2
61212+:1061400024040002AF68002C8CC5000CAF65003041
61213+:1061500090DF0010A37F00348F99001C9330001152
61214+:10616000A37000358F98001C930F0012A36F0036A8
61215+:106170008F89001C912E0013A36E00378F90001C96
61216+:10618000960D0014A76D0038960A0016A76A003A0B
61217+:106190008E0C0018AF6C00245620FDCCAF84002874
61218+:1061A0003C05080024A55A980E0002640000202136
61219+:1061B0008F90001C0A0004A7000020218E1000040C
61220+:1061C00024070081AF500020936900233134001070
61221+:1061D000128000170000000002002021000028218A
61222+:1061E0002406001F0E00022A000000000A0003EB34
61223+:1061F0008F90001C3C05080024A55A980E000287C9
61224+:10620000240400828F90001C000028210A000362F1
61225+:10621000AF8500283C0408008C845A980E0014E8CE
61226+:10622000000000008F90001C0A000482000018216A
61227+:106230000E00025602002021937800230200202144
61228+:10624000370F00100E00025FA36F002300003821FB
61229+:1062500002002021000028210A0005A82406001FB2
61230+:10626000920F000C31E90001112000030000000032
61231+:106270009618000EA4D8002C921F000C33F90002CF
61232+:1062800013200005000038218E0200149608001229
61233+:10629000ACC2001CA4C8001A0A0005432406000969
61234+:1062A0003C05080024A55A980E0002872404008BA0
61235+:1062B0008F90001C0011282B0A000362AF85002874
61236+:1062C000AF6000843C0A08008D4A5A983C0D0800D3
61237+:1062D0008DAD0050240CFF803C02000C014D1821B4
61238+:1062E000006C2024AF4400288E070014306B007F20
61239+:1062F000017A282100A2C821AF2700D88E060014F9
61240+:10630000AF9900D0AF2600DC8E080010251FFFFEDD
61241+:106310000A000408AF3F01083C0508008CA55A9804
61242+:106320003C1908008F39005024CCFFFE00B9C02171
61243+:1063300003047824AF4F00283C1408008E945A9828
61244+:106340003C0908008D2900500289702131CD007F61
61245+:1063500001BA502101478021AE0600D8AF9000D08D
61246+:10636000AE0000DC0A0003B1AE0C0108548CFE3014
61247+:10637000240540000A00043B240510000E00032EF3
61248+:10638000000000000A0003EB8F90001C8E0F442CCD
61249+:106390003C186C62370979703C010800AC205A98AF
61250+:1063A00015E9000824050140979F00349786002CCA
61251+:1063B0000280282103E6C82B132000112404009238
61252+:1063C000240501400E000C7A240400023C01080060
61253+:1063D000AC225A98AF4200203C0508008CA55A9880
61254+:1063E00010A00005240400830E00084500000000F2
61255+:1063F00010400009240400833C05080024A55A9895
61256+:106400000E000264000000008F90001C0011202B81
61257+:106410000A000362AF8400280E0008490000000053
61258+:106420000A00055F8F90001C0E00084D0000000060
61259+:106430003C05080024A55A980A00062F2404008B66
61260+:10644000240400040E000C7A240500301440002AB5
61261+:10645000004050218F89001C240700830140202127
61262+:106460008D25001C0A000551240600018E04000839
61263+:106470000E000241000000000A00051BAE82000869
61264+:106480003C05080024A55A980E00023C240400870D
61265+:106490008F90001C0A0005360011102B8F830038E6
61266+:1064A0008F8600301066FE9D000038213C070800F2
61267+:1064B00024E75A1C000320C0008728218CAC000070
61268+:1064C00011900061246A00013143000F5466FFFA05
61269+:1064D000000320C00A0004F6000038213C05080033
61270+:1064E00024A55A980E000287240400828F90001C75
61271+:1064F0000A000536000010213C0B0008034B202148
61272+:106500002403005024070001AF420020A0830000B4
61273+:10651000A08700018F82001C90480004A08800180A
61274+:106520008F85001C90A60005A08600198F9F001C77
61275+:1065300093F90006A099001A8F90001C921800078A
61276+:10654000A098001B8F94001C928F0008A08F001C45
61277+:106550008F89001C912E0009A08E001D8F8D001CBC
61278+:1065600091AC000AA08C001E8F8B001C3C0C080014
61279+:10657000258C5A1C9163000B3C0B0800256B5A18A4
61280+:10658000A083001F8F87001C90E8000CA0880020CB
61281+:106590008F82001C9045000D24024646A0850021F4
61282+:1065A0008F86001C90DF000EA09F00228F99001C98
61283+:1065B0009330000FA09000238F98001C93140010BC
61284+:1065C000A09400248F8F001C91E90011A089002560
61285+:1065D0008F89001C8F8E00308F900038952D00140D
61286+:1065E000000E18C025C80001A48D002895270016AC
61287+:1065F000006C3021006BC821A487002A9525001863
61288+:106600003108000FA485002CA482002E8D3F001CB1
61289+:10661000ACCA0000AF88003011100006AF3F000088
61290+:10662000000038218D25001C014020210A00055161
61291+:1066300024060001250C00013184000F00003821E0
61292+:106640000A0006B8AF8400383C07080024E75A184F
61293+:106650000087302100003821ACA000000A0004F6B9
61294+:10666000ACC000003C05080024A55A980A00062F7B
61295+:10667000240400878E0400040E0002410000000084
61296+:106680000A00056AAE8200083084FFFF30C600FFB2
61297+:106690008F4201B80440FFFE00064400010430258B
61298+:1066A0003C07200000C720253C031000AF400180BC
61299+:1066B000AF450184AF44018803E00008AF4301B84F
61300+:1066C00027BDFFE8AFB00010AFBF00143C0760006B
61301+:1066D000240600021080000600A080210010102B6C
61302+:1066E0008FBF00148FB0001003E0000827BD001812
61303+:1066F0003C09600EAD2000348CE5201C8F82001C0C
61304+:106700002408FFFC00A81824ACE3201C0E0006D1CE
61305+:106710008C45000C0010102B8FBF00148FB00010A0
61306+:1067200003E0000827BD00183C02600E344701005A
61307+:1067300024090018274A040000000000000000009F
61308+:10674000000000003C06005034C30200AF44003893
61309+:10675000AF45003CAF430030014018218F4B000093
61310+:10676000316800201100FFFD2406007F2408FFFF90
61311+:106770008C6C000024C6FFFF24630004ACEC000016
61312+:1067800014C8FFFB24E70004000000000000000024
61313+:10679000000000003C0F0020AF4F00300000000060
61314+:1067A00024AD020001A5702B2529FFFF008E2021BA
61315+:1067B0001520FFE101A0282103E0000800000000EF
61316+:1067C00027BDFFE0AFB10014AFBF0018AFB000109D
61317+:1067D0003C05600E8CA20034008088211440000625
61318+:1067E0003C0460008C87201C2408FFFC00E8302457
61319+:1067F00034C30001AC83201C8F8B001C24090001D2
61320+:10680000ACA90034956900028D6500148D70000CF0
61321+:106810002D2400818D6700048D660008108000071C
61322+:106820008D6A00102D2C00041580000E30CE00075C
61323+:10683000312D000311A0000B000000002404008B88
61324+:10684000020028210E0006D1240600030011102B9F
61325+:106850008FBF00188FB100148FB0001003E0000844
61326+:1068600027BD002015C0FFF62404008B3C03002048
61327+:10687000AF4300300000000024020001AF8200148A
61328+:106880000000000000000000000000003C1F01505C
61329+:10689000013FC825253800033C0F600EAF47003884
61330+:1068A00000181882AF46003C35E8003CAF59003074
61331+:1068B000274704008F4400003086002010C0FFFDF1
61332+:1068C00000000000106000082466FFFF2403FFFFA3
61333+:1068D0008CEB000024C6FFFF24E70004AD0B000092
61334+:1068E00014C3FFFB250800043C08600EAD09003806
61335+:1068F0000000000000000000000000003C07002035
61336+:10690000AF470030000000000E0006F901402021D2
61337+:1069100002002821000020210E0006D124060003D9
61338+:106920000011102B8FBF00188FB100148FB0001012
61339+:1069300003E0000827BD002027BDFFE0AFB200182C
61340+:106940003092FFFFAFB10014AFBF001CAFB000101A
61341+:106950001640000D000088210A0007AA022010211D
61342+:1069600024050001508500278CE5000C0000000D77
61343+:10697000262300013071FFFF24E200200232382B71
61344+:1069800010E00019AF82001C8F8200141440001622
61345+:106990008F87001C3C0670003C0320008CE5000043
61346+:1069A00000A62024148300108F84003C00054402BC
61347+:1069B0003C09800000A980241480FFE9310600FF13
61348+:1069C0002CCA00095140FFEB262300010006688015
61349+:1069D0003C0E080025CE579801AE60218D8B00003B
61350+:1069E0000160000800000000022010218FBF001C81
61351+:1069F0008FB200188FB100148FB0001003E00008B0
61352+:106A000027BD00200E0006D1240400841600FFD804
61353+:106A10008F87001C0A00078BAF80003C90EF0002BC
61354+:106A200000002021240600090E0006D1000F2E00D0
61355+:106A30008F87001C0010102B0A00078BAF82003CD0
61356+:106A4000020028210E0006DF240400018F87001CAD
61357+:106A50000A00078BAF82003C020028210E0006DFEF
61358+:106A6000000020210A0007C38F87001C0E00071FAB
61359+:106A7000020020210A0007C38F87001C30B0FFFFEF
61360+:106A8000001019C08F5801B80700FFFE3C1F2004FA
61361+:106A90003C191000AF430180AF400184AF5F018813
61362+:106AA000AF5901B80A00078C262300013082FFFF8E
61363+:106AB00014400003000018210004240224030010E5
61364+:106AC000308500FF14A000053087000F2466000801
61365+:106AD0000004220230C300FF3087000F14E00005DD
61366+:106AE000308900032468000400042102310300FF00
61367+:106AF0003089000315200005388B0001246A00024C
61368+:106B000000042082314300FF388B00013164000112
61369+:106B100010800002246C0001318300FF03E00008B4
61370+:106B200000601021308BFFFF000B394230E600FF80
61371+:106B30003C09080025295998000640800109602178
61372+:106B40008D8700003164001F240A0001008A1804A8
61373+:106B500030A500FF00E3202514A000020003102749
61374+:106B600000E22024240F000100CF700401096821F5
61375+:106B7000000E282714800005ADA400008F86000CAD
61376+:106B800000A6102403E00008AF82000C8F88000CE0
61377+:106B900001C8102503E00008AF82000C3C06001F6E
61378+:106BA0003C0360003084FFFF34C5FF8024020020D6
61379+:106BB000AC602008AC60200CAC602010AC652014E8
61380+:106BC000AC642018AC62200000000000000000004F
61381+:106BD00003E000080000000027BDFFE82402FFFFDB
61382+:106BE000AFBF0010AF82000C000020213C0608005F
61383+:106BF00024C659982405FFFF248900010004408021
61384+:106C00003124FFFF010618212C87002014E0FFFA31
61385+:106C1000AC6500000E0008160000202124020001CF
61386+:106C20003C04600024050020AC822018AC852000C4
61387+:106C3000000000000000000000000000244A0001E5
61388+:106C40003142FFFF2C46040014C0FFF78FBF001035
61389+:106C500003E0000827BD00188F8300082C620400A1
61390+:106C600003E00008384200018F830008246200011D
61391+:106C700003E00008AF8200088F8300082462FFFF52
61392+:106C800003E00008AF82000827BDFFE0AFB10014A9
61393+:106C9000AFBF0018AFB000108F6B00303C06600033
61394+:106CA00000808821ACCB20088F6A002C3C02800039
61395+:106CB00024030008ACCA200C9769003A9768003892
61396+:106CC00000092C003107FFFF00A72025ACC42010CD
61397+:106CD000ACC22014ACC32000000000000000000083
61398+:106CE000000000003C0360008C6D200031AC000807
61399+:106CF0001580FFF9000000008C6E201405C00020F4
61400+:106D0000000000000E0007DA8F84000C00024080B3
61401+:106D10003C09080025295998010938218CE4000014
61402+:106D20000E0007DA00028140020220213090FFFFAE
61403+:106D3000020020210E0007F8000028213C0C8000F2
61404+:106D4000022C58253210FFFF3C116000240A00205D
61405+:106D5000AE2B2014AE302018AE2A20000000000018
61406+:106D60000000000000000000020010218FBF00188A
61407+:106D70008FB100148FB0001003E0000827BD002081
61408+:106D80008C6620143C02001F3443FF803C1FFFE848
61409+:106D900000C3C02437F9080003198021001079C20C
61410+:106DA0003C0C8000022C582531F0FFFF3C116000A4
61411+:106DB000240A0020AE2B2014AE302018AE2A20006A
61412+:106DC0000000000000000000000000000200102190
61413+:106DD0008FBF00188FB100148FB0001003E00008BF
61414+:106DE00027BD002027BDFFE8AFB000103402FFFF31
61415+:106DF0003090FFFFAFBF00141202000602002021F6
61416+:106E00000E00081600000000020020210E0007F806
61417+:106E1000240500018F8400088FBF00148FB000107C
61418+:106E20002483FFFF27BD001803E00008AF8300089C
61419+:106E3000000439C230E6003F00043B42000718401E
61420+:106E4000240210002CC4002024C8FFE0AF42002C14
61421+:106E5000246300011480000330A900FF00071840DC
61422+:106E6000310600FF0003608024080001019A5821C8
61423+:106E70003C0A000E00C82804016A382111200005D0
61424+:106E8000000530278CE900000125302503E00008CB
61425+:106E9000ACE600008CEE000001C6682403E00008A8
61426+:106EA000ACED000027BDFFE8AFBF0014AFB000108D
61427+:106EB0003C0460008C8508083403F00030A2F00028
61428+:106EC00050430006240200018C8708083404E000C7
61429+:106ED00030E6F00010C4001E24020002AF82004021
61430+:106EE0003C1060003C0A0200AE0A0814240910009D
61431+:106EF0003C08000E8E03440003482021AF49002CBB
61432+:106F0000240501200E000CC0000030218F830040BA
61433+:106F1000106000043C021691240B0001106B000E5F
61434+:106F20003C023D2C344F0090AE0F44088FBF00143C
61435+:106F30008FB000103C0C6000240E10003C0D0200CD
61436+:106F400027BD0018AD8E442003E00008AD8D081069
61437+:106F50000A0008E7AF8000403C0218DA344F009086
61438+:106F6000AE0F44088FBF00148FB000103C0C6000BF
61439+:106F7000240E10003C0D020027BD0018AD8E4420E9
61440+:106F800003E00008AD8D08100A0008BB24050001CD
61441+:106F90000A0008BB000028213C08080025085DA461
61442+:106FA0002404FFFF010018212402001E2442FFFFD9
61443+:106FB000AC6400000441FFFD246300043C070800AA
61444+:106FC00024E75E208CE5FFFC2404001C240600015D
61445+:106FD000308A001F0146480424840001000910275C
61446+:106FE0002C8300201460FFFA00A22824ACE5FFFCEB
61447+:106FF0003C05666634A4616E3C06080024C65EE06B
61448+:10700000AF840058AF88009C2404FFFF00C0182103
61449+:107010002402001F2442FFFFAC6400000441FFFD76
61450+:10702000246300043C0766663C05080024A55EA0B6
61451+:10703000AF86004834E6616EAF8600982404FFFFF7
61452+:1070400000A018212402000F2442FFFFAC640000BE
61453+:107050000441FFFD246300043C0B66663C06080007
61454+:1070600024C65E203568616EAF8500A4AF880070CD
61455+:107070002404FFFF00C018212402001F2442FFFF48
61456+:10708000AC6400000441FFFD246300043C0D66660F
61457+:107090003C0A0800254A5F6035AC616EAF860090FF
61458+:1070A000AF8C005C2404FFFF014018212402000380
61459+:1070B0002442FFFFAC6400000441FFFD2463000490
61460+:1070C0003C09080025295F708D27FFFC2404000679
61461+:1070D000240500013099001F0325C0042484000109
61462+:1070E000001878272C8E002015C0FFFA00EF3824F6
61463+:1070F000AD27FFFC3C09666624030400240403DC7E
61464+:1071000024050200240600663522616E3C08080052
61465+:1071100025085AA4AF820074AF830044AF83006C8B
61466+:10712000AF830050AF830084AF8A008CAF840064CB
61467+:10713000AF85004CAF860054AF840078AF85006007
61468+:10714000AF86008001001821240200022442FFFFC4
61469+:10715000AC6000000441FFFD24630004240400032C
61470+:107160002403000C3C0A0800254A5AB0AF8A006884
61471+:107170000A00098E2405FFFF000418802484000102
61472+:10718000006858212C8700C014E0FFFBAD650000AB
61473+:107190003C0E666635CD616E240C17A024081800DD
61474+:1071A000AF8D0088AF8C009403E00008AF88007CAE
61475+:1071B0002484007F000421C200004021000030210F
61476+:1071C00000003821000028210A0009A5AF8400A092
61477+:1071D0001060000624E7000100C4302124A500014E
61478+:1071E0002CC20BF51440FFFA2CA300663C090800E2
61479+:1071F00025295F6001201821240200032442FFFF9B
61480+:10720000AC6000000441FFFD2463000410E0001A9C
61481+:1072100024E3FFFF0003294210A0000A0000202100
61482+:107220002406FFFF3C03080024635F602484000100
61483+:107230000085502BAC660000250800011540FFFBBF
61484+:107240002463000430E2001F10400008000868803A
61485+:10725000240C0001004C38040008588001692821E2
61486+:1072600024E6FFFF03E00008ACA6000001A94021CE
61487+:107270002409FFFFAD09000003E000080000000042
61488+:10728000AF4400283C04000C034420210005288260
61489+:107290000A000CC000003021000421803C03600083
61490+:1072A000AC6410080000000000052980AC65100CDB
61491+:1072B0000000000003E000088C62100C27BDFFE80E
61492+:1072C0000080282124040038AFBF00140E0009D527
61493+:1072D000AFB0001024040E00AF4400283C10000C96
61494+:1072E00003502021240500100E000CC000003021A6
61495+:1072F00003501021AC400000AC40000424040038CE
61496+:107300008FBF00148FB0001024053FFF27BD001869
61497+:107310000A0009D58C430000000421803C03600072
61498+:10732000AC641008000000008C62100C03E0000840
61499+:107330000002118227BDFFC8AFB400208F940068FF
61500+:10734000AFBE0030AFB7002CAFB600280000B821A8
61501+:107350000080B021241E00C0AFBF0034AFB50024B0
61502+:10736000AFB3001CAFB20018AFB10014AFB0001043
61503+:107370000A000A12AFA5003C504000018F9400683B
61504+:1073800027DEFFFF13C00028269400048E92000021
61505+:107390003C03080024635DA01240FFF70283102B1A
61506+:1073A0003C04080024845AA4028410230002A8C0CC
61507+:1073B000000098210A000A212411000100118840D0
61508+:1073C000122000260000000002B380210251282470
61509+:1073D0000200202110A0FFF9267300010E0009DE33
61510+:1073E000000000000016684032EC000101AC2021D2
61511+:1073F0000E0009D5020028218F89009426F700018C
61512+:107400008FA6003C3AEB0001316A00012528FFFFFE
61513+:107410000011382702CAB021AF88009416E6FFE7B2
61514+:1074200002479024AE92000002E010218FBF00348A
61515+:107430008FBE00308FB7002C8FB600288FB5002488
61516+:107440008FB400208FB3001C8FB200188FB10014CE
61517+:107450008FB0001003E0000827BD00383C0E080084
61518+:1074600025CE5DA0028E102B0A000A0DAE92000000
61519+:1074700027BDFFD8AFB10014AFB00010AFBF0020E0
61520+:10748000AFB3001CAFB2001800A0882110A0001FED
61521+:10749000000480403C13080026735AA40A000A5ACC
61522+:1074A0002412000112200019261000010E0009F517
61523+:1074B00002002021000231422444FFA0000618806F
61524+:1074C0003045001F2C8217A1007318212631FFFFC1
61525+:1074D0001040FFF400B230048C690000020020214B
61526+:1074E00024053FFF012640241500FFEE0126382524
61527+:1074F0000E0009D5AC6700008F8A009426100001A9
61528+:10750000254700011620FFE9AF8700948FBF0020B8
61529+:107510008FB3001C8FB200188FB100148FB0001011
61530+:1075200003E0000827BD00288F85009C00805821BB
61531+:107530000000402100004821240A001F3C0C0800E4
61532+:10754000258C5E1C3C0D080025AD5DA48CA60000BA
61533+:1075500050C000140000402100AD1023000238C0CC
61534+:10756000240300010A000A930000202115000003F3
61535+:1075700000E410212448202400004821252900018E
61536+:10758000512B00132506DFDC106000062484000167
61537+:1075900000C3702415C0FFF5000318400A000A91CB
61538+:1075A0000000402110AC002624A300040060282124
61539+:1075B000254AFFFF1540FFE5AF85009C512B0004D5
61540+:1075C0002506DFDC0000402103E000080100102157
61541+:1075D0000006614230C5001F000C50803C070800C7
61542+:1075E00024E75DA424040001014730211120000F8D
61543+:1075F00000A420043C05080024A55E20148000059A
61544+:107600002529FFFF24C6000410C50011000000005A
61545+:10761000240400018CCF00000004C0270004204097
61546+:1076200001F868241520FFF5ACCD00008F99007893
61547+:1076300001001021032B482303E00008AF890078E4
61548+:107640003C05080024A55DA40A000A9B0000402117
61549+:107650003C06080024C65DA40A000AB42404000104
61550+:10766000308800FF240200021102000A24030003F4
61551+:107670001103005C8F8900A4240400041104005F3E
61552+:1076800024050005110500670000182103E000082B
61553+:10769000006010218F8900483C0C0800258C5EE0BA
61554+:1076A0003C04080024845F60240300201060000F65
61555+:1076B00000005821240D0002240E00033C0F080096
61556+:1076C00025EF5EE08D27000014E0000B30F9FFFF8E
61557+:1076D000252900040124C02B53000001018048210A
61558+:1076E0002463FFFF5460FFF88D270000016018211C
61559+:1076F00003E0000800601021132000323C0500FF69
61560+:1077000030E200FF004030211040004200005021D4
61561+:1077100024050001000020210005C84000A6C02467
61562+:1077200017000003332500FF14A0FFFB2484000191
61563+:10773000012CC023001828C000AA6021008C502111
61564+:107740003144001F240C0001008C18040003102792
61565+:1077500000E23024110D0041AD260000110E004C56
61566+:10776000000A1840110D00368F87006C510E00562C
61567+:107770008F8C0060240D0004110D005A8F8E008440
61568+:10778000240E0005150EFFDA01601821240B1430B9
61569+:1077900011400006000018218F8400A0246300011E
61570+:1077A000006A402B1500FFFD016458218F8A00807C
61571+:1077B000AF89008C016018212549FFFF0A000AEB00
61572+:1077C000AF89008000E52024000736021080FFD03A
61573+:1077D000240A001800075402314600FF0A000AF389
61574+:1077E000240A00103C0C0800258C5EA03C04080014
61575+:1077F00024845EE00A000ADA240300103C0C08002E
61576+:10780000258C5E203C04080024845EA00A000AD96E
61577+:107810008F89009000071A02306600FF0A000AF301
61578+:10782000240A00088F89008C3C0C0800258C5F60BE
61579+:107830003C04080024845F700A000ADA2403000470
61580+:10784000000A4080250B003024E6FFFF016018216C
61581+:10785000AF8900480A000AEBAF86006C000AC982B3
61582+:10786000001978803C07080024E75EA001E720218A
61583+:10787000000A18428C8F00003079001F032C380456
61584+:107880000007C02701F860240A000B08AC8C000038
61585+:10789000000331420006288000AF28213062001F1B
61586+:1078A0008CB8000024630001004CC804000321428E
61587+:1078B000001938270004108003073024004F2021CE
61588+:1078C0000A000B4CACA60000000A68C025AB0032D1
61589+:1078D000258AFFFF01601821AF8900A40A000AEB86
61590+:1078E000AF8A0060254B1030AF89009001601821ED
61591+:1078F00025C9FFFF0A000AEBAF8900843086000724
61592+:107900002CC2000610400014000000000006408059
61593+:107910003C030800246357BC010338218CE40000B9
61594+:1079200000800008000000002409000310A9000ED8
61595+:1079300000000000240A000510AA000B000000004F
61596+:10794000240B000110AB0008000000008F8C00A089
61597+:1079500010AC00050000000003E00008000010214A
61598+:107960000A000A7900A020210A000AC700C02021CD
61599+:1079700027BDFFE8308400FF240300021083000BC2
61600+:10798000AFBF0010240600031086003A240800044C
61601+:1079900010880068240E0005108E007F2CAF143074
61602+:1079A0008FBF001003E0000827BD00182CA2003094
61603+:1079B0001440FFFC8FBF001024A5FFD0000531C28A
61604+:1079C000000668803C07080024E75EE001A730213C
61605+:1079D0008CC900000005288230AC001F240B000178
61606+:1079E000018B50048F840048012A4025ACC8000058
61607+:1079F0008C83000050600001AF8600488F98006CB7
61608+:107A000030AE000124A6FFFF270F000115C00002C1
61609+:107A1000AF8F006C24A600010006414200082080C0
61610+:107A2000008718218C79000030C2001F2406000155
61611+:107A30000046F804033F382410E0FFDA8FBF00103F
61612+:107A40000005C182001870803C0F080025EF5EA081
61613+:107A500001CF48218D2B00000005684231A5001F91
61614+:107A600000A66004016C502527BD001803E0000843
61615+:107A7000AD2A00002CA7003014E0FFCA8FBF001011
61616+:107A800030B900071723FFC724A8FFCE00086A02F9
61617+:107A9000000D60803C0B0800256B5EA0018B30213F
61618+:107AA0008CC40000000828C230AA001F240800016E
61619+:107AB000014848048F8200A400891825ACC3000047
61620+:107AC0008C5F000053E00001AF8600A40005704009
61621+:107AD000000E7942000F28803C04080024845EE0F8
61622+:107AE00000A418218C6B000025DF000131CD001FA0
61623+:107AF000001F514201A86004016C4825000A108053
61624+:107B0000AC690000004428218CA600008F9800601A
61625+:107B100033F9001F8FBF00100328380400C77825F1
61626+:107B2000270E000127BD0018ACAF000003E00008DD
61627+:107B3000AF8E006024A5EFD02CB804001300FF998D
61628+:107B40008FBF001000053142000658803C0A080033
61629+:107B5000254A5E20016A30218CC4000030A3001F3A
61630+:107B600024090001006910048F9900900082F82513
61631+:107B7000ACDF00008F27000050E00001AF860090CE
61632+:107B80008F8D00848FBF001027BD001825AC000129
61633+:107B900003E00008AF8C008415E0FF828FBF001067
61634+:107BA0008F8600A0000610400046F821001F21002B
61635+:107BB00003E4C8210019384024F8143000B8402BE1
61636+:107BC0001100FF788FBF001024A4EBD00E00021329
61637+:107BD00000C0282100027942000F70803C0D08008F
61638+:107BE00025AD5F6001CD20218C8B0000304C001F43
61639+:107BF00024060001018618048F89008C016350253A
61640+:107C0000AC8A00008D25000050A00001AF84008CDC
61641+:107C10008F9800808FBF001027BD00182708000133
61642+:107C200003E00008AF88008030A5000724030003AC
61643+:107C300010A3001028A2000414400008240700022A
61644+:107C40002403000410A300152408000510A8000F49
61645+:107C50008F8500A003E000080000000014A7FFFDCE
61646+:107C60000080282114C3FFFB240400020A000B8BB0
61647+:107C700000000000240900050080282110C9FFFB36
61648+:107C80002404000303E000080000000014C5FFF115
61649+:107C9000008028210A000B8B24040005240A00011F
61650+:107CA0000080282110CAFFF12404000403E000082A
61651+:107CB0000000000027BDFFE0AFB00010000581C24A
61652+:107CC0002603FFD024C5003F2C6223D024C6007FAA
61653+:107CD000AFB20018AFB10014AFBF001C309100FF6D
61654+:107CE000000691C2000529820200202110400008F0
61655+:107CF0002403FFFF0E000A4B0000000002002021B9
61656+:107D0000022028210E000C390240302100001821E9
61657+:107D10008FBF001C8FB200188FB100148FB00010FD
61658+:107D20000060102103E0000827BD002027BDFFD818
61659+:107D300024A2007FAFB3001CAFB20018000299C2AA
61660+:107D4000309200FF24A3003F02402021026028213E
61661+:107D5000AFB10014AFB00010AFBF00200E000B6E2B
61662+:107D60000003898200408021004020210220282138
61663+:107D700014400009000018218FBF00208FB3001CA1
61664+:107D80008FB200188FB100148FB000100060102166
61665+:107D900003E0000827BD00280E0009FC00000000D9
61666+:107DA00000402821020020211051FFF3001019C0CB
61667+:107DB0000E000A4B00000000020020210240282192
61668+:107DC0000E000C39026030218FBF00208FB3001CE1
61669+:107DD0008FB200188FB100148FB00010000018216E
61670+:107DE0000060102103E0000827BD00283084FFFF59
61671+:107DF00030A5FFFF1080000700001821308200012D
61672+:107E00001040000200042042006518211480FFFB8E
61673+:107E10000005284003E000080060102110C00007A2
61674+:107E2000000000008CA2000024C6FFFF24A500046F
61675+:107E3000AC82000014C0FFFB2484000403E00008AF
61676+:107E40000000000010A0000824A3FFFFAC86000083
61677+:107E500000000000000000002402FFFF2463FFFF79
61678+:107E60001462FFFA2484000403E00008000000000C
61679+:107E700030A5FFFF8F4201B80440FFFE3C076015AC
61680+:107E800000A730253C031000AF440180AF400184BF
61681+:107E9000AF46018803E00008AF4301B88F8500D0EA
61682+:107EA0002C864000008018218CA700840087102BAE
61683+:107EB00014400010000000008CA800842D06400033
61684+:107EC00050C0000F240340008CAA0084008A482B75
61685+:107ED000512000018CA3008400035A42000B208033
61686+:107EE0003C05080024A558200085182103E000085F
61687+:107EF0008C62000014C0FFF4000000002403400066
61688+:107F000000035A42000B20803C05080024A558209D
61689+:107F10000085182103E000088C6200008F8300D0E8
61690+:107F2000906600D024C50001A06500D08F8500D0E8
61691+:107F3000906400D090A200D210440017000000000E
61692+:107F4000936C00788F8B00BC318A00FFA16A000C13
61693+:107F500025490001938700C4312200FF3048007F8B
61694+:107F60001107000B00026827A36200788F4E01788A
61695+:107F700005C0FFFE8F9900B0241800023C0F1000CE
61696+:107F8000AF590140A358014403E00008AF4F017806
61697+:107F90000A000D0931A20080A0A000D00A000CFF49
61698+:107FA000000000008F8700D027BDFFC8AFBF0030A2
61699+:107FB000AFB7002CAFB60028AFB50024AFB4002097
61700+:107FC000AFB3001CAFB20018AFB10014AFB00010D7
61701+:107FD00094E300E094E200E2104300D72405FFFFA1
61702+:107FE0003C047FFF3497FFFF2415FF800A000DF04B
61703+:107FF0003C16000E108A00D18FBF00308F9100B068
61704+:108000003C1808008F18005C001230C0001291402C
61705+:108010000311702101D57824AF4F002C94EC00E2BD
61706+:1080200031CD007F01BA5821318A7FFF0176482186
61707+:10803000000A804002091021945300003C08080007
61708+:108040008D0800580246C02132733FFF001319808B
61709+:10805000010320210224282130BF007F03FAC82118
61710+:1080600000B5A024AF54002C0336A0218E87001049
61711+:108070008E8F003003785821256D008800EF702323
61712+:10808000240C0002AE8E0010AF8D00ACA16C0088F5
61713+:10809000976A003C8E8400308F9100AC0E000CD6A5
61714+:1080A0003150FFFF00024B80020940253C02420094
61715+:1080B00001022025AE2400048E8300048F8D00ACC5
61716+:1080C0008E860000240E0008ADA3001CADA600188B
61717+:1080D000ADA0000CADA00010929F000A33F900FF84
61718+:1080E000A5B90014968500083C1F000CA5A5001634
61719+:1080F0009298000A331100FFA5B100209690000865
61720+:1081000024180005A5B00022ADA00024928F000B1A
61721+:108110002410C00031E700FFA5A70002A1AE0001B6
61722+:108120008E8C00308F8B00AC8F8400B0AD6C00085B
61723+:108130003C0A08008D4A005401444821013540247E
61724+:10814000AF4800283C0208008C4200540044302113
61725+:1081500030C3007F007AC821033F282102458821CF
61726+:10816000AF9100BCAF8500C0A23800008F8A00BC70
61727+:108170002403FFBF2418FFDF954F000201F03824CD
61728+:1081800000F37025A54E0002914D000231AC003F76
61729+:10819000358B0040A14B00028F8600BC8F8900D038
61730+:1081A000ACC000048D28007C3C098000ACC80008ED
61731+:1081B00090C4000D3082007FA0C2000D8F8500BCEE
61732+:1081C00090BF000D03E3C824A0B9000D8F9100BC3F
61733+:1081D0009233000D02789024A232000D8E9000346C
61734+:1081E0008F8B00BCAD7000108E87002C8E8F0030FE
61735+:1081F00000EF7023AD6E0014916D001831AC007F5C
61736+:10820000A16C00188F9F00BC8E8A00308FE8001888
61737+:10821000015720240109302400C41025AFE20018C2
61738+:108220009283000AA3E3001C969900088F8500BC86
61739+:108230008F9800D0A4B9001E8E9000308E8400303C
61740+:108240000E0002138F0500848F8500D0000291403C
61741+:108250000002990090AF00BC0253882100403021F9
61742+:1082600031E7000210E0000302118021000290803B
61743+:108270000212802190B900BC3327000410E00002F4
61744+:108280000006F880021F80218E9800308F8B00BC82
61745+:1082900024068000330F0003000F702331CD00034C
61746+:1082A000020D6021AD6C000494A400E294AA00E2E7
61747+:1082B00094B000E231497FFF2522000130537FFF57
61748+:1082C0000206182400734025A4A800E294A400E24A
61749+:1082D0003C1408008E94006030917FFF123400221D
61750+:1082E000000000000E000CF6000000008F8700D098
61751+:1082F0000000282194F300E094F000E21213000F34
61752+:108300008FBF003090E900D090E800D1313200FFFB
61753+:10831000310400FF0244302B14C0FF36264A00010E
61754+:1083200090EE00D2264B000131CD00FF008D602180
61755+:10833000158BFF338F9100B08FBF00308FB7002CAB
61756+:108340008FB600288FB500248FB400208FB3001C97
61757+:108350008FB200188FB100148FB0001000A0102150
61758+:1083600003E0000827BD003894A300E20066402423
61759+:10837000A4A800E290A400E290B900E2309100FFCE
61760+:108380000011A1C20014F827001F39C03332007F4A
61761+:10839000024730250A000DE8A0A600E23084FFFF66
61762+:1083A00030A5FFFFAF440018AF45001C03E00008F4
61763+:1083B0008F42001427BDFFB8AFB000208F9000D0CF
61764+:1083C0003084FFFFAFA40010AFBF0044AFBE004039
61765+:1083D000AFB7003CAFB60038AFB50034AFB4003033
61766+:1083E000AFB3002CAFB20028AFB10024A7A0001893
61767+:1083F000920600D1920500D030C400FF30A300FFE8
61768+:108400000064102B10400122AFA00014920900D08C
61769+:108410008FB50010312800FF0088382324F4FFFFB7
61770+:108420000014882B0015982B02339024524001260B
61771+:108430008FB40014961E0012961F00108FB7001004
61772+:1084400003DFC823001714000019C400000224032E
61773+:108450000018140302E2B02A52C00001004020219B
61774+:108460000284282B10A0000200801821028018210D
61775+:1084700000033C0000071C033064FFFF2C8600094A
61776+:1084800014C000020060B821241700088E0A0008FA
61777+:10849000001769808E09000C31ABFFFF3C0C001007
61778+:1084A000016C402527520400AF4A0038AF9200B853
61779+:1084B000AF49003CAF480030000000000000000061
61780+:1084C00000000000000000000000000000000000AC
61781+:1084D00000000000000000008F4F000031EE00207F
61782+:1084E00011C0FFFD0017982A027110240A000E83A4
61783+:1084F0000000B02155E001019258000131130080C5
61784+:10850000126001CF012020219655001232A5FFFFF5
61785+:108510000E000CCBA7B500188F9000D00291A023BD
61786+:1085200026CD00018F9100B8000DB4000016B403F1
61787+:108530002638004002D7582A0014882B2405000151
61788+:108540000300902101711024AF9800B8AFA500146A
61789+:10855000104001BC8F8900B03C0C08008D8C005489
61790+:10856000240BFF80921E00D001895021014B28244A
61791+:10857000921900D0AF4500288E4700103C08080033
61792+:108580008D0800583C1808008F18005430E33FFF56
61793+:108590000003218001043021012658212402FF809C
61794+:1085A0000162F824920C00D0AF5F002C92480000CA
61795+:1085B00033D100FF333500FF0309982100117140CA
61796+:1085C000001578C0326D007F01CF382101BA282113
61797+:1085D000318300FF3164007F3C0A000C00AA88212F
61798+:1085E0000367F02100033140009A10213108003F59
61799+:1085F0003C1F000E00D1C021005F982127D90088C0
61800+:108600002D150008AF9100C0AF9900ACAF9800BC29
61801+:10861000AF9300B412A0018A00008821240E00014B
61802+:10862000010E4004310D005D11A0FFB2310F0002B8
61803+:108630008E4A00283C0300803C04FFEFAE6A000035
61804+:108640008E450024A260000A3488FFFFAE65000456
61805+:108650009247002C3C1FFF9F37FEFFFFA267000CD4
61806+:108660008E62000C3C180040A267000B00433025CE
61807+:1086700000C8C824033E88240238A825AE75000C23
61808+:108680008E490004AE6000183C0F00FFAE69001474
61809+:108690008E4D002C35EEFFFF8F8B00B001AE6024B5
61810+:1086A000AE6C00108E470008A660000896450012C8
61811+:1086B000AE6700208E42000C30B03FFF00105180AA
61812+:1086C000AE6200248E5E0014014B182130A400011C
61813+:1086D000AE7E00288E590018000331C2000443808A
61814+:1086E000AE79002C8E51001C00C8F821A67F001C1A
61815+:1086F000AE710030965800028E550020A678001EFC
61816+:10870000AE75003492490033313000045600000544
61817+:10871000925000008F8C00D08D8B007CAE6B0030AF
61818+:10872000925000008F8F00BCA1F00000924E0033E9
61819+:1087300031CD000251A00007925E00018F8900BC7C
61820+:108740002418FF80913100000311A825A1350000F5
61821+:10875000925E00018F9900BC2409FFBF240BFFDF4C
61822+:10876000A33E00018F9500BC92B8000D3311007F2D
61823+:10877000A2B1000D8F8E00BC91D0000D02097824AB
61824+:10878000A1CF000D8F8800BC8E6D0014910A000DE2
61825+:108790002DAC0001000C2940014B382400E51825C0
61826+:1087A000A103000D964200128F8800BC8F8700D075
61827+:1087B000A50200028E45000490FF00BC30A4000317
61828+:1087C0000004302330DE000300BE102133F9000224
61829+:1087D00017200002244400342444003090E200BCFE
61830+:1087E00000A2302430DF000417E0000224830004DC
61831+:1087F000008018218F8F00AC24090002AD03000413
61832+:10880000A1E90000924E003F8F8D00ACA1AE0001A7
61833+:108810008F9500AC924C003F8E440004A6AC000241
61834+:10882000976B003C0E000CD63170FFFF00025380A6
61835+:10883000020A38253C05420000E51825AEA30004D5
61836+:108840008F8600AC8E480038ACC800188E440034C7
61837+:10885000ACC4001CACC0000CACC00010A4C0001420
61838+:10886000A4C00016A4C00020A4C00022ACC00024F4
61839+:108870008E6400145080000124040001ACC4000880
61840+:108880000E000CF6241100010A000E768F9000D025
61841+:10889000920F00D2920E00D08FB5001031EB00FF86
61842+:1088A00031CD00FF008D6023016C50212554FFFF66
61843+:1088B0000014882B0015982B023390241640FEDDFF
61844+:1088C000000000008FB400148FBF00448FBE004032
61845+:1088D0003A8200018FB7003C8FB600388FB5003464
61846+:1088E0008FB400308FB3002C8FB200288FB10024DA
61847+:1088F0008FB0002003E0000827BD0048331100209E
61848+:10890000122000EF24150001921E00BC241F00015C
61849+:108910000000A82133D900011320000DAFBF001CB7
61850+:108920008E4400148E0800840088102B144000022E
61851+:10893000008030218E0600848E03006400C3A82BC3
61852+:1089400016A0000200C020218E0400640080A8212F
61853+:108950008E4700148E05006400E5302B14C0000221
61854+:1089600000E020218E0400640095F02313C0000471
61855+:108970008FAC001C240A0002AFAA001C8FAC001CA4
61856+:10898000028C582B156000A8000018218E4F00386B
61857+:108990008E6D000C3C0E0080AE6F00008E4A0034DD
61858+:1089A0003C10FF9F01AE5825AE6A00049246003F7E
61859+:1089B000360CFFFF016C38243C0500203C03FFEF20
61860+:1089C000A266000B00E510253468FFFF8F8700B812
61861+:1089D0000048F8243C04000803E4C825AE79000CE4
61862+:1089E0008CF80014AE60001802BE7821AE78001436
61863+:1089F0008CF10018AE71001C8CE90008AE690024EF
61864+:108A00008CEE000CAE6F002CAE600028AE6E002025
61865+:108A1000A6600038A660003A8CED001401B58023F2
61866+:108A2000021E902312400011AE72001090EA003D29
61867+:108A30008E6500048E640000000A310000A6C82183
61868+:108A4000000010210326402B0082F82103E8C021FA
61869+:108A5000AE790004AE78000090F1003DA271000AEA
61870+:108A60008F8900B895320006A67200088F9800AC76
61871+:108A70002419000202A02021A31900009769003CDC
61872+:108A80008F9200AC0E000CD63131FFFF00027B80CC
61873+:108A90008F8500B8022F68253C0E420001AE80256C
61874+:108AA000AE5000048F8400AC8CAC0038AC8C001845
61875+:108AB0008CAB0034AC8B001CAC80000CAC80001084
61876+:108AC000A4800014A4800016A4800020A4800022AA
61877+:108AD000AC80002490A7003FA487000212A00135BB
61878+:108AE0002403000153C0000290A2003D90A2003E6A
61879+:108AF00024480001A08800018F9F00ACAFF500085A
61880+:108B00008F8300D024070034906600BC30C500027B
61881+:108B100050A00001240700308F9200B88F8A00BC5B
61882+:108B2000906D00BC924B00002412C00032A50003DF
61883+:108B3000A14B00008F8600B88F8800BC240200047F
61884+:108B400090C400010045182330790003A1040001FE
61885+:108B50008F8A00BC8F9F00B800F53821955800021D
61886+:108B600097E9001200F9382103128824312F3FFFC2
61887+:108B7000022F7025A54E00029150000231A800047A
61888+:108B8000320C003F358B0040A14B000212A00002C6
61889+:108B90008F8500BC00E838218F8E00D0ACA7000480
61890+:108BA000240BFFBF8DCD007C2EA400012403FFDF2A
61891+:108BB000ACAD000890B0000D00044140320C007FC5
61892+:108BC000A0AC000D8F8600BC90CA000D014B102494
61893+:108BD000A0C2000D8F8700BC90E5000D00A3F82413
61894+:108BE00003E8C825A0F9000D8F9100B88F8D00BC57
61895+:108BF0008E380020ADB800108E290024ADA90014D5
61896+:108C00008E2F0028ADAF00188E2E002C0E000CF613
61897+:108C1000ADAE001C8FB0001C240C0002120C00EE44
61898+:108C20008F9000D08FA3001C006088211460000288
61899+:108C30000060A8210000A02156A0FE390291A023C7
61900+:108C40000014882B8FA90010960700103C1E0020EE
61901+:108C50000136402302C750213112FFFFA60A00103F
61902+:108C6000AFB20010AF5E0030000000009617001099
61903+:108C7000961300121277008F000000008E05000C82
61904+:108C80008E0B00080016698000AD7021000DC7C36F
61905+:108C900001CDA82B0178782101F56021AE0E000CE2
61906+:108CA000AE0C00088FB300100013B82B02378024DD
61907+:108CB0001200FF048F9000D00A000E3C000000005C
61908+:108CC0008E4D0038A6600008240B0003AE6D000036
61909+:108CD0008E500034A260000A8F9800B8AE70000475
61910+:108CE0003C0500809311003FA26B000C8E6F000CBE
61911+:108CF0003C0EFF9FA271000B01E5102535CCFFFF54
61912+:108D00003C03FFEF8F9200B8004C30243464FFFF27
61913+:108D100000C4F824AE7F000C8E590014964800124F
61914+:108D20008F8A00B0AE7900108E490014AE60001832
61915+:108D3000AE600020AE690014AE6000248E470018BB
61916+:108D400031093FFF0009F180AE6700288E4D000811
61917+:108D500003CA802131180001AE6D00308E4F000C27
61918+:108D60008F8C00AC001089C200185B80022B282178
61919+:108D7000240E0002A665001CA6600036AE6F002C13
61920+:108D8000A18E00009763003C8F8A00AC3C04420037
61921+:108D90003062FFFF00443025AD4600048F9F00B8CD
61922+:108DA000240700012411C0008FF30038240600348A
61923+:108DB000AD5300188FF90034AD59001CAD40000CC4
61924+:108DC000AD400010A5400014A5400016A5400020AD
61925+:108DD000A5400022AD400024A5550002A147000196
61926+:108DE0008F9E00AC8F8800B88F9200BCAFD5000872
61927+:108DF000910D0000A24D00008F9000B88F8B00BC39
61928+:108E000092180001A17800018F8400BC94850002B3
61929+:108E100000B1782401E97025A48E0002908C000234
61930+:108E20003183003FA08300028F8300D08F8400BC79
61931+:108E3000906200BC305300025260000124060030F2
61932+:108E4000AC8600048C6F007C2403FFBF02A0882145
61933+:108E5000AC8F0008908E000D31CC007FA08C000DEF
61934+:108E60008F8600BC90C2000D00432024A0C4000DDA
61935+:108E70008F8900BC913F000D37F90020A139000D0A
61936+:108E80008F8800B88F9300BC8D070020AE6700105C
61937+:108E90008D0A0024AE6A00148D1E0028AE7E0018D4
61938+:108EA0008D12002C0E000CF6AE72001C0A00103D54
61939+:108EB0008F9000D0960E00148E03000431CCFFFF7B
61940+:108EC000000C10C000622021AF44003C8E1F000443
61941+:108ED0008F46003C03E6C8231B20003C0000000036
61942+:108EE0008E0F000025E200013C05001034B500089B
61943+:108EF000AF420038AF550030000000000000000015
61944+:108F00000000000000000000000000000000000061
61945+:108F100000000000000000008F580000330B00200C
61946+:108F20001160FFFD000000008F5304003C0D002085
61947+:108F3000AE1300088F570404AE17000CAF4D00307D
61948+:108F4000000000003C0608008CC600442416000106
61949+:108F500010D600BD00000000961F00123C0508005E
61950+:108F60008CA5004000BFC821A61900129609001464
61951+:108F700025270001A6070014960A00143144FFFFBC
61952+:108F80005486FF498FB30010A60000140E000E1681
61953+:108F900030A5FFFF3C0408008C84002496030012D7
61954+:108FA0000044102300623023A60600120A00105964
61955+:108FB0008FB30010A08300018F8200AC2404000155
61956+:108FC000AC4400080A000FF08F8300D08E0200002E
61957+:108FD0000A0010EA3C0500108F8200C08FA7001C19
61958+:108FE000921800D0920B00D0920E00D0331100FFE7
61959+:108FF000316900FF00117940000928C001E56021B6
61960+:1090000031C300FF036C50210003314000C2C8216E
61961+:10901000255F0088AF9F00ACAF9900BCA1470088D6
61962+:109020009768003C03C020218F9100AC0E000CD645
61963+:109030003110FFFF00026B80020DC0253C0442008E
61964+:109040008F8D00B803045825AE2B00048DA900387D
61965+:109050008F8B00AC0000882100118100AD690018E1
61966+:109060008DAF00343C087FFF3504FFFFAD6F001C5F
61967+:1090700091AC003E8D65001C8D660018000C190037
61968+:10908000000C770200A33821020E102500E3F82B14
61969+:1090900000C2C821033F5021AD67001CAD6A001813
61970+:1090A000AD60000CAD60001091B8003E24050005D5
61971+:1090B00003C45024A578001495A9000403C02021FE
61972+:1090C000A569001691AF003EA56F002095B1000480
61973+:1090D000A5710022AD60002491AE003FA56E000294
61974+:1090E00091B0003E91AC003D01901023244300015B
61975+:1090F000A16300018F8600AC8F9F00BCACDE00082E
61976+:10910000A3E500008F9000BC8F9900B82405FFBF35
61977+:1091100096070002973800120247782433093FFF70
61978+:1091200001E98825A6110002921200022418FFDF2F
61979+:10913000324E003F35CD0040A20D00028F8600BCAC
61980+:109140008F8C00D02412FFFFACC000048D8B007CFC
61981+:109150003C0C8000ACCB000890C2000D3043007F77
61982+:10916000A0C3000D8F8700BC90FF000D03E5C8244D
61983+:10917000A0F9000D8F9100BC9229000D01387824D0
61984+:10918000A22F000D8F9000BCAE120010AE1500147F
61985+:10919000920E00182415FF8002AE6825A20D00185B
61986+:1091A0008F8500BC8F8300B88CAB0018016C102435
61987+:1091B000004A3025ACA600189068003EA0A8001C0C
61988+:1091C0008F9F00B88F8700BC8F9800D097F900045C
61989+:1091D000A4F9001E0E0002138F0500848F8600D0B4
61990+:1091E000000279400002490090D200BC01E98821C8
61991+:1091F000004028213255000212A0000303D1202193
61992+:109200000002A8800095202190CD00BC31B200045E
61993+:109210001240000333DF0003000540800088202156
61994+:10922000240600048F9E00BC00DFC8233327000300
61995+:1092300000875021AFCA00040E000CF6A665003866
61996+:109240000A0010388F9000D0961E00123C080800CB
61997+:109250008D080024011E9021A61200120A00105948
61998+:109260008FB3001027BDFFE03C1808008F18005096
61999+:10927000AFB00010AFBF0018AFB10014AF8400B0A2
62000+:1092800093710074030478212410FF8031EE007F75
62001+:109290003225007F01F0582401DA68213C0C000AD5
62002+:1092A000A38500C401AC2821AF4B002494A9001071
62003+:1092B0009768000690A600620080382124020030E2
62004+:1092C0000109202330C300F0AF8500D010620019DF
62005+:1092D0003090FFFF90AE0062240DFFF0240A005092
62006+:1092E00001AE6024318B00FF116A002F00000000E6
62007+:1092F00016000007241F0C00AF5F00248FB100147C
62008+:109300008FBF00188FB0001003E0000827BD0020B9
62009+:109310000E000E1C02002021241F0C00AF5F002451
62010+:109320008FB100148FBF00188FB0001003E0000849
62011+:1093300027BD002094A200E094A400E290BF011396
62012+:10934000008218263079FFFF33E700C014E00009DF
62013+:109350002F31000116000038000000005620FFE603
62014+:10936000241F0C000E000D18000000000A0011ED73
62015+:10937000241F0C001620FFDE000000000E000D1858
62016+:10938000000000001440FFDC241F0C001600002227
62017+:109390008F8300D0906901133122003FA062011336
62018+:1093A0000A0011ED241F0C0094AF00D48F8600D466
62019+:1093B00000E02821240400050E000C5C31F0FFFFC2
62020+:1093C0001440000524030003979100E600001821D3
62021+:1093D0002625FFFFA78500E68F5801B80700FFFE8E
62022+:1093E0003C196013AF400180241F0C00AF50018472
62023+:1093F000007938253C101000AF4701888FB1001468
62024+:10940000AF5001B8AF5F00248FB000108FBF0018BD
62025+:1094100003E0000827BD00200E000E1C02002021E2
62026+:109420005040FFB5241F0C008F8300D090690113BA
62027+:109430000A0012163122003F0E000E1C02002021ED
62028+:109440001440FFAD241F0C00122000078F8300D0B2
62029+:10945000906801133106003F34C20040A06201133E
62030+:109460000A0011ED241F0C000E000D180000000072
62031+:109470005040FFA1241F0C008F8300D0906801137F
62032+:109480003106003F0A00124634C20040AF9B00C8BC
62033+:1094900003E00008AF8000EC3089FFFF0009404284
62034+:1094A0002D020041000921801440000200095040B3
62035+:1094B00024080040000830C0000811400046582130
62036+:1094C000256701A800E2C821272F007F2418FF800C
62037+:1094D00001F818240064302100CA702125CC00FF57
62038+:1094E000240DFF00018D202425650088240A0088B2
62039+:1094F0003C010800AC2A004C3C010800AC2500509F
62040+:10950000AF8400D43C010800AC2900603C01080095
62041+:10951000AC2800643C010800AC2700543C01080062
62042+:10952000AC2300583C010800AC26005C03E00008B6
62043+:1095300000000000308300FF30C6FFFF30E400FF72
62044+:109540008F4201B80440FFFE00034C00012438257F
62045+:109550003C08600000E820253C031000AF45018076
62046+:10956000AF460184AF44018803E00008AF4301B86F
62047+:109570008F86001C3C096012352700108CCB00043C
62048+:109580003C0C600E35850010316A00062D48000144
62049+:10959000ACE800C48CC40004ACA431808CC20008C8
62050+:1095A00094C30002ACA2318403E00008A78300E466
62051+:1095B0003C0308008C6300508F8400E88F86001CF9
62052+:1095C0002402FF800064C0210302C824AF59002890
62053+:1095D0008CCD00043305007F00BA78213C0E000CCE
62054+:1095E00001EE2821ACAD00588CC80008AF8500D032
62055+:1095F0003C076012ACA8005C8CCC001034E8001072
62056+:10960000ACAC000C8CCB000CACAB000894AA0014E2
62057+:109610003C0208008C42004425490001A4A9001422
62058+:1096200094A400143083FFFF106200178F8400D0D1
62059+:109630003C0A08008D4A0040A4AA00128CCE0018F3
62060+:10964000AC8E00248CCD0014AC8D00208CC700188B
62061+:10965000AC87002C8CCC001424060001AC8C0028B4
62062+:109660008D0B00BC5166001A8D0200B48D0200B84B
62063+:10967000A482003A948F003AA48F003C948800D4CE
62064+:1096800003E000083102FFFF3C0908008D29002497
62065+:10969000A4A000148F8400D0A4A900128CCE0018BE
62066+:1096A000AC8E00248CCD0014AC8D00208CC700182B
62067+:1096B000AC87002C8CCC001424060001AC8C002854
62068+:1096C0008D0B00BC5566FFEA8D0200B88D0200B418
62069+:1096D000A482003A948F003AA48F003C948800D46E
62070+:1096E00003E000083102FFFF8F86001C3C0C0800DD
62071+:1096F0008D8C0050240BFF808CCD00083C03000CA7
62072+:10970000000D51C0018A4021010B4824AF8A00E8B6
62073+:10971000AF49002890C700073105007F00BA10212B
62074+:109720000043282130E4000410800039AF8500D0C8
62075+:1097300090CF000731EE000811C000380000000093
62076+:109740008CD9000C8CC400140324C02B13000030EF
62077+:10975000000000008CC2000CACA200648CCD00188C
62078+:109760002402FFF8ACAD00688CCC0010ACAC0080DB
62079+:109770008CCB000CACAB00848CCA001CACAA007C67
62080+:1097800090A900BC01224024A0A800BC90C30007FF
62081+:109790003067000810E000048F8500D090AF00BC57
62082+:1097A00035EE0001A0AE00BC90D9000733380001AF
62083+:1097B000130000088F8300D08F8700D0240400346A
62084+:1097C00090E800BC35030002A0E300BC8F8300D00A
62085+:1097D000AC6400C090C900073126000210C000052B
62086+:1097E00000000000906A00BC35420004A06200BC8A
62087+:1097F0008F8300D09065011330AD003FA06D011341
62088+:109800008F8C00D0958B00D403E000083162FFFFFD
62089+:109810008CC200140A001305000000000A001306A1
62090+:10982000ACA0006427BDFFD8AFB000108F90001C23
62091+:10983000AFBF0024AFB40020AFB20018AFB1001426
62092+:10984000AFB3001C9613000E3C07600A3C14600680
62093+:109850003264FFFF369300100E00125534F40410EA
62094+:109860008F8400D43C11600E0E00099B363100102D
62095+:10987000920E00153C0708008CE700603C12601255
62096+:1098800031CD000FA38D00F08E0E00048E0D000868
62097+:1098900096080012961F00109619001A9618001EBE
62098+:1098A000960F001C310CFFFF33EBFFFF332AFFFF45
62099+:1098B0003309FFFF31E6FFFF3C010800AC2B0040FD
62100+:1098C0003C010800AC2C00243C010800AC2A0044F8
62101+:1098D000AE293178AE26317C92020015960300162F
62102+:1098E00036520010304400FF3065FFFF3C06080090
62103+:1098F0008CC60064AE243188AE4500B492080014D2
62104+:1099000096190018241F0001011FC004332FFFFF08
62105+:109910003C0508008CA50058AE5800B8AE4F00BCFE
62106+:10992000920C0014AF8E00D8AF8D00DC318B00FF9D
62107+:10993000AE4B00C0920A0015AE670048AE66004C00
62108+:10994000314900FFAE4900C8AE65007C3C03080009
62109+:109950008C6300503C0408008C84004C3C080800D8
62110+:109960008D0800543C0208008C42005C8FBF00242C
62111+:10997000AE6300808FB00010AE8300748FB3001C04
62112+:10998000AE22319CAE4200DCAE2731A0AE2631A41F
62113+:10999000AE24318CAE233190AE283194AE2531986F
62114+:1099A000AE870050AE860054AE8500708FB10014B3
62115+:1099B000AE4700E0AE4600E4AE4400CCAE4300D07B
62116+:1099C000AE4800D4AE4500D88FB400208FB2001846
62117+:1099D00003E0000827BD002827BDFFE0AFB1001459
62118+:1099E000AFBF0018241100010E000845AFB00010F1
62119+:1099F00010510005978400E6978300CC0083102B5C
62120+:109A0000144000088F8500D4240700028FBF00187F
62121+:109A10008FB100148FB0001000E0102103E00008A7
62122+:109A200027BD00200E000C7A24040005AF8200E858
62123+:109A30001040FFF6240700020E0008498F90001C1A
62124+:109A4000979F00E68F9900E88F8D00C827EF0001EF
62125+:109A5000240E0050AF590020A78F00E6A1AE0000F1
62126+:109A60003C0C08008D8C00648F8600C8240A80009E
62127+:109A7000000C5E00ACCB0074A4C0000694C9000AC0
62128+:109A8000241FFF803C0D000C012AC024A4D8000A2A
62129+:109A900090C8000A24182000011F1825A0C3000A3E
62130+:109AA0008F8700C8A0E000788F8500C800003821AB
62131+:109AB000A0A000833C0208008C4200508F8400E884
62132+:109AC0000044782101FFC824AF590028960B0002FA
62133+:109AD00031EE007F01DA6021018D3021A4CB00D46A
62134+:109AE000960A0002AF8600D03C0E000425492401EE
62135+:109AF000A4C900E68E080004ACC800048E03000868
62136+:109B0000ACC30000A4C00010A4C00014A0C000D0CA
62137+:109B10008F8500D02403FFBFA0A000D13C04080023
62138+:109B20008C8400648F8200D0A04400D28E1F000C71
62139+:109B30008F8A00D0978F00E4AD5F001C8E19001053
62140+:109B400024100030AD590018A5400030A551005434
62141+:109B5000A5510056A54F0016AD4E0068AD580080C7
62142+:109B6000AD580084914D006231AC000F358B001070
62143+:109B7000A14B00628F8600D090C900633128007F1E
62144+:109B8000A0C800638F8400D02406FFFF9085006387
62145+:109B900000A31024A08200638F9100D000E0102168
62146+:109BA000923F00BC37F90001A23900BC8F8A00D077
62147+:109BB000938F00F0AD580064AD5000C0914E00D3BB
62148+:109BC000000F690031CC000F018D5825A14B00D347
62149+:109BD0008F8500D08F8900DCACA900E88F8800D881
62150+:109BE0008FBF00188FB100148FB0001027BD002068
62151+:109BF000ACA800ECA4A600D6A4A000E0A4A000E2BB
62152+:109C000003E000080000000027BDFFE0AFB0001037
62153+:109C10008F90001CAFB10014AFBF00188E19000464
62154+:109C20003C1808008F180050240FFF80001989C0CD
62155+:109C30000238702131CD007F01CF602401BA50215C
62156+:109C40003C0B000CAF4C0028014B4021950900D47F
62157+:109C5000950400D68E0700043131FFFFAF8800D095
62158+:109C60000E000913000721C08E0600048F8300C870
62159+:109C7000000629C0AF4500209064003E30820040BD
62160+:109C8000144000068F8400D0341FFFFF948300D659
62161+:109C90003062FFFF145F000400000000948400D6CF
62162+:109CA0000E0008A83084FFFF8E050004022030213A
62163+:109CB0008FBF00188FB100148FB000102404002251
62164+:109CC00000003821000529C00A00127C27BD0020B1
62165+:109CD00027BDFFE0AFB100143091FFFFAFB000101F
62166+:109CE000AFBF00181220001D000080218F86001CCD
62167+:109CF0008CC500002403000600053F020005140285
62168+:109D000030E4000714830015304500FF2CA800063E
62169+:109D10001100004D000558803C0C0800258C57D4DC
62170+:109D2000016C50218D490000012000080000000056
62171+:109D30008F8E00EC240D000111CD005900000000B1
62172+:109D4000260B00013170FFFF24CA00200211202BD6
62173+:109D5000014030211480FFE6AF8A001C0200102170
62174+:109D60008FBF00188FB100148FB0001003E00008FF
62175+:109D700027BD0020938700CE14E00038240400148F
62176+:109D80000E001338000000008F86001C2402000122
62177+:109D90000A00147FAF8200EC8F8900EC24080002D7
62178+:109DA0001128003B2404001300002821000030216A
62179+:109DB000240700010E00127C000000000A00147F3E
62180+:109DC0008F86001C8F8700EC2405000214E5FFF647
62181+:109DD000240400120E0012E9000000008F8500E844
62182+:109DE00000403021240400120E00127C00003821B3
62183+:109DF0000A00147F8F86001C8F8300EC241F000351
62184+:109E0000147FFFD0260B00010E00129B0000000003
62185+:109E10008F8500E800403021240200022404001055
62186+:109E200000003821AF8200EC0E00127C0000000020
62187+:109E30000A00147F8F86001C8F8F00EC240600021E
62188+:109E400011E6000B0000000024040010000028218F
62189+:109E5000000030210A00149C240700010000282182
62190+:109E60000E00127C000030210A00147F8F86001C37
62191+:109E70000E0013A500000000144000128F99001C72
62192+:109E80008F86001C240200030A00147FAF8200ECBE
62193+:109E90000E001431000000000A00147F8F86001CA1
62194+:109EA0000E00128B000000002402000224040014A3
62195+:109EB0000000282100003021000038210A0014B9D8
62196+:109EC000AF8200EC004038212404001097380002D3
62197+:109ED000000028210E00127C3306FFFF0A00147FC9
62198+:109EE0008F86001C8F8400C83C077FFF34E6FFFF8D
62199+:109EF0008C8500742402000100A61824AC83007431
62200+:109F000003E00008A082000510A000362CA200800B
62201+:109F1000274A04003C0B000524090080104000077C
62202+:109F20002408008030A6000F00C540212D030081C9
62203+:109F30001460000200A0482124080080AF4B0030CC
62204+:109F400000000000000000000000000011000009F7
62205+:109F500000003821014030218C8D000024E70004EE
62206+:109F600000E8602BACCD0000248400041580FFFACB
62207+:109F700024C60004000000000000000000000000F3
62208+:109F80003C0E0006010E3825AF47003000000000EF
62209+:109F900000000000000000008F4F000031E80010BA
62210+:109FA0001100FFFD000000008F42003C8F43003C89
62211+:109FB0000049C8210323C02B130000040000000047
62212+:109FC0008F4C003825860001AF4600388F47003C93
62213+:109FD00000A9282300E96821AF4D003C14A0FFCE62
62214+:109FE0002CA2008003E000080000000027BDFFD085
62215+:109FF0003C020002AFB100143C11000CAF45003828
62216+:10A00000AFB3001CAF46003C00809821AF42003047
62217+:10A0100024050088AF44002803512021AFBF002849
62218+:10A02000AFB50024AFB40020AFB200180E0014F199
62219+:10A03000AFB000103C1F08008FFF004C3C18080018
62220+:10A040008F1800642410FF8003F3A82132B9007F29
62221+:10A0500002B078240018A0C0033A70210018914083
62222+:10A0600001D12021AF4F00280E0014F10254282105
62223+:10A070003C0D08008DAD00502405012001B358218E
62224+:10A08000316C007F01705024019A48210131202158
62225+:10A090000E0014F1AF4A00283C0808008D08005457
62226+:10A0A0003C0508008CA500640113382130E6007FD0
62227+:10A0B00000F0182400DA202100912021AF4300286D
62228+:10A0C0000E0014F1000529403C0208008C420058A3
62229+:10A0D0003C1008008E1000601200001C0053882104
62230+:10A0E0002415FF800A0015743C14000C3226007FF2
62231+:10A0F0000235182400DA202102402821AF4300282D
62232+:10A10000009420210E0014F12610FFC01200000F51
62233+:10A11000023288212E05004110A0FFF42412100005
62234+:10A120003226007F001091800235182400DA2021A9
62235+:10A1300002402821AF430028009420210E0014F192
62236+:10A14000000080211600FFF3023288213C0B08003A
62237+:10A150008D6B005C240AFF802405000201734021FE
62238+:10A16000010A4824AF4900283C0408009484006296
62239+:10A170003110007F021A88213C07000C0E000CAA47
62240+:10A180000227982100402821026020218FBF00284B
62241+:10A190008FB500248FB400208FB3001C8FB200183D
62242+:10A1A0008FB100148FB000100A0014F127BD0030E9
62243+:10A1B0008F83001C8C62000410400003000000002C
62244+:10A1C00003E00008000000008C6400108C650008AB
62245+:10A1D0000A00152A8C66000C000000000000001B1D
62246+:10A1E0000000000F0000000A000000080000000648
62247+:10A1F000000000050000000500000004000000044D
62248+:10A200000000000300000003000000030000000342
62249+:10A210000000000300000002000000020000000235
62250+:10A220000000000200000002000000020000000226
62251+:10A230000000000200000002000000020000000216
62252+:10A240000000000200000002000000020000000206
62253+:10A2500000000001000000010000000108000F24C0
62254+:10A2600008000D6C08000FB80800106008000F4CC3
62255+:10A2700008000F8C0800119408000D88080011B820
62256+:10A2800008000DD8080015540800151C08000D889A
62257+:10A2900008000D8808000D880800124008001240D0
62258+:10A2A00008000D8808000D88080014E008000D88DB
62259+:10A2B00008000D8808000D8808000D88080013B4F8
62260+:10A2C00008000D8808000D8808000D8808000D881A
62261+:10A2D00008000D8808000D8808000D8808000D880A
62262+:10A2E00008000D8808000D8808000D8808000D88FA
62263+:10A2F00008000D8808000D8808000FAC08000D88C4
62264+:10A3000008000D880800167808000D8808000D88E0
62265+:10A3100008000D8808000D8808000D8808000D88C9
62266+:10A3200008000D8808000D8808000D8808000D88B9
62267+:10A3300008000D8808000D8808000D8808000D88A9
62268+:10A3400008000D8808000D8808000D88080014100A
62269+:10A3500008000D8808000D8808001334080012A4B6
62270+:10A3600008001E2C08001EFC08001F1408001F28EF
62271+:10A3700008001F3808001E2C08001E2C08001E2C88
62272+:10A3800008001ED808002E1408002E1C08002DE41A
62273+:10A3900008002DF008002DFC08002E08080052F4DB
62274+:10A3A000080052B40800528008005254080052308D
62275+:10A3B000080051EC0A000C840000000000000000BE
62276+:10A3C0000000000D727870362E322E33000000002F
62277+:10A3D000060203030000000000000001000000006E
62278+:10A3E000000000000000000000000000000000006D
62279+:10A3F000000000000000000000000000000000005D
62280+:10A40000000000000000000000000000000000004C
62281+:10A41000000000000000000000000000000000003C
62282+:10A42000000000000000000000000000000000002C
62283+:10A43000000000000000000000000000000000001C
62284+:10A44000000000000000000000000000000000000C
62285+:10A4500000000000000000000000000000000000FC
62286+:10A4600000000000000000000000000000000000EC
62287+:10A4700000000000000000000000000000000000DC
62288+:10A4800000000000000000000000000000000000CC
62289+:10A4900000000000000000000000000000000000BC
62290+:10A4A00000000000000000000000000000000000AC
62291+:10A4B000000000000000000000000000000000009C
62292+:10A4C000000000000000000000000000000000008C
62293+:10A4D000000000000000000000000000000000007C
62294+:10A4E000000000000000000000000000000000006C
62295+:10A4F000000000000000000000000000000000005C
62296+:10A50000000000000000000000000000000000004B
62297+:10A51000000000000000000000000000000000003B
62298+:10A52000000000000000000000000000000000002B
62299+:10A53000000000000000000000000000000000001B
62300+:10A54000000000000000000000000000000000000B
62301+:10A5500000000000000000000000000000000000FB
62302+:10A5600000000000000000000000000000000000EB
62303+:10A5700000000000000000000000000000000000DB
62304+:10A5800000000000000000000000000000000000CB
62305+:10A5900000000000000000000000000000000000BB
62306+:10A5A00000000000000000000000000000000000AB
62307+:10A5B000000000000000000000000000000000009B
62308+:10A5C000000000000000000000000000000000008B
62309+:10A5D000000000000000000000000000000000007B
62310+:10A5E000000000000000000000000000000000006B
62311+:10A5F000000000000000000000000000000000005B
62312+:10A60000000000000000000000000000000000004A
62313+:10A61000000000000000000000000000000000003A
62314+:10A62000000000000000000000000000000000002A
62315+:10A63000000000000000000000000000000000001A
62316+:10A64000000000000000000000000000000000000A
62317+:10A6500000000000000000000000000000000000FA
62318+:10A6600000000000000000000000000000000000EA
62319+:10A6700000000000000000000000000000000000DA
62320+:10A6800000000000000000000000000000000000CA
62321+:10A6900000000000000000000000000000000000BA
62322+:10A6A00000000000000000000000000000000000AA
62323+:10A6B000000000000000000000000000000000009A
62324+:10A6C000000000000000000000000000000000008A
62325+:10A6D000000000000000000000000000000000007A
62326+:10A6E000000000000000000000000000000000006A
62327+:10A6F000000000000000000000000000000000005A
62328+:10A700000000000000000000000000000000000049
62329+:10A710000000000000000000000000000000000039
62330+:10A720000000000000000000000000000000000029
62331+:10A730000000000000000000000000000000000019
62332+:10A740000000000000000000000000000000000009
62333+:10A7500000000000000000000000000000000000F9
62334+:10A7600000000000000000000000000000000000E9
62335+:10A7700000000000000000000000000000000000D9
62336+:10A7800000000000000000000000000000000000C9
62337+:10A7900000000000000000000000000000000000B9
62338+:10A7A00000000000000000000000000000000000A9
62339+:10A7B0000000000000000000000000000000000099
62340+:10A7C0000000000000000000000000000000000089
62341+:10A7D0000000000000000000000000000000000079
62342+:10A7E0000000000000000000000000000000000069
62343+:10A7F0000000000000000000000000000000000059
62344+:10A800000000000000000000000000000000000048
62345+:10A810000000000000000000000000000000000038
62346+:10A820000000000000000000000000000000000028
62347+:10A830000000000000000000000000000000000018
62348+:10A840000000000000000000000000000000000008
62349+:10A8500000000000000000000000000000000000F8
62350+:10A8600000000000000000000000000000000000E8
62351+:10A8700000000000000000000000000000000000D8
62352+:10A8800000000000000000000000000000000000C8
62353+:10A8900000000000000000000000000000000000B8
62354+:10A8A00000000000000000000000000000000000A8
62355+:10A8B0000000000000000000000000000000000098
62356+:10A8C0000000000000000000000000000000000088
62357+:10A8D0000000000000000000000000000000000078
62358+:10A8E0000000000000000000000000000000000068
62359+:10A8F0000000000000000000000000000000000058
62360+:10A900000000000000000000000000000000000047
62361+:10A910000000000000000000000000000000000037
62362+:10A920000000000000000000000000000000000027
62363+:10A930000000000000000000000000000000000017
62364+:10A940000000000000000000000000000000000007
62365+:10A9500000000000000000000000000000000000F7
62366+:10A9600000000000000000000000000000000000E7
62367+:10A9700000000000000000000000000000000000D7
62368+:10A9800000000000000000000000000000000000C7
62369+:10A9900000000000000000000000000000000000B7
62370+:10A9A00000000000000000000000000000000000A7
62371+:10A9B0000000000000000000000000000000000097
62372+:10A9C0000000000000000000000000000000000087
62373+:10A9D0000000000000000000000000000000000077
62374+:10A9E0000000000000000000000000000000000067
62375+:10A9F0000000000000000000000000000000000057
62376+:10AA00000000000000000000000000000000000046
62377+:10AA10000000000000000000000000000000000036
62378+:10AA20000000000000000000000000000000000026
62379+:10AA30000000000000000000000000000000000016
62380+:10AA40000000000000000000000000000000000006
62381+:10AA500000000000000000000000000000000000F6
62382+:10AA600000000000000000000000000000000000E6
62383+:10AA700000000000000000000000000000000000D6
62384+:10AA800000000000000000000000000000000000C6
62385+:10AA900000000000000000000000000000000000B6
62386+:10AAA00000000000000000000000000000000000A6
62387+:10AAB0000000000000000000000000000000000096
62388+:10AAC0000000000000000000000000000000000086
62389+:10AAD0000000000000000000000000000000000076
62390+:10AAE0000000000000000000000000000000000066
62391+:10AAF0000000000000000000000000000000000056
62392+:10AB00000000000000000000000000000000000045
62393+:10AB10000000000000000000000000000000000035
62394+:10AB20000000000000000000000000000000000025
62395+:10AB30000000000000000000000000000000000015
62396+:10AB40000000000000000000000000000000000005
62397+:10AB500000000000000000000000000000000000F5
62398+:10AB600000000000000000000000000000000000E5
62399+:10AB700000000000000000000000000000000000D5
62400+:10AB800000000000000000000000000000000000C5
62401+:10AB900000000000000000000000000000000000B5
62402+:10ABA00000000000000000000000000000000000A5
62403+:10ABB0000000000000000000000000000000000095
62404+:10ABC0000000000000000000000000000000000085
62405+:10ABD0000000000000000000000000000000000075
62406+:10ABE0000000000000000000000000000000000065
62407+:10ABF0000000000000000000000000000000000055
62408+:10AC00000000000000000000000000000000000044
62409+:10AC10000000000000000000000000000000000034
62410+:10AC20000000000000000000000000000000000024
62411+:10AC30000000000000000000000000000000000014
62412+:10AC40000000000000000000000000000000000004
62413+:10AC500000000000000000000000000000000000F4
62414+:10AC600000000000000000000000000000000000E4
62415+:10AC700000000000000000000000000000000000D4
62416+:10AC800000000000000000000000000000000000C4
62417+:10AC900000000000000000000000000000000000B4
62418+:10ACA00000000000000000000000000000000000A4
62419+:10ACB0000000000000000000000000000000000094
62420+:10ACC0000000000000000000000000000000000084
62421+:10ACD0000000000000000000000000000000000074
62422+:10ACE0000000000000000000000000000000000064
62423+:10ACF0000000000000000000000000000000000054
62424+:10AD00000000000000000000000000000000000043
62425+:10AD10000000000000000000000000000000000033
62426+:10AD20000000000000000000000000000000000023
62427+:10AD30000000000000000000000000000000000013
62428+:10AD40000000000000000000000000000000000003
62429+:10AD500000000000000000000000000000000000F3
62430+:10AD600000000000000000000000000000000000E3
62431+:10AD700000000000000000000000000000000000D3
62432+:10AD800000000000000000000000000000000000C3
62433+:10AD900000000000000000000000000000000000B3
62434+:10ADA00000000000000000000000000000000000A3
62435+:10ADB0000000000000000000000000000000000093
62436+:10ADC0000000000000000000000000000000000083
62437+:10ADD0000000000000000000000000000000000073
62438+:10ADE0000000000000000000000000000000000063
62439+:10ADF0000000000000000000000000000000000053
62440+:10AE00000000000000000000000000000000000042
62441+:10AE10000000000000000000000000000000000032
62442+:10AE20000000000000000000000000000000000022
62443+:10AE30000000000000000000000000000000000012
62444+:10AE40000000000000000000000000000000000002
62445+:10AE500000000000000000000000000000000000F2
62446+:10AE600000000000000000000000000000000000E2
62447+:10AE700000000000000000000000000000000000D2
62448+:10AE800000000000000000000000000000000000C2
62449+:10AE900000000000000000000000000000000000B2
62450+:10AEA00000000000000000000000000000000000A2
62451+:10AEB0000000000000000000000000000000000092
62452+:10AEC0000000000000000000000000000000000082
62453+:10AED0000000000000000000000000000000000072
62454+:10AEE0000000000000000000000000000000000062
62455+:10AEF0000000000000000000000000000000000052
62456+:10AF00000000000000000000000000000000000041
62457+:10AF10000000000000000000000000000000000031
62458+:10AF20000000000000000000000000000000000021
62459+:10AF30000000000000000000000000000000000011
62460+:10AF40000000000000000000000000000000000001
62461+:10AF500000000000000000000000000000000000F1
62462+:10AF600000000000000000000000000000000000E1
62463+:10AF700000000000000000000000000000000000D1
62464+:10AF800000000000000000000000000000000000C1
62465+:10AF900000000000000000000000000000000000B1
62466+:10AFA00000000000000000000000000000000000A1
62467+:10AFB0000000000000000000000000000000000091
62468+:10AFC0000000000000000000000000000000000081
62469+:10AFD0000000000000000000000000000000000071
62470+:10AFE0000000000000000000000000000000000061
62471+:10AFF0000000000000000000000000000000000051
62472+:10B000000000000000000000000000000000000040
62473+:10B010000000000000000000000000000000000030
62474+:10B020000000000000000000000000000000000020
62475+:10B030000000000000000000000000000000000010
62476+:10B040000000000000000000000000000000000000
62477+:10B0500000000000000000000000000000000000F0
62478+:10B0600000000000000000000000000000000000E0
62479+:10B0700000000000000000000000000000000000D0
62480+:10B0800000000000000000000000000000000000C0
62481+:10B0900000000000000000000000000000000000B0
62482+:10B0A00000000000000000000000000000000000A0
62483+:10B0B0000000000000000000000000000000000090
62484+:10B0C0000000000000000000000000000000000080
62485+:10B0D0000000000000000000000000000000000070
62486+:10B0E0000000000000000000000000000000000060
62487+:10B0F0000000000000000000000000000000000050
62488+:10B10000000000000000000000000000000000003F
62489+:10B11000000000000000000000000000000000002F
62490+:10B12000000000000000000000000000000000001F
62491+:10B13000000000000000000000000000000000000F
62492+:10B1400000000000000000000000000000000000FF
62493+:10B1500000000000000000000000000000000000EF
62494+:10B1600000000000000000000000000000000000DF
62495+:10B1700000000000000000000000000000000000CF
62496+:10B1800000000000000000000000000000000000BF
62497+:10B1900000000000000000000000000000000000AF
62498+:10B1A000000000000000000000000000000000009F
62499+:10B1B000000000000000000000000000000000008F
62500+:10B1C000000000000000000000000000000000007F
62501+:10B1D000000000000000000000000000000000006F
62502+:10B1E000000000000000000000000000000000005F
62503+:10B1F000000000000000000000000000000000004F
62504+:10B20000000000000000000000000000000000003E
62505+:10B21000000000000000000000000000000000002E
62506+:10B22000000000000000000000000000000000001E
62507+:10B23000000000000000000000000000000000000E
62508+:10B2400000000000000000000000000000000000FE
62509+:10B2500000000000000000000000000000000000EE
62510+:10B2600000000000000000000000000000000000DE
62511+:10B2700000000000000000000000000000000000CE
62512+:10B2800000000000000000000000000000000000BE
62513+:10B2900000000000000000000000000000000000AE
62514+:10B2A000000000000000000000000000000000009E
62515+:10B2B000000000000000000000000000000000008E
62516+:10B2C000000000000000000000000000000000007E
62517+:10B2D000000000000000000000000000000000006E
62518+:10B2E000000000000000000000000000000000005E
62519+:10B2F000000000000000000000000000000000004E
62520+:10B30000000000000000000000000000000000003D
62521+:10B31000000000000000000000000000000000002D
62522+:10B32000000000000000000000000000000000001D
62523+:10B33000000000000000000000000000000000000D
62524+:10B3400000000000000000000000000000000000FD
62525+:10B3500000000000000000000000000000000000ED
62526+:10B3600000000000000000000000000000000000DD
62527+:10B3700000000000000000000000000000000000CD
62528+:10B3800000000000000000000000000000000000BD
62529+:10B3900000000000000000000000000000000000AD
62530+:10B3A000000000000000000000000000000000009D
62531+:10B3B000000000000000000000000000000000008D
62532+:10B3C000000000000000000000000000000000007D
62533+:10B3D000000000000000000000000000000000006D
62534+:10B3E000000000000000000000000000000000005D
62535+:10B3F000000000000000000000000000000000004D
62536+:10B40000000000000000000000000000000000003C
62537+:10B41000000000000000000000000000000000002C
62538+:10B42000000000000000000000000000000000001C
62539+:10B43000000000000000000000000000000000000C
62540+:10B4400000000000000000000000000000000000FC
62541+:10B4500000000000000000000000000000000000EC
62542+:10B4600000000000000000000000000000000000DC
62543+:10B4700000000000000000000000000000000000CC
62544+:10B4800000000000000000000000000000000000BC
62545+:10B4900000000000000000000000000000000000AC
62546+:10B4A000000000000000000000000000000000009C
62547+:10B4B000000000000000000000000000000000008C
62548+:10B4C000000000000000000000000000000000007C
62549+:10B4D000000000000000000000000000000000006C
62550+:10B4E000000000000000000000000000000000005C
62551+:10B4F000000000000000000000000000000000004C
62552+:10B50000000000000000000000000000000000003B
62553+:10B51000000000000000000000000000000000002B
62554+:10B52000000000000000000000000000000000001B
62555+:10B53000000000000000000000000000000000000B
62556+:10B5400000000000000000000000000000000000FB
62557+:10B5500000000000000000000000000000000000EB
62558+:10B5600000000000000000000000000000000000DB
62559+:10B5700000000000000000000000000000000000CB
62560+:10B5800000000000000000000000000000000000BB
62561+:10B5900000000000000000000000000000000000AB
62562+:10B5A000000000000000000000000000000000009B
62563+:10B5B000000000000000000000000000000000008B
62564+:10B5C000000000000000000000000000000000007B
62565+:10B5D000000000000000000000000000000000006B
62566+:10B5E000000000000000000000000000000000005B
62567+:10B5F000000000000000000000000000000000004B
62568+:10B60000000000000000000000000000000000003A
62569+:10B61000000000000000000000000000000000002A
62570+:10B62000000000000000000000000000000000001A
62571+:10B63000000000000000000000000000000000000A
62572+:10B6400000000000000000000000000000000000FA
62573+:10B6500000000000000000000000000000000000EA
62574+:10B6600000000000000000000000000000000000DA
62575+:10B6700000000000000000000000000000000000CA
62576+:10B6800000000000000000000000000000000000BA
62577+:10B6900000000000000000000000000000000000AA
62578+:10B6A000000000000000000000000000000000009A
62579+:10B6B000000000000000000000000000000000008A
62580+:10B6C000000000000000000000000000000000007A
62581+:10B6D000000000000000000000000000000000006A
62582+:10B6E000000000000000000000000000000000005A
62583+:10B6F000000000000000000000000000000000004A
62584+:10B700000000000000000000000000000000000039
62585+:10B710000000000000000000000000000000000029
62586+:10B720000000000000000000000000000000000019
62587+:10B730000000000000000000000000000000000009
62588+:10B7400000000000000000000000000000000000F9
62589+:10B7500000000000000000000000000000000000E9
62590+:10B7600000000000000000000000000000000000D9
62591+:10B7700000000000000000000000000000000000C9
62592+:10B7800000000000000000000000000000000000B9
62593+:10B7900000000000000000000000000000000000A9
62594+:10B7A0000000000000000000000000000000000099
62595+:10B7B0000000000000000000000000000000000089
62596+:10B7C0000000000000000000000000000000000079
62597+:10B7D0000000000000000000000000000000000069
62598+:10B7E0000000000000000000000000000000000059
62599+:10B7F0000000000000000000000000000000000049
62600+:10B800000000000000000000000000000000000038
62601+:10B810000000000000000000000000000000000028
62602+:10B820000000000000000000000000000000000018
62603+:10B830000000000000000000000000000000000008
62604+:10B8400000000000000000000000000000000000F8
62605+:10B8500000000000000000000000000000000000E8
62606+:10B8600000000000000000000000000000000000D8
62607+:10B8700000000000000000000000000000000000C8
62608+:10B8800000000000000000000000000000000000B8
62609+:10B8900000000000000000000000000000000000A8
62610+:10B8A0000000000000000000000000000000000098
62611+:10B8B0000000000000000000000000000000000088
62612+:10B8C0000000000000000000000000000000000078
62613+:10B8D0000000000000000000000000000000000068
62614+:10B8E0000000000000000000000000000000000058
62615+:10B8F0000000000000000000000000000000000048
62616+:10B900000000000000000000000000000000000037
62617+:10B910000000000000000000000000000000000027
62618+:10B920000000000000000000000000000000000017
62619+:10B930000000000000000000000000000000000007
62620+:10B9400000000000000000000000000000000000F7
62621+:10B9500000000000000000000000000000000000E7
62622+:10B9600000000000000000000000000000000000D7
62623+:10B9700000000000000000000000000000000000C7
62624+:10B9800000000000000000000000000000000000B7
62625+:10B9900000000000000000000000000000000000A7
62626+:10B9A0000000000000000000000000000000000097
62627+:10B9B0000000000000000000000000000000000087
62628+:10B9C0000000000000000000000000000000000077
62629+:10B9D0000000000000000000000000000000000067
62630+:10B9E0000000000000000000000000000000000057
62631+:10B9F0000000000000000000000000000000000047
62632+:10BA00000000000000000000000000000000000036
62633+:10BA10000000000000000000000000000000000026
62634+:10BA20000000000000000000000000000000000016
62635+:10BA30000000000000000000000000000000000006
62636+:10BA400000000000000000000000000000000000F6
62637+:10BA500000000000000000000000000000000000E6
62638+:10BA600000000000000000000000000000000000D6
62639+:10BA700000000000000000000000000000000000C6
62640+:10BA800000000000000000000000000000000000B6
62641+:10BA900000000000000000000000000000000000A6
62642+:10BAA0000000000000000000000000000000000096
62643+:10BAB0000000000000000000000000000000000086
62644+:10BAC0000000000000000000000000000000000076
62645+:10BAD0000000000000000000000000000000000066
62646+:10BAE0000000000000000000000000000000000056
62647+:10BAF0000000000000000000000000000000000046
62648+:10BB00000000000000000000000000000000000035
62649+:10BB10000000000000000000000000000000000025
62650+:10BB20000000000000000000000000000000000015
62651+:10BB30000000000000000000000000000000000005
62652+:10BB400000000000000000000000000000000000F5
62653+:10BB500000000000000000000000000000000000E5
62654+:10BB600000000000000000000000000000000000D5
62655+:10BB700000000000000000000000000000000000C5
62656+:10BB800000000000000000000000000000000000B5
62657+:10BB900000000000000000000000000000000000A5
62658+:10BBA0000000000000000000000000000000000095
62659+:10BBB0000000000000000000000000000000000085
62660+:10BBC0000000000000000000000000000000000075
62661+:10BBD0000000000000000000000000000000000065
62662+:10BBE0000000000000000000000000000000000055
62663+:10BBF0000000000000000000000000000000000045
62664+:10BC00000000000000000000000000000000000034
62665+:10BC10000000000000000000000000000000000024
62666+:10BC20000000000000000000000000000000000014
62667+:10BC30000000000000000000000000000000000004
62668+:10BC400000000000000000000000000000000000F4
62669+:10BC500000000000000000000000000000000000E4
62670+:10BC600000000000000000000000000000000000D4
62671+:10BC700000000000000000000000000000000000C4
62672+:10BC800000000000000000000000000000000000B4
62673+:10BC900000000000000000000000000000000000A4
62674+:10BCA0000000000000000000000000000000000094
62675+:10BCB0000000000000000000000000000000000084
62676+:10BCC0000000000000000000000000000000000074
62677+:10BCD0000000000000000000000000000000000064
62678+:10BCE0000000000000000000000000000000000054
62679+:10BCF0000000000000000000000000000000000044
62680+:10BD00000000000000000000000000000000000033
62681+:10BD10000000000000000000000000000000000023
62682+:10BD20000000000000000000000000000000000013
62683+:10BD30000000000000000000000000000000000003
62684+:10BD400000000000000000000000000000000000F3
62685+:10BD500000000000000000000000000000000000E3
62686+:10BD600000000000000000000000000000000000D3
62687+:10BD700000000000000000000000000000000000C3
62688+:10BD800000000000000000000000000000000000B3
62689+:10BD900000000000000000000000000000000000A3
62690+:10BDA0000000000000000000000000000000000093
62691+:10BDB0000000000000000000000000000000000083
62692+:10BDC0000000000000000000000000000000000073
62693+:10BDD0000000000000000000000000000000000063
62694+:10BDE0000000000000000000000000000000000053
62695+:10BDF0000000000000000000000000000000000043
62696+:10BE00000000000000000000000000000000000032
62697+:10BE10000000000000000000000000000000000022
62698+:10BE20000000000000000000000000000000000012
62699+:10BE30000000000000000000000000000000000002
62700+:10BE400000000000000000000000000000000000F2
62701+:10BE500000000000000000000000000000000000E2
62702+:10BE600000000000000000000000000000000000D2
62703+:10BE700000000000000000000000000000000000C2
62704+:10BE800000000000000000000000000000000000B2
62705+:10BE900000000000000000000000000000000000A2
62706+:10BEA0000000000000000000000000000000000092
62707+:10BEB0000000000000000000000000000000000082
62708+:10BEC0000000000000000000000000000000000072
62709+:10BED0000000000000000000000000000000000062
62710+:10BEE0000000000000000000000000000000000052
62711+:10BEF0000000000000000000000000000000000042
62712+:10BF00000000000000000000000000000000000031
62713+:10BF10000000000000000000000000000000000021
62714+:10BF20000000000000000000000000000000000011
62715+:10BF30000000000000000000000000000000000001
62716+:10BF400000000000000000000000000000000000F1
62717+:10BF500000000000000000000000000000000000E1
62718+:10BF600000000000000000000000000000000000D1
62719+:10BF700000000000000000000000000000000000C1
62720+:10BF800000000000000000000000000000000000B1
62721+:10BF900000000000000000000000000000000000A1
62722+:10BFA0000000000000000000000000000000000091
62723+:10BFB0000000000000000000000000000000000081
62724+:10BFC0000000000000000000000000000000000071
62725+:10BFD0000000000000000000000000000000000061
62726+:10BFE0000000000000000000000000000000000051
62727+:10BFF0000000000000000000000000000000000041
62728+:10C000000000000000000000000000000000000030
62729+:10C010000000000000000000000000000000000020
62730+:10C020000000000000000000000000000000000010
62731+:10C030000000000000000000000000000000000000
62732+:10C0400000000000000000000000000000000000F0
62733+:10C0500000000000000000000000000000000000E0
62734+:10C0600000000000000000000000000000000000D0
62735+:10C0700000000000000000000000000000000000C0
62736+:10C0800000000000000000000000000000000000B0
62737+:10C0900000000000000000000000000000000000A0
62738+:10C0A0000000000000000000000000000000000090
62739+:10C0B0000000000000000000000000000000000080
62740+:10C0C0000000000000000000000000000000000070
62741+:10C0D0000000000000000000000000000000000060
62742+:10C0E0000000000000000000000000000000000050
62743+:10C0F0000000000000000000000000000000000040
62744+:10C10000000000000000000000000000000000002F
62745+:10C11000000000000000000000000000000000001F
62746+:10C12000000000000000000000000000000000000F
62747+:10C1300000000000000000000000000000000000FF
62748+:10C1400000000000000000000000000000000000EF
62749+:10C1500000000000000000000000000000000000DF
62750+:10C1600000000000000000000000000000000000CF
62751+:10C1700000000000000000000000000000000000BF
62752+:10C1800000000000000000000000000000000000AF
62753+:10C19000000000000000000000000000000000009F
62754+:10C1A000000000000000000000000000000000008F
62755+:10C1B000000000000000000000000000000000007F
62756+:10C1C000000000000000000000000000000000006F
62757+:10C1D000000000000000000000000000000000005F
62758+:10C1E000000000000000000000000000000000004F
62759+:10C1F000000000000000000000000000000000003F
62760+:10C20000000000000000000000000000000000002E
62761+:10C21000000000000000000000000000000000001E
62762+:10C22000000000000000000000000000000000000E
62763+:10C2300000000000000000000000000000000000FE
62764+:10C2400000000000000000000000000000000000EE
62765+:10C2500000000000000000000000000000000000DE
62766+:10C2600000000000000000000000000000000000CE
62767+:10C2700000000000000000000000000000000000BE
62768+:10C2800000000000000000000000000000000000AE
62769+:10C29000000000000000000000000000000000009E
62770+:10C2A000000000000000000000000000000000008E
62771+:10C2B000000000000000000000000000000000007E
62772+:10C2C000000000000000000000000000000000006E
62773+:10C2D000000000000000000000000000000000005E
62774+:10C2E000000000000000000000000000000000004E
62775+:10C2F000000000000000000000000000000000003E
62776+:10C30000000000000000000000000000000000002D
62777+:10C31000000000000000000000000000000000001D
62778+:10C32000000000000000000000000000000000000D
62779+:10C3300000000000000000000000000000000000FD
62780+:10C3400000000000000000000000000000000000ED
62781+:10C3500000000000000000000000000000000000DD
62782+:10C3600000000000000000000000000000000000CD
62783+:10C3700000000000000000000000000000000000BD
62784+:10C3800000000000000000000000000000000000AD
62785+:10C39000000000000000000000000000000000009D
62786+:10C3A000000000000000000000000000000000008D
62787+:10C3B000000000000000000000000000000000007D
62788+:10C3C000000000000000000000000000000000006D
62789+:10C3D000000000000000000000000000000000005D
62790+:10C3E000000000000000000000000000000000004D
62791+:10C3F000000000000000000000000000000000003D
62792+:10C40000000000000000000000000000000000002C
62793+:10C41000000000000000000000000000000000001C
62794+:10C42000000000000000000000000000000000000C
62795+:10C4300000000000000000000000000000000000FC
62796+:10C4400000000000000000000000000000000000EC
62797+:10C4500000000000000000000000000000000000DC
62798+:10C4600000000000000000000000000000000000CC
62799+:10C4700000000000000000000000000000000000BC
62800+:10C4800000000000000000000000000000000000AC
62801+:10C49000000000000000000000000000000000009C
62802+:10C4A000000000000000000000000000000000008C
62803+:10C4B000000000000000000000000000000000007C
62804+:10C4C000000000000000000000000000000000006C
62805+:10C4D000000000000000000000000000000000005C
62806+:10C4E000000000000000000000000000000000004C
62807+:10C4F000000000000000000000000000000000003C
62808+:10C50000000000000000000000000000000000002B
62809+:10C51000000000000000000000000000000000001B
62810+:10C52000000000000000000000000000000000000B
62811+:10C5300000000000000000000000000000000000FB
62812+:10C5400000000000000000000000000000000000EB
62813+:10C5500000000000000000000000000000000000DB
62814+:10C5600000000000000000000000000000000000CB
62815+:10C5700000000000000000000000000000000000BB
62816+:10C5800000000000000000000000000000000000AB
62817+:10C59000000000000000000000000000000000009B
62818+:10C5A000000000000000000000000000000000008B
62819+:10C5B000000000000000000000000000000000007B
62820+:10C5C000000000000000000000000000000000006B
62821+:10C5D000000000000000000000000000000000005B
62822+:10C5E000000000000000000000000000000000004B
62823+:10C5F000000000000000000000000000000000003B
62824+:10C60000000000000000000000000000000000002A
62825+:10C61000000000000000000000000000000000001A
62826+:10C62000000000000000000000000000000000000A
62827+:10C6300000000000000000000000000000000000FA
62828+:10C6400000000000000000000000000000000000EA
62829+:10C6500000000000000000000000000000000000DA
62830+:10C6600000000000000000000000000000000000CA
62831+:10C6700000000000000000000000000000000000BA
62832+:10C6800000000000000000000000000000000000AA
62833+:10C69000000000000000000000000000000000009A
62834+:10C6A000000000000000000000000000000000008A
62835+:10C6B000000000000000000000000000000000007A
62836+:10C6C000000000000000000000000000000000006A
62837+:10C6D000000000000000000000000000000000005A
62838+:10C6E000000000000000000000000000000000004A
62839+:10C6F000000000000000000000000000000000003A
62840+:10C700000000000000000000000000000000000029
62841+:10C710000000000000000000000000000000000019
62842+:10C720000000000000000000000000000000000009
62843+:10C7300000000000000000000000000000000000F9
62844+:10C7400000000000000000000000000000000000E9
62845+:10C7500000000000000000000000000000000000D9
62846+:10C7600000000000000000000000000000000000C9
62847+:10C7700000000000000000000000000000000000B9
62848+:10C7800000000000000000000000000000000000A9
62849+:10C790000000000000000000000000000000000099
62850+:10C7A0000000000000000000000000000000000089
62851+:10C7B0000000000000000000000000000000000079
62852+:10C7C0000000000000000000000000000000000069
62853+:10C7D0000000000000000000000000000000000059
62854+:10C7E0000000000000000000000000000000000049
62855+:10C7F0000000000000000000000000000000000039
62856+:10C800000000000000000000000000000000000028
62857+:10C810000000000000000000000000000000000018
62858+:10C820000000000000000000000000000000000008
62859+:10C8300000000000000000000000000000000000F8
62860+:10C8400000000000000000000000000000000000E8
62861+:10C8500000000000000000000000000000000000D8
62862+:10C8600000000000000000000000000000000000C8
62863+:10C8700000000000000000000000000000000000B8
62864+:10C8800000000000000000000000000000000000A8
62865+:10C890000000000000000000000000000000000098
62866+:10C8A0000000000000000000000000000000000088
62867+:10C8B0000000000000000000000000000000000078
62868+:10C8C0000000000000000000000000000000000068
62869+:10C8D0000000000000000000000000000000000058
62870+:10C8E0000000000000000000000000000000000048
62871+:10C8F0000000000000000000000000000000000038
62872+:10C900000000000000000000000000000000000027
62873+:10C910000000000000000000000000000000000017
62874+:10C920000000000000000000000000000000000007
62875+:10C9300000000000000000000000000000000000F7
62876+:10C9400000000000000000000000000000000000E7
62877+:10C9500000000000000000000000000000000000D7
62878+:10C9600000000000000000000000000000000000C7
62879+:10C9700000000000000000000000000000000000B7
62880+:10C9800000000000000000000000000000000000A7
62881+:10C990000000000000000000000000000000000097
62882+:10C9A0000000000000000000000000000000000087
62883+:10C9B0000000000000000000000000000000000077
62884+:10C9C0000000000000000000000000000000000067
62885+:10C9D0000000000000000000000000000000000057
62886+:10C9E0000000000000000000000000000000000047
62887+:10C9F0000000000000000000000000000000000037
62888+:10CA00000000000000000000000000000000000026
62889+:10CA10000000000000000000000000000000000016
62890+:10CA20000000000000000000000000000000000006
62891+:10CA300000000000000000000000000000000000F6
62892+:10CA400000000000000000000000000000000000E6
62893+:10CA500000000000000000000000000000000000D6
62894+:10CA600000000000000000000000000000000000C6
62895+:10CA700000000000000000000000000000000000B6
62896+:10CA800000000000000000000000000000000000A6
62897+:10CA90000000000000000000000000000000000096
62898+:10CAA0000000000000000000000000000000000086
62899+:10CAB0000000000000000000000000000000000076
62900+:10CAC0000000000000000000000000000000000066
62901+:10CAD0000000000000000000000000000000000056
62902+:10CAE0000000000000000000000000000000000046
62903+:10CAF0000000000000000000000000000000000036
62904+:10CB00000000000000000000000000000000000025
62905+:10CB10000000000000000000000000000000000015
62906+:10CB20000000000000000000000000000000000005
62907+:10CB300000000000000000000000000000000000F5
62908+:10CB400000000000000000000000000000000000E5
62909+:10CB500000000000000000000000000000000000D5
62910+:10CB600000000000000000000000000000000000C5
62911+:10CB700000000000000000000000000000000000B5
62912+:10CB800000000000000000000000000000000000A5
62913+:10CB90000000000000000000000000000000000095
62914+:10CBA0000000000000000000000000000000000085
62915+:10CBB0000000000000000000000000000000000075
62916+:10CBC0000000000000000000000000000000000065
62917+:10CBD0000000000000000000000000000000000055
62918+:10CBE0000000000000000000000000000000000045
62919+:10CBF0000000000000000000000000000000000035
62920+:10CC00000000000000000000000000000000000024
62921+:10CC10000000000000000000000000000000000014
62922+:10CC20000000000000000000000000000000000004
62923+:10CC300000000000000000000000000000000000F4
62924+:10CC400000000000000000000000000000000000E4
62925+:10CC500000000000000000000000000000000000D4
62926+:10CC600000000000000000000000000000000000C4
62927+:10CC700000000000000000000000000000000000B4
62928+:10CC800000000000000000000000000000000000A4
62929+:10CC90000000000000000000000000000000000094
62930+:10CCA0000000000000000000000000000000000084
62931+:10CCB0000000000000000000000000000000000074
62932+:10CCC0000000000000000000000000000000000064
62933+:10CCD0000000000000000000000000000000000054
62934+:10CCE0000000000000000000000000000000000044
62935+:10CCF0000000000000000000000000000000000034
62936+:10CD00000000000000000000000000000000000023
62937+:10CD10000000000000000000000000000000000013
62938+:10CD20000000000000000000000000000000000003
62939+:10CD300000000000000000000000000000000000F3
62940+:10CD400000000000000000000000000000000000E3
62941+:10CD500000000000000000000000000000000000D3
62942+:10CD600000000000000000000000000000000000C3
62943+:10CD700000000000000000000000000000000000B3
62944+:10CD800000000000000000000000000000000000A3
62945+:10CD90000000000000000000000000000000000093
62946+:10CDA0000000000000000000000000000000000083
62947+:10CDB0000000000000000000000000000000000073
62948+:10CDC0000000000000000000000000000000000063
62949+:10CDD0000000000000000000000000000000000053
62950+:10CDE0000000000000000000000000000000000043
62951+:10CDF0000000000000000000000000000000000033
62952+:10CE00000000000000000000000000000000000022
62953+:10CE10000000000000000000000000000000000012
62954+:10CE20000000000000000000000000000000000002
62955+:10CE300000000000000000000000000000000000F2
62956+:10CE400000000000000000000000000000000000E2
62957+:10CE500000000000000000000000000000000000D2
62958+:10CE600000000000000000000000000000000000C2
62959+:10CE700000000000000000000000000000000000B2
62960+:10CE800000000000000000000000000000000000A2
62961+:10CE90000000000000000000000000000000000092
62962+:10CEA0000000000000000000000000000000000082
62963+:10CEB0000000000000000000000000000000000072
62964+:10CEC0000000000000000000000000000000000062
62965+:10CED0000000000000000000000000000000000052
62966+:10CEE0000000000000000000000000000000000042
62967+:10CEF0000000000000000000000000000000000032
62968+:10CF00000000000000000000000000000000000021
62969+:10CF10000000000000000000000000000000000011
62970+:10CF20000000000000000000000000000000000001
62971+:10CF300000000000000000000000000000000000F1
62972+:10CF400000000000000000000000000000000000E1
62973+:10CF500000000000000000000000000000000000D1
62974+:10CF600000000000000000000000000000000000C1
62975+:10CF700000000000000000000000000000000000B1
62976+:10CF800000000000000000000000000000000000A1
62977+:10CF90000000000000000000000000000000000091
62978+:10CFA0000000000000000000000000000000000081
62979+:10CFB0000000000000000000000000000000000071
62980+:10CFC0000000000000000000000000000000000061
62981+:10CFD0000000000000000000000000000000000051
62982+:10CFE0000000000000000000000000000000000041
62983+:10CFF0000000000000000000000000000000000031
62984+:10D000000000000000000000000000000000000020
62985+:10D010000000000000000000000000000000000010
62986+:10D020000000000000000000000000000000000000
62987+:10D0300000000000000000000000000000000000F0
62988+:10D0400000000000000000000000000000000000E0
62989+:10D0500000000000000000000000000000000000D0
62990+:10D0600000000000000000000000000000000000C0
62991+:10D0700000000000000000000000000000000000B0
62992+:10D0800000000000000000000000000000000000A0
62993+:10D090000000000000000000000000000000000090
62994+:10D0A0000000000000000000000000000000000080
62995+:10D0B0000000000000000000000000000000000070
62996+:10D0C0000000000000000000000000000000000060
62997+:10D0D0000000000000000000000000000000000050
62998+:10D0E0000000000000000000000000000000000040
62999+:10D0F0000000000000000000000000000000000030
63000+:10D10000000000000000000000000000000000001F
63001+:10D11000000000000000000000000000000000000F
63002+:10D1200000000000000000000000000000000000FF
63003+:10D1300000000000000000000000000000000000EF
63004+:10D1400000000000000000000000000000000000DF
63005+:10D1500000000000000000000000000000000000CF
63006+:10D1600000000000000000000000000000000000BF
63007+:10D1700000000000000000000000000000000000AF
63008+:10D18000000000000000000000000000000000009F
63009+:10D19000000000000000000000000000000000008F
63010+:10D1A000000000000000000000000000000000007F
63011+:10D1B000000000000000000000000000000000006F
63012+:10D1C000000000000000000000000000000000005F
63013+:10D1D000000000000000000000000000000000004F
63014+:10D1E000000000000000000000000000000000003F
63015+:10D1F000000000000000000000000000000000002F
63016+:10D20000000000000000000000000000000000001E
63017+:10D21000000000000000000000000000000000000E
63018+:10D2200000000000000000000000000000000000FE
63019+:10D2300000000000000000000000000000000000EE
63020+:10D2400000000000000000000000000000000000DE
63021+:10D2500000000000000000000000000000000000CE
63022+:10D2600000000000000000000000000000000000BE
63023+:10D2700000000000000000000000000000000000AE
63024+:10D28000000000000000000000000000000000009E
63025+:10D29000000000000000000000000000000000008E
63026+:10D2A000000000000000000000000000000000007E
63027+:10D2B000000000000000000000000000000000006E
63028+:10D2C000000000000000000000000000000000005E
63029+:10D2D000000000000000000000000000000000004E
63030+:10D2E000000000000000000000000000000000003E
63031+:10D2F000000000000000000000000000000000002E
63032+:10D30000000000000000000000000000000000001D
63033+:10D31000000000000000000000000000000000000D
63034+:10D3200000000000000000000000000000000000FD
63035+:10D3300000000000000000000000000000000000ED
63036+:10D3400000000000000000000000000000000000DD
63037+:10D3500000000000000000000000000000000000CD
63038+:10D3600000000000000000000000000000000000BD
63039+:10D3700000000000000000000000000000000000AD
63040+:10D38000000000000000000000000000000000009D
63041+:10D39000000000000000000000000000000000008D
63042+:10D3A000000000000000000000000000000000007D
63043+:10D3B000000000000000000000000000000000006D
63044+:10D3C000000000000000000000000000000000005D
63045+:10D3D000000000000000000000000000000000004D
63046+:10D3E000000000000000000000000000000000003D
63047+:10D3F000000000000000000000000000000000002D
63048+:10D40000000000000000000000000000000000001C
63049+:10D41000000000000000000000000000000000000C
63050+:10D4200000000000000000000000000000000000FC
63051+:10D4300000000000000000000000000000000000EC
63052+:10D4400000000000000000000000000000000000DC
63053+:10D4500000000000000000000000000000000000CC
63054+:10D4600000000000000000000000000000000000BC
63055+:10D4700000000000000000000000000000000000AC
63056+:10D48000000000000000000000000000000000009C
63057+:10D49000000000000000000000000000000000008C
63058+:10D4A000000000000000000000000000000000007C
63059+:10D4B000000000000000000000000000000000006C
63060+:10D4C000000000000000000000000000000000005C
63061+:10D4D000000000000000000000000000000000004C
63062+:10D4E000000000000000000000000000000000003C
63063+:10D4F000000000000000000000000000000000002C
63064+:10D50000000000000000000000000000000000001B
63065+:10D51000000000000000000000000000000000000B
63066+:10D5200000000000000000000000000000000000FB
63067+:10D5300000000000000000000000000000000000EB
63068+:10D5400000000000000000000000000000000000DB
63069+:10D5500000000000000000000000000000000000CB
63070+:10D5600000000000000000000000000000000000BB
63071+:10D5700000000000000000000000000000000000AB
63072+:10D58000000000000000000000000000000000009B
63073+:10D59000000000000000008000000000000000000B
63074+:10D5A000000000000000000000000000000000007B
63075+:10D5B00000000000000000000000000A0000000061
63076+:10D5C0000000000000000000100000030000000048
63077+:10D5D0000000000D0000000D3C02080024427340D2
63078+:10D5E0003C030800246377CCAC4000000043202BB0
63079+:10D5F0001480FFFD244200043C1D080037BD7FFC61
63080+:10D6000003A0F0213C100800261032103C1C08003A
63081+:10D61000279C73400E0010FE000000000000000D6B
63082+:10D6200030A5FFFF30C600FF274301808F4201B8BD
63083+:10D630000440FFFE24020002AC640000A465000860
63084+:10D64000A066000AA062000B3C021000AC67001844
63085+:10D6500003E00008AF4201B83C0360008C624FF861
63086+:10D660000440FFFE3C020200AC644FC0AC624FC4F9
63087+:10D670003C02100003E00008AC624FF89482000CFA
63088+:10D680002486001400A0382100021302000210803A
63089+:10D690000082402100C8102B1040005700000000FD
63090+:10D6A00090C300002C6200095040005190C200015C
63091+:10D6B000000310803C030800246372F00043102133
63092+:10D6C0008C420000004000080000000090C30001F0
63093+:10D6D0002402000A1462003A000000000106102330
63094+:10D6E0002C42000A1440003624C600028CE20000DE
63095+:10D6F00034420100ACE2000090C2000090C300017F
63096+:10D7000090C4000290C5000300031C000002160034
63097+:10D710000043102500042200004410250045102578
63098+:10D7200024C60004ACE2000490C2000090C30001D3
63099+:10D7300090C4000290C500030002160000031C0004
63100+:10D740000043102500042200004410250045102548
63101+:10D7500024C600040A000CB8ACE2000890C3000123
63102+:10D76000240200041462001624C6000290C20000C5
63103+:10D7700090C400018CE30000000212000044102558
63104+:10D780003463000424C60002ACE2000C0A000CB8AA
63105+:10D79000ACE3000090C300012402000314620008FF
63106+:10D7A00024C600028CE2000090C3000024C60001E1
63107+:10D7B00034420008A0E300100A000CB8ACE20000FC
63108+:10D7C00003E000082402000190C3000124020002CB
63109+:10D7D0001062000224C40002010020210A000CB8DB
63110+:10D7E000008030210A000CB824C6000190C200015C
63111+:10D7F0000A000CB800C2302103E00008000010212C
63112+:10D8000027BDFFE8AFBF0014AFB000100E00130239
63113+:10D8100000808021936200052403FFFE0200202186
63114+:10D82000004310248FBF00148FB00010A3620005C6
63115+:10D830000A00130B27BD001827BDFFE8AFB000108A
63116+:10D84000AFBF00140E000F3C0080802193620000E7
63117+:10D8500024030050304200FF14430004240201005E
63118+:10D86000AF4201800A000D3002002021AF4001804C
63119+:10D87000020020218FBF00148FB000100A000FE7B4
63120+:10D8800027BD001827BDFF80AFBE0078AFB700747A
63121+:10D89000AFB20060AFBF007CAFB60070AFB5006C38
63122+:10D8A000AFB40068AFB30064AFB1005CAFB0005874
63123+:10D8B0008F5001283C0208008C4231A02403FF80D5
63124+:10D8C0009365003F0202102100431024AF42002460
63125+:10D8D0003C0208008C4231A09364000530B200FF86
63126+:10D8E000020210213042007F034218210004202749
63127+:10D8F0003C02000A0062182130840001AF8300144A
63128+:10D900000000F0210000B82114800053AFA00050A7
63129+:10D9100093430116934401128F450104306300FFC5
63130+:10D920003C020001308400FF00A2282403431021A0
63131+:10D9300003441821245640002467400014A001CD60
63132+:10D940002402000193620000304300FF2402002003
63133+:10D950001062000524020050106200060000000062
63134+:10D960000A000D74000000000000000D0A000D7D8B
63135+:10D97000AFA000303C1E080027DE738C0A000D7D2E
63136+:10D98000AFA000303C0208008C4200DC24420001C1
63137+:10D990003C010800AC2200DC0E00139F00000000D8
63138+:10D9A0000A000F318FBF007C8F4201043C0300202E
63139+:10D9B00092D3000D004310240002202B00042140CC
63140+:10D9C000AFA400308F4301043C02004000621824E1
63141+:10D9D000146000023485004000802821326200205B
63142+:10D9E000AFA500301440000234A6008000A0302112
63143+:10D9F00010C0000BAFA6003093C500088F67004C25
63144+:10DA00000200202100052B0034A5008130A5F08103
63145+:10DA10000E000C9B30C600FF0A000F2E0000000015
63146+:10DA20009362003E304200401040000F2402000488
63147+:10DA300056420007240200120200202100E02821A3
63148+:10DA40000E0013F702C030210A000F318FBF007C97
63149+:10DA500016420005000000000E000D2100002021EC
63150+:10DA60000A000F318FBF007C9743011A96C4000E45
63151+:10DA700093620035326500043075FFFF00442004D6
63152+:10DA8000AFA400548ED1000410A000158ED400085D
63153+:10DA90009362003E3042004010400007000000004A
63154+:10DAA0000E0013E0022020211040000D00000000B5
63155+:10DAB0000A000F2E000000008F6200440222102393
63156+:10DAC0000440016A000000008F6200480222102317
63157+:10DAD00004410166240400160A000E218FC20004CE
63158+:10DAE0008F6200480222102304400008000000005A
63159+:10DAF0003C0208008C423100244200013C01080035
63160+:10DB0000AC2231000A000F23000000008F620040A9
63161+:10DB100002221023184000128F8400143C020800D7
63162+:10DB20008C423100327300FC0000A8212442000125
63163+:10DB30003C010800AC2231008F6300409482011C3C
63164+:10DB4000022318233042FFFF0043102A50400010E8
63165+:10DB50002402000C8F6200400A000DF20222102302
63166+:10DB60009483011C9762003C0043102B1040000678
63167+:10DB7000000000009482011C00551023A482011CA7
63168+:10DB80000A000DF72402000CA480011C2402000CE2
63169+:10DB9000AFA200308F620040005120231880000D9A
63170+:10DBA00002A4102A1440012600000000149500066B
63171+:10DBB00002A410233A620001304200011440012007
63172+:10DBC0000000000002A41023022488210A000E098C
63173+:10DBD0003055FFFF00002021326200021040001A81
63174+:10DBE000326200109362003E30420040504000110B
63175+:10DBF0008FC200040E00130202002021240200182C
63176+:10DC0000A362003F936200052403FFFE020020216F
63177+:10DC1000004310240E00130BA362000524040039F6
63178+:10DC2000000028210E0013C9240600180A000F3036
63179+:10DC300024020001240400170040F809000000003D
63180+:10DC40000A000F302402000110400108000000000B
63181+:10DC50008F63004C8F620054028210231C4001032A
63182+:10DC600002831023044200010060A021AFA4001829
63183+:10DC7000AFB10010AFB50014934201208F65004092
63184+:10DC80009763003C304200FF034210210044102102
63185+:10DC90008FA400543063FFFF244240000083182B00
63186+:10DCA0008FA40030AFA20020AFA50028008320255C
63187+:10DCB000AFA40030AFA50024AFA0002CAFB4003457
63188+:10DCC0009362003E30420008504000118FC20000B5
63189+:10DCD00002C0202127A500380E000CB2AFA00038EA
63190+:10DCE0005440000B8FC200008FA200383042010068
63191+:10DCF000504000078FC200008FA3003C8F6200607D
63192+:10DD00000062102304430001AF6300608FC2000073
63193+:10DD10000040F80927A400108FA200303042000212
63194+:10DD200054400001327300FE9362003E30420040D6
63195+:10DD3000104000378FA200248F6200541682001A10
63196+:10DD40003262000124020014124200102A4200151F
63197+:10DD500010400006240200162402000C12420007A4
63198+:10DD6000326200010A000E7D000000001242000530
63199+:10DD7000326200010A000E7D000000000A000E78E9
63200+:10DD80002417000E0A000E78241700100A000E7CDB
63201+:10DD900024170012936200232403FFBD00431024C4
63202+:10DDA000A362002332620001104000198FA20024F8
63203+:10DDB0002402000C1242000E2A42000D1040000600
63204+:10DDC0002402000E2402000A124200078FA200243F
63205+:10DDD0000A000E9524420001124200088FA200247E
63206+:10DDE0000A000E95244200010A000E932417000831
63207+:10DDF0002402000E16E20002241700162417001059
63208+:10DE00008FA2002424420001AFA200248FA200248C
63209+:10DE10008FA300148F76004000431021AF620040B2
63210+:10DE20008F8200149442011C104000090000000081
63211+:10DE30008F6200488F6400409763003C00441023C9
63212+:10DE40003063FFFF0043102A104000088FA20054E7
63213+:10DE5000936400368F6300403402FFFC008210049C
63214+:10DE600000621821AF6300488FA200548FA60030D3
63215+:10DE70000282902130C200081040000E0000000015
63216+:10DE80008F6200581642000430C600FF9742011A04
63217+:10DE90005040000134C6001093C500088FA700341D
63218+:10DEA0000200202100052B0034A500800E000C9BF1
63219+:10DEB00030A5F0808F620040005610231840001BF0
63220+:10DEC0008FA200183C0208008C42319830420010AA
63221+:10DED0001040000D24020001976200681440000AFF
63222+:10DEE000240200018F8200149442011C1440000699
63223+:10DEF00024020001A76200689742007A244200646D
63224+:10DF00000A000EE9A7620012A76200120E001302B7
63225+:10DF1000020020219362007D2403000102002021E1
63226+:10DF2000344200010A000EE7AFA300501840000A77
63227+:10DF3000000000000E001302020020219362007D09
63228+:10DF40002403000102002021AFA30050344200044A
63229+:10DF50000E00130BA362007D9362003E304200402E
63230+:10DF60001440000C326200011040000A0000000062
63231+:10DF70008F6300408FC20004240400182463000152
63232+:10DF80000040F809AF6300408FA200300A000F3054
63233+:10DF9000304200048F620058105200100000000050
63234+:10DFA0008F620018022210231C4000082404000184
63235+:10DFB0008F62001816220009000000008F62001C0A
63236+:10DFC000028210230440000500000000AF720058D8
63237+:10DFD000AFA40050AF710018AF74001C12E0000B2A
63238+:10DFE0008FA200500E00130202002021A377003FF1
63239+:10DFF0000E00130B0200202102E030212404003720
63240+:10E000000E0013C9000028218FA200501040000309
63241+:10E01000000000000E000CA90200202112A0000543
63242+:10E02000000018218FA2003030420004504000113F
63243+:10E0300000601021240300010A000F30006010214D
63244+:10E040000E001302020020219362007D02002021B5
63245+:10E05000344200040E00130BA362007D0E000CA9D5
63246+:10E06000020020210A000F3024020001AF400044CA
63247+:10E07000240200018FBF007C8FBE00788FB7007430
63248+:10E080008FB600708FB5006C8FB400688FB30064DA
63249+:10E090008FB200608FB1005C8FB0005803E00008C1
63250+:10E0A00027BD00808F4201B80440FFFE2402080013
63251+:10E0B000AF4201B803E00008000000003C02000885
63252+:10E0C00003421021944200483084FFFF2484001250
63253+:10E0D0003045FFFF10A0001700A4102B10400016C1
63254+:10E0E00024020003934201202403001AA343018B5E
63255+:10E0F000304200FF2446FFFE8F82000000A6182B4E
63256+:10E100003863000100021382004310241040000510
63257+:10E110008F84000434820001A746019403E00008C4
63258+:10E12000AF8200042402FFFE0082102403E00008F6
63259+:10E13000AF8200042402000303E00008A342018B25
63260+:10E1400027BDFFE0AFB10014AFB00010AFBF0018A3
63261+:10E1500030B0FFFF30D1FFFF8F4201B80440FFFE17
63262+:10E1600000000000AF440180AF4400200E000F42C9
63263+:10E17000020020218F8300008F840004A750019AA1
63264+:10E18000A750018EA74301908F8300083082800042
63265+:10E19000AF4301A8A75101881040000E8F820004F0
63266+:10E1A00093420116304200FC24420004005A102120
63267+:10E1B0008C4240003042FFFF144000068F82000472
63268+:10E1C0003C02FFFF34427FFF00821024AF82000434
63269+:10E1D0008F8200042403BFFF00431024A74201A63E
63270+:10E1E0009743010C8F42010400031C003042FFFFE3
63271+:10E1F00000621825AF4301AC3C021000AF4201B8E9
63272+:10E200008FBF00188FB100148FB0001003E000081A
63273+:10E2100027BD00208F470070934201128F830000BA
63274+:10E2200027BDFFF0304200FF00022882306201006B
63275+:10E23000000030211040004324A40003306240005D
63276+:10E24000104000103062200000041080005A10219D
63277+:10E250008C43400024A4000400041080AFA30000FD
63278+:10E26000005A10218C424000AFA2000493420116D4
63279+:10E27000304200FC005A10218C4240000A000FC0BE
63280+:10E28000AFA200081040002F0000302100041080D1
63281+:10E29000005A10218C43400024A400040004108084
63282+:10E2A000AFA30000005A10218C424000AFA000082C
63283+:10E2B000AFA200048FA80008000030210000202138
63284+:10E2C000240A00083C0908002529010003A41021A4
63285+:10E2D000148A000300042A001100000A0000000054
63286+:10E2E00090420000248400012C83000C00A2102125
63287+:10E2F00000021080004910218C4200001460FFF3DE
63288+:10E3000000C230263C0408008C8431048F42007027
63289+:10E310002C83002010600009004738233C030800CC
63290+:10E32000246331080004108000431021248300017D
63291+:10E33000AC4700003C010800AC233104AF86000864
63292+:10E340002406000100C0102103E0000827BD0010D2
63293+:10E350003C0208008C42003827BDFFD0AFB5002436
63294+:10E36000AFB40020AFB10014AFBF0028AFB3001CA2
63295+:10E37000AFB20018AFB00010000088213C150800B3
63296+:10E3800026B50038144000022454FFFF0000A021ED
63297+:10E390009742010E8F8400003042FFFF308340001F
63298+:10E3A0001060000A245200043C0200200082102465
63299+:10E3B00050400007308280008F8200042403BFFF9A
63300+:10E3C000008318240A0010103442100030828000AC
63301+:10E3D0001040000A3C020020008210241040000778
63302+:10E3E0008F8200043C03FFFF34637FFF0083182407
63303+:10E3F00034428000AF820004AF8300000E000F980B
63304+:10E400000000000014400007000000009743011EB8
63305+:10E410009742011C3063FFFF0002140000621825C0
63306+:10E42000AF8300089742010C8F4340003045FFFF47
63307+:10E430003402FFFF14620003000000000A001028ED
63308+:10E44000241100208F42400030420100544000015E
63309+:10E45000241100108F8400003082100050400014FE
63310+:10E4600036310001308200201440000B3C021000C5
63311+:10E47000008210245040000E363100013C030E0093
63312+:10E480003C020DFF008318243442FFFF0043102B91
63313+:10E4900050400007363100013C0208008C42002C3D
63314+:10E4A000244200013C010800AC22002C363100055A
63315+:10E4B0003C0608008CC6003454C000238F85000041
63316+:10E4C0008F820004304240005440001F8F850000BE
63317+:10E4D0003C021F01008210243C0310005443001A28
63318+:10E4E0008F85000030A20200144000178F850000C5
63319+:10E4F0003250FFFF363100028F4201B80440FFFE68
63320+:10E5000000000000AF400180020020210E000F42F9
63321+:10E51000AF4000208F8300042402BFFFA750019A60
63322+:10E52000006218248F820000A750018EA751018835
63323+:10E53000A74301A6A74201903C021000AF4201B8D8
63324+:10E540000A0010F5000010213C02100000A2102467
63325+:10E550001040003A0000000010C0000F0000000052
63326+:10E5600030A201001040000C3C0302003C020F00EE
63327+:10E5700000A2102410430008000000008F82000851
63328+:10E58000005410240055102190420004244200043D
63329+:10E590000A00109F000221C00000000000051602C2
63330+:10E5A0003050000F3A0300022E4203EF38420001C0
63331+:10E5B0002C6300010062182414600073240200011F
63332+:10E5C0003C0308008C6300D02E06000C386200016A
63333+:10E5D0002C4200010046102414400015001021C0F8
63334+:10E5E0002602FFFC2C4200045440001100002021B0
63335+:10E5F000386200022C420001004610241040000343
63336+:10E60000000512420A00109F000020210010182B64
63337+:10E610000043102450400006001021C000002021BB
63338+:10E620003245FFFF0E000F633226FFFB001021C0B2
63339+:10E630003245FFFF0A0010F2362600028F424000EA
63340+:10E640003C0308008C630024304201001040004667
63341+:10E6500030620001322200043070000D14400002CC
63342+:10E660002413000424130002000512C238420001E2
63343+:10E670002E4303EF304200013863000100431025B0
63344+:10E68000104000033231FFFB2402FFFB0202802412
63345+:10E6900010C000183202000130A201001040001525
63346+:10E6A000320200013C020F0000A210243C030200D1
63347+:10E6B0001043000F8F8200082403FFFE0203802412
63348+:10E6C00000541024005510219042000402333025DC
63349+:10E6D0002442000412000002000221C03226FFFF83
63350+:10E6E0000E000F633245FFFF1200002700001021CB
63351+:10E6F000320200011040000D320200042402000129
63352+:10E7000012020002023330253226FFFF00002021D2
63353+:10E710000E000F633245FFFF2402FFFE0202802439
63354+:10E7200012000019000010213202000410400016EF
63355+:10E7300024020001240200041202000202333025E8
63356+:10E740003226FFFF3245FFFF0E000F632404010055
63357+:10E750002402FFFB020280241200000B00001021A3
63358+:10E760000A0010F5240200011040000700001021EB
63359+:10E770003245FFFF36260002000020210E000F6305
63360+:10E7800000000000000010218FBF00288FB500247A
63361+:10E790008FB400208FB3001C8FB200188FB100140B
63362+:10E7A0008FB0001003E0000827BD003027BDFFD068
63363+:10E7B000AFB000103C04600CAFBF002CAFB6002817
63364+:10E7C000AFB50024AFB40020AFB3001CAFB2001847
63365+:10E7D000AFB100148C8250002403FF7F3C1A8000EC
63366+:10E7E000004310243442380CAC8250002402000351
63367+:10E7F0003C106000AF4200088E0208083C1B8008F5
63368+:10E800003C010800AC2000203042FFF038420010EC
63369+:10E810002C4200010E001B8DAF8200183C04FFFF4C
63370+:10E820003C020400348308063442000CAE0219484E
63371+:10E83000AE03194C3C0560168E0219808CA30000B3
63372+:10E840003442020000641824AE0219803C02535383
63373+:10E850001462000334A47C008CA200040050202128
63374+:10E860008C82007C8C830078AF820010AF83000C18
63375+:10E870008F55000032A200031040FFFD32A20001BC
63376+:10E880001040013D32A200028F420128AF42002019
63377+:10E890008F4201048F430100AF8200000E000F3C45
63378+:10E8A000AF8300043C0208008C4200C01040000806
63379+:10E8B0008F8400003C0208008C4200C42442000106
63380+:10E8C0003C010800AC2200C40A00126900000000EC
63381+:10E8D0003C020010008210241440010C8F830004BD
63382+:10E8E0003C0208008C4200203C0308008C63003886
63383+:10E8F00000008821244200013C010800AC220020D5
63384+:10E900003C16080026D60038146000022474FFFF6D
63385+:10E910000000A0219742010E308340003042FFFFEB
63386+:10E920001060000A245200043C02002000821024DF
63387+:10E9300050400007308280008F8200042403BFFF14
63388+:10E94000008318240A0011703442100030828000C5
63389+:10E950001040000A3C0200200082102410400007F2
63390+:10E960008F8200043C03FFFF34637FFF0083182481
63391+:10E9700034428000AF820004AF8300000E000F9885
63392+:10E980000000000014400007000000009743011E33
63393+:10E990009742011C3063FFFF00021400006218253B
63394+:10E9A000AF8300089742010C8F4340003045FFFFC2
63395+:10E9B0003402FFFF14620003000000000A00118807
63396+:10E9C000241100208F4240003042010054400001D9
63397+:10E9D000241100108F840000308210005040001479
63398+:10E9E00036310001308200201440000B3C02100040
63399+:10E9F000008210245040000E363100013C030E000E
63400+:10EA00003C020DFF008318243442FFFF0043102B0B
63401+:10EA100050400007363100013C0208008C42002CB7
63402+:10EA2000244200013C010800AC22002C36310005D4
63403+:10EA30003C0608008CC6003454C000238F850000BB
63404+:10EA40008F820004304240005440001F8F85000038
63405+:10EA50003C021F01008210243C0310005443001AA2
63406+:10EA60008F85000030A20200144000178F8500003F
63407+:10EA70003250FFFF363100028F4201B80440FFFEE2
63408+:10EA800000000000AF400180020020210E000F4274
63409+:10EA9000AF4000208F8300042402BFFFA750019ADB
63410+:10EAA000006218248F820000A750018EA7510188B0
63411+:10EAB000A74301A6A74201903C021000AF4201B853
63412+:10EAC0000A001267000010213C02100000A210246E
63413+:10EAD0001040003A0000000010C0000F00000000CD
63414+:10EAE00030A201001040000C3C0302003C020F0069
63415+:10EAF00000A2102410430008000000008F820008CC
63416+:10EB000000541024005610219042000424420004B6
63417+:10EB10000A0011FF000221C00000000000051602DB
63418+:10EB20003050000F3A0300022E4203EF384200013A
63419+:10EB30002C63000100621824146000852402000187
63420+:10EB40003C0308008C6300D02E06000C38620001E4
63421+:10EB50002C4200010046102414400015001021C072
63422+:10EB60002602FFFC2C42000454400011000020212A
63423+:10EB7000386200022C42000100461024504000037D
63424+:10EB8000000512420A0011FF000020210010182B7E
63425+:10EB90000043102450400006001021C00000202136
63426+:10EBA0003245FFFF0E000F633226FFFB001021C02D
63427+:10EBB0003245FFFF0A001252362600028F42400003
63428+:10EBC0003C0308008C6300243042010010400046E2
63429+:10EBD00030620001322200043070000D1440000247
63430+:10EBE0002413000424130002000512C2384200015D
63431+:10EBF0002E4303EF3042000138630001004310252B
63432+:10EC0000104000033231FFFB2402FFFB020280248C
63433+:10EC100010C000183202000130A20100104000159F
63434+:10EC2000320200013C020F0000A210243C0302004B
63435+:10EC30001043000F8F8200082403FFFE020380248C
63436+:10EC40000054102400561021904200040233302555
63437+:10EC50002442000412000002000221C03226FFFFFD
63438+:10EC60000E000F633245FFFF120000390000102133
63439+:10EC7000320200011040000D3202000424020001A3
63440+:10EC800012020002023330253226FFFF000020214D
63441+:10EC90000E000F633245FFFF2402FFFE02028024B4
63442+:10ECA0001200002B00001021320200041040002846
63443+:10ECB0002402000124020004120200020233302563
63444+:10ECC0003226FFFF3245FFFF0E000F6324040100D0
63445+:10ECD0002402FFFB020280241200001D000010210C
63446+:10ECE0000A001267240200015040001900001021A0
63447+:10ECF0003245FFFF36260002000020210E000F6380
63448+:10ED0000000000000A001267000010212402BFFF6B
63449+:10ED1000006210241040000800000000240287FF59
63450+:10ED200000621024144000083C020060008210249D
63451+:10ED300010400005000000000E000D34000000002F
63452+:10ED40000A001267000000000E0012C70000000059
63453+:10ED5000104000063C0240008F4301243C0260202A
63454+:10ED6000AC430014000000003C024000AF420138F8
63455+:10ED70000000000032A200021040FEBD00000000B2
63456+:10ED80008F4201403C044000AF4200208F430148C5
63457+:10ED90003C02700000621824106400420000000071
63458+:10EDA0000083102B144000063C0260003C0220004F
63459+:10EDB000106200073C0240000A0012C3000000007D
63460+:10EDC0001062003C3C0240000A0012C30000000038
63461+:10EDD0008F4501408F4601448F42014800021402D2
63462+:10EDE000304300FF240200041462000A274401801B
63463+:10EDF0008F4201B80440FFFE2402001CAC850000D5
63464+:10EE0000A082000B3C021000AF4201B80A0012C3FE
63465+:10EE10003C0240002402000914620012000616029F
63466+:10EE2000000229C0AF4500208F4201B80440FFFE18
63467+:10EE30002402000124030003AF450180A343018B9A
63468+:10EE4000A740018EA740019AA7400190AF4001A8BA
63469+:10EE5000A7420188A74201A6AF4001AC3C021000C6
63470+:10EE6000AF4201B88F4201B80440FFFE000000002D
63471+:10EE7000AC8500008F42014800021402A482000801
63472+:10EE800024020002A082000B8F420148A4820010DD
63473+:10EE90003C021000AC860024AF4201B80A0012C345
63474+:10EEA0003C0240000E001310000000000A0012C3D4
63475+:10EEB0003C0240000E001BC2000000003C0240006B
63476+:10EEC000AF420178000000000A00112F000000008E
63477+:10EED0008F4201003042003E144000112402000124
63478+:10EEE000AF4000488F420100304207C0104000058B
63479+:10EEF00000000000AF40004CAF40005003E00008AD
63480+:10EF000024020001AF400054AF4000408F42010096
63481+:10EF10003042380054400001AF4000442402000158
63482+:10EF200003E00008000000008F4201B80440FFFE2B
63483+:10EF300024020001AF440180AF400184A74501884D
63484+:10EF4000A342018A24020002A342018B9742014A94
63485+:10EF500014C00004A7420190AF4001A40A0012EFC0
63486+:10EF60003C0210008F420144AF4201A43C02100059
63487+:10EF7000AF4001A803E00008AF4201B88F4201B8DA
63488+:10EF80000440FFFE24020002AF440180AF4401842C
63489+:10EF9000A7450188A342018AA342018B9742014AF7
63490+:10EFA000A7420190AF4001A48F420144AF4201A8A3
63491+:10EFB0003C02100003E00008AF4201B83C029000A0
63492+:10EFC0003442000100822025AF4400208F420020FF
63493+:10EFD0000440FFFE0000000003E000080000000005
63494+:10EFE0003C028000344200010082202503E000083A
63495+:10EFF000AF44002027BDFFE8AFBF0014AFB0001042
63496+:10F000008F50014093430149934201489344014882
63497+:10F01000306300FF304200FF00021200006228252A
63498+:10F020002402001910620076308400802862001AE1
63499+:10F030001040001C24020020240200081062007707
63500+:10F04000286200091040000E2402000B2402000177
63501+:10F0500010620034286200025040000524020006BD
63502+:10F0600050600034020020210A00139A00000000C2
63503+:10F0700010620030020020210A00139A00000000F4
63504+:10F080001062003B2862000C504000022402000E77
63505+:10F090002402000910620056020020210A00139A7F
63506+:10F0A0000000000010620056286200211040000F8E
63507+:10F0B000240200382402001C106200582862001D3F
63508+:10F0C000104000062402001F2402001B1062004CA6
63509+:10F0D000000000000A00139A000000001062004ABD
63510+:10F0E000020020210A00139A00000000106200456F
63511+:10F0F0002862003910400007240200802462FFCB00
63512+:10F100002C42000210400045020020210A00139604
63513+:10F110000000302110620009000000000A00139A6C
63514+:10F12000000000001480003D020020210A0013901E
63515+:10F130008FBF00140A001396240600018F4201B805
63516+:10F140000440FFFE24020002A342018BA745018870
63517+:10F150009742014AA74201908F420144A74201927F
63518+:10F160003C021000AF4201B80A00139C8FBF00148C
63519+:10F170009742014A144000290000000093620005F4
63520+:10F180003042000414400025000000000E0013026D
63521+:10F190000200202193620005020020213442000475
63522+:10F1A0000E00130BA36200059362000530420004B9
63523+:10F1B00014400002000000000000000D93620000F7
63524+:10F1C00024030020304200FF14430014000000001C
63525+:10F1D0008F4201B80440FFFE24020005AF500180B9
63526+:10F1E000A342018B3C0210000A00139AAF4201B8FF
63527+:10F1F0008FBF00148FB000100A0012F227BD001854
63528+:10F200000000000D02002021000030218FBF0014FB
63529+:10F210008FB000100A0012DD27BD00180000000D9D
63530+:10F220008FBF00148FB0001003E0000827BD001846
63531+:10F2300027BDFFE8AFBF00100E000F3C000000002C
63532+:10F24000AF4001808FBF0010000020210A000FE7AF
63533+:10F2500027BD00183084FFFF30A5FFFF00001821F4
63534+:10F260001080000700000000308200011040000202
63535+:10F2700000042042006518210A0013AB0005284055
63536+:10F2800003E000080060102110C0000624C6FFFF44
63537+:10F290008CA2000024A50004AC8200000A0013B573
63538+:10F2A0002484000403E000080000000010A000080F
63539+:10F2B00024A3FFFFAC860000000000000000000057
63540+:10F2C0002402FFFF2463FFFF1462FFFA248400047A
63541+:10F2D00003E0000800000000308300FF30A500FFBD
63542+:10F2E00030C600FF274701808F4201B80440FFFE6F
63543+:10F2F000000000008F42012834634000ACE20000AF
63544+:10F3000024020001ACE00004A4E30008A0E2000A2B
63545+:10F3100024020002A0E2000B3C021000A4E5001051
63546+:10F32000ACE00024ACE00028A4E6001203E00008F2
63547+:10F33000AF4201B827BDFFE8AFBF00109362003FA6
63548+:10F3400024030012304200FF1043000D00803021E2
63549+:10F350008F620044008210230440000A8FBF001017
63550+:10F360008F620048240400390000282100C21023C5
63551+:10F3700004410004240600120E0013C9000000001E
63552+:10F380008FBF00102402000103E0000827BD001811
63553+:10F3900027BDFFC8AFB20030AFB1002CAFBF003403
63554+:10F3A000AFB0002890C5000D0080902130A400105F
63555+:10F3B0001080000B00C088218CC300088F620054AD
63556+:10F3C0001062000730A20005144000B524040001BB
63557+:10F3D0000E000D21000020210A0014BB0040202156
63558+:10F3E00030A200051040000930A30012108000ACCC
63559+:10F3F000240400018E2300088F620054146200A9C7
63560+:10F400008FBF00340A00142C240400382402001298
63561+:10F41000146200A3240400010220202127A500106B
63562+:10F420000E000CB2AFA000101040001102402021CD
63563+:10F430008E220008AF620084AF6000400E0013020D
63564+:10F44000000000009362007D024020213442002031
63565+:10F450000E00130BA362007D0E000CA902402021B8
63566+:10F46000240400382405008D0A0014B82406001274
63567+:10F470009362003E304200081040000F8FA200103F
63568+:10F4800030420100104000078FA300148F6200601B
63569+:10F490000062102304430008AF6300600A001441B7
63570+:10F4A00000000000AF6000609362003E2403FFF79D
63571+:10F4B00000431024A362003E9362003E30420008E5
63572+:10F4C000144000022406000300003021936200343F
63573+:10F4D000936300378F640084304200FF306300FF85
63574+:10F4E00000661821000318800043282100A4202B67
63575+:10F4F0001080000B000000009763003C8F620084C6
63576+:10F500003063FFFF004510230062182B14600004D5
63577+:10F51000000000008F6200840A00145D0045802313
63578+:10F520009762003C3050FFFF8FA300103062000450
63579+:10F5300010400004000628808FA2001C0A001465F9
63580+:10F540000202102B2E02021850400003240202185F
63581+:10F550000A00146E020510233063000410600003DB
63582+:10F56000004510238FA2001C00451023004080217D
63583+:10F570002C42008054400001241000800E00130231
63584+:10F580000240202124020001AF62000C9362003E81
63585+:10F59000001020403042007FA362003E8E22000413
63586+:10F5A00024420001AF620040A770003C8F6200500F
63587+:10F5B0009623000E00431021AF6200588F62005066
63588+:10F5C00000441021AF62005C8E220004AF6200187C
63589+:10F5D0008E220008AF62001C8FA20010304200088B
63590+:10F5E0005440000A93A20020A360003693620036C4
63591+:10F5F0002403FFDFA36200359362003E0043102422
63592+:10F60000A362003E0A0014988E220008A36200350F
63593+:10F610008E220008AF62004C8F6200248F6300408E
63594+:10F6200000431021AF6200489362000024030050A1
63595+:10F63000304200FF144300122403FF803C02080004
63596+:10F640008C4231A00242102100431024AF42002816
63597+:10F650003C0208008C4231A08E2400083C03000CC0
63598+:10F66000024210213042007F03421021004310214A
63599+:10F67000AC4400D88E230008AF820014AC4300DCF9
63600+:10F680000E00130B02402021240400380000282122
63601+:10F690002406000A0E0013C9000000002404000123
63602+:10F6A0008FBF00348FB200308FB1002C8FB0002894
63603+:10F6B0000080102103E0000827BD003827BDFFF8B7
63604+:10F6C00027420180AFA20000308A00FF8F4201B8BC
63605+:10F6D0000440FFFE000000008F4601283C020800A5
63606+:10F6E0008C4231A02403FF80AF86004800C2102165
63607+:10F6F00000431024AF4200243C0208008C4231A099
63608+:10F700008FA900008FA8000000C210213042007FA6
63609+:10F71000034218213C02000A00621821946400D4BC
63610+:10F720008FA700008FA5000024020002AF83001401
63611+:10F73000A0A2000B8FA30000354260003084FFFFC1
63612+:10F74000A4E200083C021000AD260000AD04000455
63613+:10F75000AC60002427BD0008AF4201B803E00008F8
63614+:10F76000240200018F88003C938200288F830014BC
63615+:10F770003C07080024E7779800481023304200FF38
63616+:10F78000304900FC246500888F860040304A000321
63617+:10F790001120000900002021248200048CA3000015
63618+:10F7A000304400FF0089102AACE3000024A50004C7
63619+:10F7B0001440FFF924E70004114000090000202153
63620+:10F7C0002482000190A30000304400FF008A102B27
63621+:10F7D000A0E3000024A500011440FFF924E7000184
63622+:10F7E00030C20003144000048F85003C3102000346
63623+:10F7F0001040000D0000000010A0000900002021B2
63624+:10F800002482000190C30000304400FF0085102BCB
63625+:10F81000A0E3000024C600011440FFF924E7000122
63626+:10F8200003E00008000000001100FFFD000020219F
63627+:10F83000248200048CC30000304400FF0088102B99
63628+:10F84000ACE3000024C600041440FFF924E70004E0
63629+:10F8500003E00008000000008F83003C9382002832
63630+:10F8600030C600FF30A500FF00431023304300FFE7
63631+:10F870008F820014008038210043102114C0000240
63632+:10F88000244800880083382130E20003144000053A
63633+:10F8900030A2000314400003306200031040000D4A
63634+:10F8A0000000000010A000090000202124820001B7
63635+:10F8B00090E30000304400FF0085102BA1030000FE
63636+:10F8C00024E700011440FFF92508000103E00008C7
63637+:10F8D0000000000010A0FFFD000020212482000491
63638+:10F8E0008CE30000304400FF0085102BAD030000C6
63639+:10F8F00024E700041440FFF92508000403E0000891
63640+:10F90000000000000080482130AAFFFF30C600FF41
63641+:10F9100030E7FFFF274801808F4201B80440FFFE17
63642+:10F920008F820048AD0200008F420124AD02000426
63643+:10F930008D220020A5070008A102000A240200165B
63644+:10F94000A102000B934301208D2200088D240004A6
63645+:10F95000306300FF004310219783003A00441021D8
63646+:10F960008D250024004310233C0308008C6331A044
63647+:10F970008F840014A502000C246300E82402FFFF1A
63648+:10F98000A50A000EA5030010A5060012AD0500187B
63649+:10F99000AD020024948201142403FFF73042FFFFDC
63650+:10F9A000AD0200288C820118AD02002C3C02100030
63651+:10F9B000AD000030AF4201B88D220020004310247A
63652+:10F9C00003E00008AD2200208F82001430E7FFFF23
63653+:10F9D00000804821904200D330A5FFFF30C600FFD1
63654+:10F9E0000002110030420F0000E238252748018054
63655+:10F9F0008F4201B80440FFFE8F820048AD02000034
63656+:10FA00008F420124AD0200048D220020A5070008CA
63657+:10FA1000A102000A24020017A102000B9343012057
63658+:10FA20008D2200088D240004306300FF0043102164
63659+:10FA30009783003A004410218F8400140043102360
63660+:10FA40003C0308008C6331A0A502000CA505000E44
63661+:10FA5000246300E8A5030010A5060012AD00001401
63662+:10FA60008D220024AD0200188C82005CAD02001CC7
63663+:10FA70008C820058AD0200202402FFFFAD0200245A
63664+:10FA8000948200E63042FFFFAD02002894820060BD
63665+:10FA9000948300BE30427FFF3063FFFF00021200FC
63666+:10FAA00000431021AD02002C3C021000AD000030DC
63667+:10FAB000AF4201B8948200BE2403FFF700A21021D8
63668+:10FAC000A48200BE8D2200200043102403E0000821
63669+:10FAD000AD220020274301808F4201B80440FFFE81
63670+:10FAE0008F8200249442001C3042FFFF000211C0AC
63671+:10FAF000AC62000024020019A062000B3C0210005E
63672+:10FB0000AC60003003E00008AF4201B88F87002CE2
63673+:10FB100030C300FF8F4201B80440FFFE8F820048CF
63674+:10FB200034636000ACA2000093820044A0A20005F0
63675+:10FB30008CE20010A4A20006A4A300088C8200207E
63676+:10FB40002403FFF7A0A2000A24020002A0A2000BD7
63677+:10FB50008CE20000ACA200108CE20004ACA2001405
63678+:10FB60008CE2001CACA200248CE20020ACA2002895
63679+:10FB70008CE2002CACA2002C8C820024ACA20018D9
63680+:10FB80003C021000AF4201B88C82002000431024D8
63681+:10FB900003E00008AC8200208F86001427BDFFE838
63682+:10FBA000AFBF0014AFB0001090C20063304200201D
63683+:10FBB0001040000830A500FF8CC2007C2403FFDF4A
63684+:10FBC00024420001ACC2007C90C2006300431024B8
63685+:10FBD000A0C2006310A000238F830014275001806F
63686+:10FBE000020028210E0015D6240600828F82001400
63687+:10FBF000904200633042004050400019A38000440E
63688+:10FC00008F83002C8F4201B80440FFFE8F82004892
63689+:10FC1000AE02000024026082A60200082402000254
63690+:10FC2000A202000B8C620008AE0200108C62000C75
63691+:10FC3000AE0200148C620014AE0200188C62001830
63692+:10FC4000AE0200248C620024AE0200288C620028E0
63693+:10FC5000AE02002C3C021000AF4201B8A380004469
63694+:10FC60008F8300148FBF00148FB000109062006368
63695+:10FC700027BD00183042007FA06200639782003ADF
63696+:10FC80008F86003C8F850014938300280046102344
63697+:10FC9000A782003AA4A000E490A400638F820040F1
63698+:10FCA000AF83003C2403FFBF0046102100832024C3
63699+:10FCB000AF820040A0A400638F820014A04000BD6A
63700+:10FCC0008F82001403E00008A44000BE8F8A001455
63701+:10FCD00027BDFFE0AFB10014AFB000108F88003C2B
63702+:10FCE000AFBF00189389001C954200E430D100FF9B
63703+:10FCF0000109182B0080802130AC00FF3047FFFF46
63704+:10FD00000000582114600003310600FF012030215B
63705+:10FD1000010958239783003A0068102B1440003CD7
63706+:10FD20000000000014680007240200018E02002079
63707+:10FD30002403FFFB34E7800000431024AE020020C0
63708+:10FD40002402000134E70880158200053165FFFFB9
63709+:10FD50000E001554020020210A00169102002021F5
63710+:10FD60000E001585020020218F8400482743018062
63711+:10FD70008F4201B80440FFFE24020018AC6400006A
63712+:10FD8000A062000B8F840014948200E6A46200102D
63713+:10FD90003C021000AC600030AF4201B894820060B9
63714+:10FDA00024420001A4820060948200603C030800A9
63715+:10FDB0008C63318830427FFF5443000F02002021C2
63716+:10FDC000948200602403800000431024A482006019
63717+:10FDD0009082006090830060304200FF000211C2F8
63718+:10FDE00000021027000211C03063007F0062182556
63719+:10FDF000A083006002002021022028218FBF00186C
63720+:10FE00008FB100148FB000100A0015F927BD002033
63721+:10FE1000914200632403FF8000431025A142006348
63722+:10FE20009782003A3048FFFF110000209383001CA6
63723+:10FE30008F840014004B1023304600FF948300E4AD
63724+:10FE40002402EFFF0168282B00621824A48300E439
63725+:10FE500014A000038E020020010058210000302170
63726+:10FE60002403FFFB34E7800000431024AE0200208F
63727+:10FE700024020001158200053165FFFF0E001554B4
63728+:10FE8000020020210A0016B99783003A0E0015855A
63729+:10FE9000020020219783003A8F82003CA780003A1D
63730+:10FEA00000431023AF82003C9383001C8F82001418
63731+:10FEB0008FBF00188FB100148FB0001027BD002035
63732+:10FEC00003E00008A04300BD938200442403000126
63733+:10FED00027BDFFE8004330042C420020AFB00010E3
63734+:10FEE000AFBF00142410FFFE10400005274501801D
63735+:10FEF0003C0208008C4231900A0016D600461024BD
63736+:10FF00003C0208008C423194004610241440000743
63737+:10FF1000240600848F8300142410FFFF9062006287
63738+:10FF20003042000F34420040A06200620E0015D63D
63739+:10FF300000000000020010218FBF00148FB00010DD
63740+:10FF400003E0000827BD00188F83002427BDFFE0D1
63741+:10FF5000AFB20018AFB10014AFB00010AFBF001CBB
63742+:10FF60009062000D00A0902130D100FF3042007F50
63743+:10FF7000A062000D8F8500148E4300180080802140
63744+:10FF80008CA2007C146200052402000E90A2006383
63745+:10FF9000344200200A0016FFA0A200630E0016C51E
63746+:10FFA000A38200442403FFFF104300472404FFFF03
63747+:10FFB00052200045000020218E4300003C0200102A
63748+:10FFC00000621024504000043C020008020020217E
63749+:10FFD0000A00170E24020015006210245040000988
63750+:10FFE0008E45000002002021240200140E0016C5D8
63751+:10FFF000A38200442403FFFF104300332404FFFFC7
63752+:020000021000EC
63753+:100000008E4500003C02000200A2102410400016A1
63754+:100010003C0200048F8600248CC200148CC30010A4
63755+:100020008CC40014004310230044102B50400005E2
63756+:10003000020020218E43002C8CC2001010620003AD
63757+:10004000020020210A00173F240200123C02000493
63758+:1000500000A210245040001C00002021020020219A
63759+:100060000A00173F2402001300A2102410400006CB
63760+:100070008F8300248C620010504000130000202168
63761+:100080000A001739020020218C6200105040000441
63762+:100090008E42002C020020210A00173F240200118A
63763+:1000A00050400009000020210200202124020017F6
63764+:1000B0000E0016C5A38200442403FFFF1043000274
63765+:1000C0002404FFFF000020218FBF001C8FB2001806
63766+:1000D0008FB100148FB000100080102103E00008E1
63767+:1000E00027BD00208F83001427BDFFD8AFB40020A8
63768+:1000F000AFB3001CAFB20018AFB10014AFB0001026
63769+:10010000AFBF0024906200638F91002C2412FFFF88
63770+:100110003442004092250000A06200638E2200104D
63771+:100120000080982130B0003F105200060360A021EB
63772+:100130002402000D0E0016C5A38200441052005484
63773+:100140002404FFFF8F8300148E2200188C63007C30
63774+:1001500010430007026020212402000E0E0016C585
63775+:10016000A38200442403FFFF104300492404FFFF3F
63776+:1001700024040020120400048F83001490620063A2
63777+:1001800034420020A06200638F85003410A000205C
63778+:1001900000000000560400048F8200140260202139
63779+:1001A0000A0017902402000A9683000A9442006015
63780+:1001B0003042FFFF144300048F8200202404FFFD1F
63781+:1001C0000A0017B7AF82003C3C0208008C42318C19
63782+:1001D0000045102B14400006026020210000282159
63783+:1001E0000E001646240600010A0017B70000202161
63784+:1001F0002402002D0E0016C5A38200442403FFFF35
63785+:10020000104300232404FFFF0A0017B70000202139
63786+:10021000160400058F8400148E2300142402FFFFAF
63787+:100220005062001802602021948200602442000184
63788+:10023000A4820060948200603C0308008C633188D3
63789+:1002400030427FFF5443000F0260202194820060FF
63790+:100250002403800000431024A48200609082006088
63791+:1002600090830060304200FF000211C2000210279C
63792+:10027000000211C03063007F00621825A083006077
63793+:10028000026020210E0015F9240500010000202144
63794+:100290008FBF00248FB400208FB3001C8FB20018D2
63795+:1002A0008FB100148FB000100080102103E000080F
63796+:1002B00027BD00288F83001427BDFFE8AFB00010D2
63797+:1002C000AFBF0014906200638F87002C00808021F4
63798+:1002D000344200408CE60010A06200633C0308003A
63799+:1002E0008C6331B030C23FFF0043102B1040004EF2
63800+:1002F0008F8500302402FF8090A3000D004310245E
63801+:10030000304200FF504000490200202100061382C5
63802+:10031000304800032402000255020044020020215C
63803+:1003200094A2001C8F85001424030023A4A20114AE
63804+:100330008CE60000000616023042003F1043001019
63805+:100340003C0300838CE300188CA2007C1062000642
63806+:100350002402000E0E0016C5A38200442403FFFFF2
63807+:10036000104300382404FFFF8F8300149062006361
63808+:1003700034420020A06200630A0017FC8F8300242F
63809+:1003800000C31024144300078F83002490A200624E
63810+:100390003042000F34420020A0A20062A38800383F
63811+:1003A0008F8300249062000D3042007FA062000D18
63812+:1003B0008F83003410600018020020218F840030E9
63813+:1003C0008C8200100043102B1040000924020018FA
63814+:1003D000020020210E0016C5A38200442403FFFF63
63815+:1003E000104300182404FFFF0A00182400002021F5
63816+:1003F0008C820010240500010200202100431023FC
63817+:100400008F830024240600010E001646AC62001003
63818+:100410000A001824000020210E0015F9240500010F
63819+:100420000A00182400002021020020212402000DCF
63820+:100430008FBF00148FB0001027BD00180A0016C52A
63821+:10044000A38200448FBF00148FB0001000801021E1
63822+:1004500003E0000827BD001827BDFFC8AFB2002089
63823+:10046000AFBF0034AFB60030AFB5002CAFB400283A
63824+:10047000AFB30024AFB1001CAFB000188F46012805
63825+:100480003C0308008C6331A02402FF80AF86004843
63826+:1004900000C318213065007F03452821006218241D
63827+:1004A0003C02000AAF43002400A2282190A200626F
63828+:1004B00000809021AF850014304200FF000211023D
63829+:1004C000A382003890A200BC304200021440000217
63830+:1004D00024030034240300308F820014A3830028F7
63831+:1004E000938300388C4200C0A3800044AF82003C5C
63832+:1004F000240200041062031C8F84003C8E4400041C
63833+:10050000508003198F84003C8E4200103083FFFF1F
63834+:10051000A784003A106002FFAF8200408F8400146D
63835+:100520002403FF809082006300621024304200FFA9
63836+:10053000144002CF9785003A9383003824020002CA
63837+:1005400030B6FFFF14620005000088219382002866
63838+:100550002403FFFD0A001B19AF82003C8F82003C80
63839+:1005600002C2102B144002A18F8400400E0014EC34
63840+:1005700000000000938300283C040800248477983E
63841+:10058000240200341462002EAF84002C3C0A0800C0
63842+:100590008D4A77C82402FFFFAFA2001000803821E7
63843+:1005A0002405002F3C09080025297398240800FF22
63844+:1005B0002406FFFF90E2000024A3FFFF00062202B2
63845+:1005C00000C21026304200FF0002108000491021B6
63846+:1005D0008C420000306500FF24E7000114A8FFF5FD
63847+:1005E0000082302600061027AFA20014AFA2001030
63848+:1005F0000000282127A7001027A6001400C51023FB
63849+:100600009044000324A2000100A71821304500FFF8
63850+:100610002CA200041440FFF9A06400008FA2001077
63851+:100620001142000724020005024020210E0016C5D9
63852+:10063000A38200442403FFFF104300642404FFFF4F
63853+:100640003C0208009042779C104000098F82001401
63854+:10065000024020212402000C0E0016C5A382004493
63855+:100660002403FFFF104300592404FFFF8F8200146E
63856+:10067000A380001C3C0308008C63779C8C440080A2
63857+:100680003C0200FF3442FFFF006218240083202B4D
63858+:1006900010800008AF83003402402021240200199A
63859+:1006A0000E0016C5A38200442403FFFF1043004739
63860+:1006B0002404FFFF8F87003C9782003A8F85003427
63861+:1006C000AF8700200047202310A0003BA784003AFA
63862+:1006D0008F86001430A200030002102390C300BCD8
63863+:1006E0003050000300B0282100031882307300014D
63864+:1006F0000013108000A228213C0308008C6331A065
63865+:100700008F8200483084FFFF0085202B004310219A
63866+:1007100010800011244200888F84002C1082000E6B
63867+:100720003C033F013C0208008C42779800431024B0
63868+:100730003C0325001443000630E500FF8C820000D6
63869+:10074000ACC200888C8200100A0018E9ACC2009884
63870+:100750000E001529000030219382001C8F850014A3
63871+:100760008F830040020238218F82003CA387001C47
63872+:1007700094A400E4006218218F82003434841000B5
63873+:10078000AF83004000503021A4A400E41260000EAA
63874+:10079000AF86003C24E20004A382001C94A200E483
63875+:1007A00024C30004AF83003C34422000A4A200E430
63876+:1007B0000A001906000020218F820040AF80003C13
63877+:1007C00000471021AF820040000020212414FFFFC9
63878+:1007D000109402112403FFFF3C0808008D0877A83D
63879+:1007E0003C0208008C4231B03C03080090637798CB
63880+:1007F00031043FFF0082102B1040001B3067003F88
63881+:100800003C0208008C4231A88F83004800042180FC
63882+:1008100000621821006418213062007F0342282101
63883+:100820003C02000C00A228213C020080344200015E
63884+:100830003066007800C230252402FF800062102458
63885+:10084000AF42002830640007AF4208048F820014D2
63886+:100850000344202124840940AF460814AF850024B6
63887+:10086000AF840030AC4301189383003824020003A6
63888+:10087000146201CF240200012402002610E201D1FB
63889+:1008800028E2002710400013240200322402002234
63890+:1008900010E201CC28E200231040000824020024CA
63891+:1008A0002402002010E201B82402002110E20147D6
63892+:1008B000024020210A001AFB2402000B10E201C1B1
63893+:1008C0002402002510E20010024020210A001AFB39
63894+:1008D0002402000B10E201AE28E2003310400006B3
63895+:1008E0002402003F2402003110E2009A024020213D
63896+:1008F0000A001AFB2402000B10E201A5024020218D
63897+:100900000A001AFB2402000B8F90002C3C03080005
63898+:100910008C6331B08F8500308E0400100000A82158
63899+:100920008CB3001430823FFF0043102B8CB10020A9
63900+:100930005040018F0240202190A3000D2402FF802F
63901+:1009400000431024304200FF504001890240202122
63902+:10095000000413823042000314400185024020212C
63903+:1009600094A3001C8F8200148E040028A443011459
63904+:100970008CA20010026218231064000302402021A0
63905+:100980000A00197C2402001F8F82003400621021AB
63906+:100990000262102B104000088F83002402402021A7
63907+:1009A000240200180E0016C5A382004410540174DE
63908+:1009B0002404FFFF8F8300248F8400348C62001096
63909+:1009C0000224882100441023AC6200108F8200149E
63910+:1009D000AC7100208C4200680051102B10400009BF
63911+:1009E0008F830030024020212402001D0E0016C516
63912+:1009F000A38200442403FFFF104301612404FFFF8E
63913+:100A00008F8300308E0200248C6300241043000783
63914+:100A1000024020212402001C0E0016C5A3820044BF
63915+:100A20002403FFFF104301562404FFFF8F8400249A
63916+:100A30008C82002424420001AC8200241233000482
63917+:100A40008F8200148C4200685622000E8E02000035
63918+:100A50008E0200003C030080004310241440000D6F
63919+:100A60002402001A024020210E0016C5A382004471
63920+:100A70002403FFFF104301422404FFFF0A0019BAB8
63921+:100A80008E0200143C0300800043102450400003F9
63922+:100A90008E020014AC8000208E0200142411FFFF8F
63923+:100AA0001051000E3C0308003C0208008C423190BB
63924+:100AB000004310242403001B14400007A3830044B8
63925+:100AC0000E0016C5024020211051012D2404FFFF05
63926+:100AD0000A0019CB8E030000A38000448E0300009F
63927+:100AE0003C02000100621024104000123C02008011
63928+:100AF0000062102414400008024020212402001A41
63929+:100B00000E0016C5A38200442403FFFF1043011CFE
63930+:100B10002404FFFF02402021020028210E0016E5D8
63931+:100B2000240600012403FFFF104301152404FFFFE6
63932+:100B3000241500018F83002402A0302102402021CF
63933+:100B40009462003624050001244200010A001ADFE5
63934+:100B5000A46200368F90002C3C0308008C6331B0F7
63935+:100B60008E13001032623FFF0043102B10400089AB
63936+:100B70008F8400302402FF809083000D00431024F6
63937+:100B8000304200FF104000842402000D0013138245
63938+:100B900030420003240300011443007F2402000DAF
63939+:100BA0009082000D30420008544000048F820034CF
63940+:100BB000024020210A001A102402002450400004A0
63941+:100BC0008E03000C024020210A001A102402002784
63942+:100BD0008C82002054620006024020218E0300080F
63943+:100BE0008C820024506200098E02001402402021F1
63944+:100BF000240200200E0016C5A38200441054007188
63945+:100C00002403FFFF0A001A458F8400242411FFFFEC
63946+:100C1000145100048F860014024020210A001A405B
63947+:100C2000240200258E0300188CC2007C1062000391
63948+:100C30002402000E0A001A40024020218E030024E4
63949+:100C40008C82002810620003240200210A001A404E
63950+:100C5000024020218E0500288C82002C10A2000367
63951+:100C60002402001F0A001A40024020218E03002C9B
63952+:100C700014600003240200230A001A4002402021CD
63953+:100C80008CC200680043102B104000032402002691
63954+:100C90000A001A40024020218C82001400651821AD
63955+:100CA0000043102B104000088F84002402402021B4
63956+:100CB000240200220E0016C5A382004410510041F8
63957+:100CC0002403FFFF8F8400242403FFF79082000D8C
63958+:100CD00000431024A082000D8F8600143C030800FE
63959+:100CE0008C6331AC8F82004894C400E08F8500246F
63960+:100CF0000043102130847FFF000420400044102175
63961+:100D00003043007F034320213C03000E0083202159
63962+:100D10002403FF8000431024AF42002CA493000062
63963+:100D20008CA2002824420001ACA200288CA2002C36
63964+:100D30008E03002C00431021ACA2002C8E02002C4C
63965+:100D4000ACA200308E020014ACA2003494A2003A8F
63966+:100D500024420001A4A2003A94C600E03C0208002C
63967+:100D60008C4231B024C4000130837FFF1462000F35
63968+:100D700000803021240280000082302430C2FFFF36
63969+:100D8000000213C2304200FF000210270A001A7E40
63970+:100D9000000233C02402000D024020210E0016C5BF
63971+:100DA000A38200440A001A84004018218F82001494
63972+:100DB00002402021240500010E0015F9A44600E0A0
63973+:100DC000000018210A001B16006088218F90002C5B
63974+:100DD0003C0308008C6331B08E05001030A23FFF49
63975+:100DE0000043102B104000612402FF808F840030EC
63976+:100DF0009083000D00431024304200FF5040005CFF
63977+:100E0000024020218F8200341040000B0005138225
63978+:100E10008F8200149763000A944200603042FFFF03
63979+:100E200014430005000513828F8200202404FFFD77
63980+:100E30000A001AF3AF82003C304200031440000E57
63981+:100E40000000000092020002104000058E03002402
63982+:100E500050600015920300030A001AAF02402021DF
63983+:100E60008C82002450620010920300030240202173
63984+:100E70000A001AB72402000F9082000D30420008C9
63985+:100E80005440000992030003024020212402001074
63986+:100E90000E0016C5A38200442403FFFF1043003850
63987+:100EA0002404FFFF92030003240200025462000C9A
63988+:100EB000920200038F820034544000099202000322
63989+:100EC000024020212402002C0E0016C5A3820044FB
63990+:100ED0002403FFFF1043002A2404FFFF92020003B3
63991+:100EE0000200282102402021384600102CC60001B3
63992+:100EF0002C4200010E0016E5004630252410FFFFAD
63993+:100F00001050001F2404FFFF8F8300341060001373
63994+:100F1000024020213C0208008C42318C0043102BFF
63995+:100F200014400007000000000000282124060001F2
63996+:100F30000E001646000000000A001AF300002021EF
63997+:100F40002402002D0E0016C5A38200441050000C90
63998+:100F50002404FFFF0A001AF3000020210E0015F9F7
63999+:100F6000240500010A001AF300002021024020217C
64000+:100F70002402000D0E0016C5A3820044004020216B
64001+:100F80000A001B16008088211514000E00000000C6
64002+:100F90000E00174C024020210A001B160040882139
64003+:100FA0000E0016C5A38200440A001B1600408821CB
64004+:100FB00014620017022018212402002314E2000505
64005+:100FC0002402000B0E0017C0024020210A001B164D
64006+:100FD0000040882102402021A38200440E0016C553
64007+:100FE0002411FFFF0A001B170220182130A500FF63
64008+:100FF0000E001529240600019783003A8F82003CD9
64009+:10100000A780003A00431023AF82003C0220182141
64010+:101010001220003E9782003A2402FFFD5462003EF7
64011+:101020008E4300208E4200048F830014005610234C
64012+:10103000AE420004906200633042007FA062006311
64013+:101040008E4200208F840014A780003A34420002B0
64014+:10105000AE420020A48000E4908200632403FFBF1E
64015+:1010600000431024A08200630A001B598E43002015
64016+:101070009082006300621024304200FF1040002381
64017+:101080009782003A90820088908300BD2485008872
64018+:101090003042003F2444FFE02C820020A383001C48
64019+:1010A00010400019AF85002C2402000100821804B2
64020+:1010B000306200191440000C3C02800034420002EF
64021+:1010C000006210241440000B306200201040000F1A
64022+:1010D0009782003A90A600010240202124050001D9
64023+:1010E0000A001B5330C60001024020210A001B5297
64024+:1010F00024050001024020210000282124060001CF
64025+:101100000E001646000000009782003A1440FD04CD
64026+:101110008F8400148E4300203062000410400012BF
64027+:101120008F84003C2402FFFB00621024AE420020AA
64028+:10113000274301808F4201B80440FFFE8F820048A0
64029+:10114000AC6200008F420124AC6200042402608380
64030+:10115000A462000824020002A062000B3C021000FE
64031+:10116000AF4201B88F84003C8F8300148FBF0034DE
64032+:101170008FB600308FB5002C8FB400288FB30024B9
64033+:101180008FB200208FB1001C8FB000182402000124
64034+:1011900027BD003803E00008AC6400C030A500FFA4
64035+:1011A0002403000124A900010069102B1040000C49
64036+:1011B00000004021240A000100A31023004A380443
64037+:1011C00024630001308200010069302B10400002CE
64038+:1011D000000420420107402554C0FFF800A310235B
64039+:1011E00003E00008010010213C020800244260A432
64040+:1011F0003C010800AC22738C3C02080024425308D6
64041+:101200003C010800AC2273902402000627BDFFE0D9
64042+:101210003C010800A02273943C021EDCAFB200180F
64043+:10122000AFB10014AFBF001CAFB0001034526F411B
64044+:1012300000008821240500080E001B7A02202021CE
64045+:10124000001180803C07080024E773980002160014
64046+:1012500002071821AC6200000000282124A200012E
64047+:101260003045FFFF8C6200002CA6000804410002FC
64048+:10127000000220400092202614C0FFF8AC64000059
64049+:10128000020780218E0400000E001B7A2405002036
64050+:10129000262300013071FFFF2E2301001460FFE5BB
64051+:1012A000AE0200008FBF001C8FB200188FB1001477
64052+:1012B0008FB0001003E0000827BD002027BDFFD835
64053+:1012C000AFB3001CAFB20018AFBF0020AFB1001425
64054+:1012D000AFB000108F5101408F48014800089402C0
64055+:1012E000324300FF311300FF8F4201B80440FFFE7C
64056+:1012F00027500180AE1100008F420144AE0200046D
64057+:1013000024020002A6120008A202000B240200140C
64058+:10131000AE1300241062002528620015104000085A
64059+:101320002402001524020010106200302402001272
64060+:10133000106200098FBF00200A001CB58FB3001C8B
64061+:101340001062007024020022106200378FBF00205C
64062+:101350000A001CB58FB3001C3C0208008C4231A06F
64063+:101360002403FF800222102100431024AF420024F6
64064+:101370003C0208008C4231A0022210213042007F42
64065+:10138000034218213C02000A00621821166000BCCA
64066+:10139000AF830014906200623042000F344200308C
64067+:1013A000A06200620A001CB48FBF00203C046000F1
64068+:1013B0008C832C083C02F0033442FFFF00621824A7
64069+:1013C000AC832C083C0208008C4231A08C832C0892
64070+:1013D000244200740002108200021480006218256A
64071+:1013E000AC832C080A001CB48FBF00203C0208000C
64072+:1013F0008C4231A02403FF800222102100431024DC
64073+:10140000AF4200243C0208008C4231A03C03000A99
64074+:10141000022210213042007F03421021004310219C
64075+:101420000A001CB3AF8200143C0208008C4231A0B9
64076+:101430002405FF800222102100451024AF42002421
64077+:101440003C0208008C4231A0022210213042007F71
64078+:10145000034218213C02000A0062182190620063D6
64079+:1014600000A21024304200FF10400085AF8300141A
64080+:1014700024620088944300123C0208008C4231A888
64081+:1014800030633FFF00031980022210210043102126
64082+:101490003043007F03432021004510243C03000C0F
64083+:1014A00000832021AF4200289082000D00A210246A
64084+:1014B000304200FF10400072AF8400249082000D83
64085+:1014C000304200101440006F8FBF00200E0015C87E
64086+:1014D000000000008F4201B80440FFFE0000000041
64087+:1014E000AE1100008F420144AE020004240200024B
64088+:1014F000A6120008A202000BAE1300240A001CB4BE
64089+:101500008FBF00202406FF8002261024AF42002057
64090+:101510003C0208008C4231A031043FFF00042180CE
64091+:101520000222102100461024AF4200243C03080090
64092+:101530008C6331A83C0208008C4231A03227007F26
64093+:101540000223182102221021006418213042007F5A
64094+:101550003064007F034228213C02000A0066182400
64095+:1015600000A22821034420213C02000C00822021FB
64096+:10157000AF4300283C020008034718210062902175
64097+:10158000AF850014AF8400240E0015C8010080212F
64098+:101590008F4201B80440FFFE8F8200248F84001424
64099+:1015A000274501809042000DACB10000A4B00006B8
64100+:1015B000000216000002160300021027000237C2C4
64101+:1015C00014C00016248200889442001232033FFFA8
64102+:1015D00030423FFF14430012240260829083006374
64103+:1015E0002402FF8000431024304200FF5040000CD2
64104+:1015F00024026082908200623042000F3442004038
64105+:10160000A082006224026084A4A200082402000DCB
64106+:10161000A0A200050A001C9E3C0227002402608252
64107+:10162000A4A20008A0A000053C02270000061C00A0
64108+:101630000062182524020002A0A2000BACA3001037
64109+:10164000ACA00014ACA00024ACA00028ACA0002CDE
64110+:101650008E42004C8F840024ACA200189083000DB1
64111+:101660002402FF8000431024304200FF1040000598
64112+:101670008FBF00209082000D3042007FA082000DBD
64113+:101680008FBF00208FB3001C8FB200188FB10014E1
64114+:101690008FB000103C02100027BD002803E00008B6
64115+:1016A000AF4201B80800343008003430080033A8D5
64116+:1016B000080033E0080034140800343808003438D7
64117+:1016C00008003438080033180A0001240000000024
64118+:1016D000000000000000000D747061362E322E33C1
64119+:1016E00000000000060203010000000000000000EE
64120+:1016F00000000000000000000000000000000000EA
64121+:1017000000000000000000000000000000000000D9
64122+:1017100000000000000000000000000000000000C9
64123+:1017200000000000000000000000000000000000B9
64124+:1017300000000000000000000000000000000000A9
64125+:101740000000000000000000000000000000000099
64126+:101750000000000000000000000000001000000376
64127+:10176000000000000000000D0000000D3C02080019
64128+:1017700024421C003C03080024632094AC40000079
64129+:101780000043202B1480FFFD244200043C1D080070
64130+:1017900037BD2FFC03A0F0213C1008002610049058
64131+:1017A0003C1C0800279C1C000E00015C000000008F
64132+:1017B0000000000D3084FFFF308200078F85001885
64133+:1017C00010400002248300073064FFF800853021B8
64134+:1017D00030C41FFF03441821247B4000AF85001C48
64135+:1017E000AF84001803E00008AF4400843084FFFF9A
64136+:1017F000308200078F8500208F860028104000026D
64137+:10180000248300073064FFF8008520210086182B10
64138+:1018100014600002AF8500240086202303442821A1
64139+:1018200034068000AF840020AF44008000A6202151
64140+:1018300003E00008AF84003827BDFFD8AFB3001C19
64141+:10184000AFB20018AFB00010AFBF0024AFB400209B
64142+:10185000AFB100143C0860088D1450002418FF7FBD
64143+:101860003C1A8000029898243672380CAD12500051
64144+:101870008F5100083C07601C3C08600036300001B6
64145+:10188000AF500008AF800018AF400080AF40008428
64146+:101890008CE600088D0F08083C0760168CEC0000F1
64147+:1018A00031EEFFF039CA00103C0DFFFF340B800011
64148+:1018B0003C030080034B48212D440001018D282466
64149+:1018C0003C0253533C010800AC230420AF8900388C
64150+:1018D000AF860028AF840010275B400014A20003ED
64151+:1018E00034E37C008CF90004032818218C7F007CF1
64152+:1018F0008C6500783C0280003C0B08008D6B048CEA
64153+:101900003C0A08008D4A048834520070AF85003CC0
64154+:10191000AF9F00403C13080026731C440240A021E6
64155+:101920008E4800008F46000038C30001306400017B
64156+:1019300010800017AF880034028048218D2F0000EE
64157+:101940003C0508008CA5045C3C1808008F1804585E
64158+:1019500001E8102300A280210000C8210202402BD0
64159+:1019600003198821022838213C010800AC30045CAE
64160+:101970003C010800AC2704588F4E000039CD00010F
64161+:1019800031AC00011580FFED01E04021AF8F003444
64162+:101990008E5100003C0708008CE7045C3C0D0800F9
64163+:1019A0008DAD04580228802300F0602100007021D2
64164+:1019B0000190302B01AE1821006620213C01080067
64165+:1019C000AC2C045C3C010800AC2404588F46010890
64166+:1019D0008F47010030C92000AF860000AF87000CA0
64167+:1019E0001120000A00C040213C1808008F18042C68
64168+:1019F000270800013C010800AC28042C3C184000DA
64169+:101A0000AF5801380A000196000000009749010410
64170+:101A100000002821014550213122FFFF0162582199
64171+:101A20000162F82B015F502130D902003C0108000F
64172+:101A3000AC2B048C3C010800AC2A0488172000154C
64173+:101A400024040F0010E400130000000024080D001F
64174+:101A500010E8023B30CD000611A0FFE93C18400021
64175+:101A6000936E00002409001031C400F01089027147
64176+:101A700024020070108202E58F880014250F0001F7
64177+:101A8000AF8F00143C184000AF5801380A0001968F
64178+:101A900000000000974C01041180FFD93C18400061
64179+:101AA00030C34000146000A1000000008F460178A0
64180+:101AB00004C0FFFE8F87003824100800240F0008A0
64181+:101AC0008CE30008AF500178A74F0140A7400142C6
64182+:101AD000974E01048F86000031C9FFFF30CD000111
64183+:101AE00011A002E1012040212531FFFE241800024F
64184+:101AF000A75801463228FFFFA75101483C190800AA
64185+:101B00008F39043C172002D08F8C000C30DF00206E
64186+:101B100017E00002240400092404000130C20C0074
64187+:101B2000240504005045000134840004A744014A00
64188+:101B30003C1108008E3104203C1800483C10000184
64189+:101B40000238182530CF00020070282511E000046B
64190+:101B5000000018213C19010000B9282524030001C8
64191+:101B600030DF000453E00005AF8300083C0600109E
64192+:101B700000A6282524030001AF830008AF4510000C
64193+:101B80000000000000000000000000000000000055
64194+:101B90008F83000810600023000000008F451000B4
64195+:101BA00004A1FFFE000000001060001E0000000005
64196+:101BB0008F4410003C0C0020008C102410400019B1
64197+:101BC0008F8E000031CD000211A000160000000031
64198+:101BD000974F101415E000130000000097591008EB
64199+:101BE0003338FFFF271100060011188200033080F0
64200+:101BF00000C7282132300001322300031200032CD9
64201+:101C00008CA200000000000D00C7F821AFE2000028
64202+:101C10003C0508008CA5043024A600013C01080006
64203+:101C2000AC2604308F6D00003402FFFFAF8D00043E
64204+:101C30008CEC0000118202A6000020218CED000037
64205+:101C400031AC01001180028A000000003C02080053
64206+:101C50008C4204743C0308008C63044C3C1F080055
64207+:101C60008FFF04703C1808008F1804480048382182
64208+:101C70000068802100E8282B03E430210208402B73
64209+:101C80000304882100C57021022878213C01080046
64210+:101C9000AC30044C3C010800AC2F04483C01080067
64211+:101CA000AC2704743C010800AC2E04708F8400182B
64212+:101CB0000120302131290007249F000833F91FFF3C
64213+:101CC00003594021AF84001CAF990018251B400028
64214+:101CD000AF590084112000038F83002024C2000725
64215+:101CE0003046FFF88F84002800C3282100A4302B41
64216+:101CF00014C00002AF83002400A428230345602100
64217+:101D0000340D8000018D10213C0F1000AF850020A4
64218+:101D1000AF820038AF450080AF4F01788F88001444
64219+:101D2000250F00010A0001EFAF8F00148F62000839
64220+:101D30008F670000240500300007760231C300F0F1
64221+:101D4000106500A7240F0040546FFF4C8F880014CB
64222+:101D50008F4B01780560FFFE0000000030CA0200D2
64223+:101D600015400003000612820000000D00061282DA
64224+:101D7000304D0003000D4900012D18210003808023
64225+:101D8000020D402100086080019380218E1F000019
64226+:101D900017E00002000000000000000D8F6E00043C
64227+:101DA00005C202BD92070006920E000592020004D1
64228+:101DB0003C090001000E18800070F8218FED00181A
64229+:101DC000277100082448000501A96021000830821D
64230+:101DD000AFEC0018022020210E00059E26050014FD
64231+:101DE000920A00068F7900043C0B7FFF000A2080D6
64232+:101DF000009178218DF800043566FFFF0326282422
64233+:101E000003053821ADE70004920E0005920D000491
64234+:101E1000960C0008000E10800051C8218F2300008E
64235+:101E2000974901043C07FFFF006758243128FFFF52
64236+:101E3000010DF82103EC50233144FFFF01643025EC
64237+:101E4000AF260000920300072418000110780275E5
64238+:101E5000240F0003106F0285000000008E050010A3
64239+:101E60002419000AA7590140A7450142921800040D
64240+:101E70008F860000240F0001A7580144A7400146A7
64241+:101E80009747010430D100023C050041A7470148B3
64242+:101E900000001821A74F014A1220000330CB000494
64243+:101EA0003C0501412403000151600005AF83000897
64244+:101EB0003C06001000A6282524030001AF8300087B
64245+:101EC000AF4510000000000000000000000000000E
64246+:101ED000000000008F8A000811400004000000008C
64247+:101EE0008F4410000481FFFE000000008F6B000093
64248+:101EF000920800043C1108008E310444AF8B0004AA
64249+:101F000097590104311800FF3C0E08008DCE0440A3
64250+:101F10003325FFFF0305382102276021000010212F
64251+:101F2000250F000A31E8FFFF0187482B01C2682115
64252+:101F300001A9F821311000073C010800AC2C044431
64253+:101F40003C010800AC3F0440120000038F8C0018D5
64254+:101F50002506000730C8FFF8010C682131BF1FFFBC
64255+:101F6000AF8C001CAF9F0018AF5F00849744010442
64256+:101F7000035F80213084FFFF308A00071140000397
64257+:101F8000261B4000248900073124FFF88F8200209F
64258+:101F90008F850028008220210085702B15C000024B
64259+:101FA000AF820024008520233C0B08008D6B048C3D
64260+:101FB0003C0A08008D4A04880344882134038000C9
64261+:101FC000022310213C0F1000AF840020AF820038A4
64262+:101FD000AF440080AF4F01780A0002968F8800144A
64263+:101FE0008F5001780600FFFE30D10200162000035A
64264+:101FF000000612820000000D00061282305F00030E
64265+:10200000001F1900007F302100062080009FC8219A
64266+:1020100000194880013380218E180000130000024F
64267+:10202000000000000000000D8F6C000C058001FB1B
64268+:102030008F870038240E0001AE0E00008CE30008EC
64269+:10204000A20000078F65000400055402314D00FF17
64270+:1020500025A80005000830822CCB00411560000245
64271+:10206000A20A00040000000D8F7800043C03FFFF6B
64272+:1020700000E02821330BFFFF256C000B000C1082C1
64273+:1020800000022080008748218D3F000026040014B4
64274+:10209000A618000803E3C8240E00059EAD39000011
64275+:1020A0008F4F01083C11100001F1382410E001AB02
64276+:1020B00000000000974D01049208000725AAFFECDC
64277+:1020C000350600023144FFFFA2060007960600080D
64278+:1020D0002CC7001354E0000592030007921100077B
64279+:1020E000362F0001A20F00079203000724180001F9
64280+:1020F000107801C224090003106901D58F880038C7
64281+:1021000030CBFFFF257100020011788331E400FF1E
64282+:1021100000042880A20F000500A848218D2D000092
64283+:10212000974A01043C0EFFFF01AEF8243143FFFF44
64284+:10213000006B1023244CFFFE03ECC825AD390000D2
64285+:10214000920600053C03FFF63462FFFF30D800FF23
64286+:102150000018388000F08821922F00143C04FF7F83
64287+:102160003487FFFF31EE000F01C65821316500FFB3
64288+:1021700000055080015068218DAC00200148F821F5
64289+:10218000A20B00060182C824AE0C000CAFF9000CB3
64290+:10219000920900068E11000C032778240009C080E4
64291+:1021A0000310702195C60026030828210227202449
64292+:1021B000AE04000CADCF0020ADC60024ACA60010CC
64293+:1021C0008F8800003C0B08008D6B048C3C0A0800D3
64294+:1021D0008D4A0488241F001024190002A75F0140C3
64295+:1021E000A7400142A7400144A7590146974901046D
64296+:1021F00024070001310600022538FFFEA7580148D8
64297+:102200003C050009A747014A10C00003000018213F
64298+:102210003C05010924030001310C00045180000534
64299+:10222000AF8300083C08001000A828252403000103
64300+:10223000AF830008AF451000000000000000000060
64301+:1022400000000000000000009205000424AE00021F
64302+:1022500031CD0007000D182330620007AE020010D8
64303+:102260008F90000812000004000000008F4F100043
64304+:1022700005E1FFFE000000008F7100008F8E001846
64305+:102280003C0308008C630444AF91000497450104AB
64306+:1022900025CF001031E61FFF30A2FFFFAF8E001CDC
64307+:1022A000AF860018AF4600842449FFFE3C0C0800AE
64308+:1022B0008D8C0440974D010401208021000947C303
64309+:1022C0000070C02131A9FFFF0310F82B0188C8213D
64310+:1022D000033F202103463821313100073C0108002B
64311+:1022E000AC3804443C010800AC2404401220000334
64312+:1022F00024FB40002527000730E9FFF88F860020E7
64313+:102300008F8400280126382100E4C02B170000022A
64314+:10231000AF86002400E438230347202134198000CD
64315+:10232000009910213C0F1000AF870020AF820038C9
64316+:10233000AF470080AF4F01780A0002968F880014E3
64317+:102340009747010410E0FDAE3C1840008F5801781B
64318+:102350000700FFFE30C5400010A000033C1F00082E
64319+:102360000000000D3C1F0008AF5F01402410080072
64320+:102370008F860000AF5001789744010430D90001E6
64321+:10238000132000ED3086FFFF24CCFFFE240D000259
64322+:10239000A74D0146A74C01488F9100182408000D55
64323+:1023A000A748014A8F630000262F000831E21FFF73
64324+:1023B0000342702130C90007AF830004AF91001CB5
64325+:1023C000AF82001800C03821AF4200841120000302
64326+:1023D00025DB400024D800073307FFF88F85002055
64327+:1023E0008F84002800E5302100C4382B14E000025F
64328+:1023F000AF85002400C430238F8400140346F821E5
64329+:10240000340C8000AF86002003EC8021AF460080B2
64330+:10241000249900013C0610003C184000AF460178AA
64331+:10242000AF900038AF990014AF5801380A000196F8
64332+:10243000000000008F630000975101043067FFFF28
64333+:102440003228FFFF8F4F017805E0FFFE30EC0007D8
64334+:10245000000CF82333F0000724F9FFFE2404000ADF
64335+:10246000A7440140A7500142A7590144A740014693
64336+:10247000A74801488F45010830B800201700000226
64337+:10248000240300092403000130CD0002A743014AC0
64338+:102490003C04004111A00003000018213C0401414C
64339+:1024A0002403000130C9000451200005AF83000857
64340+:1024B0003C0600100086202524030001AF8300089D
64341+:1024C000AF44100000000000000000000000000009
64342+:1024D000000000008F8E000811C000040000000002
64343+:1024E0008F4210000441FFFE000000008F7F0000BB
64344+:1024F000276400088F91003CAF9F0004948500087A
64345+:102500009490000A9499000C30AFFFFF0010C400B3
64346+:102510003323FFFF11F100A6030320253C0E080022
64347+:102520008DCE04443C0C08008D8C044000E88821CA
64348+:102530002626FFFE01C628210000682100A6F82BF0
64349+:10254000018D2021009F80213C010800AC2504441E
64350+:102550003C010800AC30044024E200083042FFFF98
64351+:102560003047000710E000038F830018244F000756
64352+:1025700031E2FFF83106FFFF30C800070043802139
64353+:1025800032191FFF0359C021AF83001CAF990018F7
64354+:10259000271B4000AF590084110000038F8C0020DE
64355+:1025A00024C5000730A6FFF88F84002800CC28211E
64356+:1025B00000A4F82B17E00002AF8C002400A428230D
64357+:1025C000AF850020AF4500803C0408008C840434B3
64358+:1025D00003454821340E8000012E6821108000053B
64359+:1025E000AF8D0038939100172406000E12260011BB
64360+:1025F0002407043F3C021000AF4201788F8800148A
64361+:10260000250F00010A0001EFAF8F00140E0005C472
64362+:1026100000E020218F8800143C0B08008D6B048C97
64363+:102620003C0A08008D4A0488250F00010A0001EFCA
64364+:10263000AF8F00143C021000A7470148AF42017859
64365+:102640000A0004CE8F88001424040F001184003D7A
64366+:1026500030CE002015C0000224030009240300012D
64367+:102660000A00021AA743014A0A00020DA7400146C8
64368+:1026700094EF000894F1000A94F0000C8F8C003C59
64369+:10268000001174003207FFFF31EDFFFF11AC00377E
64370+:1026900001C720253C1808008F1804443C0F08008F
64371+:1026A0008DEF0440000080210308682101A8382B29
64372+:1026B00001F0702101C760213C010800AC2D0444E9
64373+:1026C0003C010800AC2C04400A00027A8F840018F8
64374+:1026D0003C0208008C42047C3C0308008C630454D8
64375+:1026E0003C1F08008FFF04783C1808008F18045026
64376+:1026F000004838210068802100E8282B03E43021BD
64377+:102700000208402B0304882100C57021022878218B
64378+:102710003C010800AC3004543C010800AC2F0450CC
64379+:102720003C010800AC27047C3C010800AC2E047876
64380+:102730000A00027A8F840018A74001460A00043577
64381+:102740008F91001830CD002015A0FFC52403000D87
64382+:10275000240300050A00021AA743014A974E010408
64383+:1027600025C5FFF00A00038130A4FFFF8F980040C9
64384+:102770001498FFC8000010213C0508008CA5046CCB
64385+:102780003C1F08008FFF046800A8C8210328302BD5
64386+:1027900003E22021008640213C010800AC39046C92
64387+:1027A0003C010800AC2804680A00027A8F840018F3
64388+:1027B0008F8C0040148CFF5900E8C8213C18080099
64389+:1027C0008F18046C3C1108008E3104682723FFFE2B
64390+:1027D00003034821000010210123302B0222702125
64391+:1027E00001C668213C010800AC29046C3C010800CA
64392+:1027F000AC2D04680A0004A524E200088F88003884
64393+:102800003C03FFFF8D02000C0043F82403E4C825BD
64394+:10281000AD19000C0A00038F30CBFFFF0A0003C381
64395+:10282000AE000000974A0104920400048E26000CBA
64396+:10283000014458212579FFF200C7C0243325FFFF4A
64397+:1028400003053825AE27000C0A0002E68E050010AD
64398+:102850003C0DFFFF8D0A0010014D582401646025D6
64399+:10286000AD0C00100A00038F30CBFFFF974301042B
64400+:10287000920E00048E290010006E1021244DFFEEF0
64401+:102880000127602431A8FFFF0188F825AE3F001022
64402+:102890000A0002E68E0500108E0F000CAE0000004C
64403+:1028A00000078880023028210A0002B8ACAF00205F
64404+:1028B0001460000D3058FFFF3C04FFFF0044682403
64405+:1028C00001A47026000E602B000D102B004CF82484
64406+:1028D00013E00002000000000000000D8CAF0000BB
64407+:1028E0000A00025001E410253B03FFFF0003882B80
64408+:1028F0000018802B0211202410800002000000002C
64409+:102900000000000D8CB900000A0002503722FFFFC2
64410+:102910003084FFFF30A5FFFF108000070000182162
64411+:10292000308200011040000200042042006518219E
64412+:102930001480FFFB0005284003E000080060102120
64413+:1029400010C00007000000008CA2000024C6FFFF9A
64414+:1029500024A50004AC82000014C0FFFB2484000402
64415+:1029600003E000080000000010A0000824A3FFFFFF
64416+:10297000AC86000000000000000000002402FFFF01
64417+:102980002463FFFF1462FFFA2484000403E00008BC
64418+:1029900000000000308EFFFF30D8FFFF00057C00F4
64419+:1029A00001F8602539CDFFFF01AC5021014C582BB7
64420+:1029B000014B4821000944023127FFFF00E8302184
64421+:1029C0000006240230C5FFFF00A418213862FFFF73
64422+:1029D00003E000083042FFFF3C0C08008D8C0484AB
64423+:1029E000240BFF8027BDFFD001845021014B4824D8
64424+:1029F000AF4900203C0808008D080484AFB20020D5
64425+:102A0000AFB00018AFBF0028AFB30024AFB1001CB7
64426+:102A1000936600040104382130E4007F009A1021FD
64427+:102A20003C0300080043902130C500200360802152
64428+:102A30003C080111277B000814A000022646007004
64429+:102A40002646006C9213000497510104920F000473
64430+:102A50003267000F322EFFFF31ED004001C72823FF
64431+:102A600011A0000500004821925900BC3338000431
64432+:102A70001700009000000000924300BC307F00046B
64433+:102A800013E0000F0000000010A0000D0000000087
64434+:102A9000960E0002240AFF8000A7602125CDFFFECC
64435+:102AA000A74D1016920B0004014B2024308200FF2A
64436+:102AB00010400085010C40253C0F0400010F40250B
64437+:102AC0008F5301780660FFFE2404000AA7440140EA
64438+:102AD000960D00022404000931AC0007000C5823B5
64439+:102AE000316A0007A74A0142960200022443FFFE12
64440+:102AF000A7430144A7400146975F0104A75F01482F
64441+:102B00008F590108333800205300000124040001CC
64442+:102B1000920F000431EE001015C000023483001043
64443+:102B200000801821A743014A0000000000000000B7
64444+:102B30000000000000000000AF481000000000008E
64445+:102B40000000000000000000000000008F51100095
64446+:102B50000621FFFE3113FFFF12600003000000009A
64447+:102B60008F481018ACC8000096030006307FFFFFA6
64448+:102B700027F900020019988200138880023B302157
64449+:102B80008CD800001520005700183402920300046E
64450+:102B90002405FF8000A3F82433F100FF1220002C4D
64451+:102BA00000000000924700BC30F2000212400028F2
64452+:102BB00000000000974B100C2562FFFEA742101684
64453+:102BC000000000003C0A040035490030AF49100005
64454+:102BD00000000000000000000000000000000000F5
64455+:102BE0008F4C10000581FFFE000000009749100C7B
64456+:102BF0008F51101C00C020213127FFFF24F200302C
64457+:102C0000001218820003288000BBF8213226FFFF43
64458+:102C1000AFF100000E0005B300112C020013C880B4
64459+:102C2000033B98218E78000000027400AFB80010BA
64460+:102C30008FA80010310FFFFFAFAF00108FA400105E
64461+:102C400001C46825AFAD00108FA60010AE6600006D
64462+:102C500097730008976D000A9766000C8F8A003CF6
64463+:102C6000000D5C0030CCFFFF3262FFFF104A0036DF
64464+:102C7000016C2025960600023C10100024D30008A9
64465+:102C80000E00013B3264FFFF974C01040E00014926
64466+:102C90003184FFFFAF5001788FBF00288FB300242D
64467+:102CA0008FB200208FB1001C8FB0001803E0000825
64468+:102CB00027BD003010A0FF700000000024A5FFFC1D
64469+:102CC0000A0005EC240900048CD10000AF51101853
64470+:102CD0008F5301780660FF7A2404000A0A00060177
64471+:102CE0000000000000A7C8218F8800388F4E101CFC
64472+:102CF0000019C0820018788001E82021AC8E000005
64473+:102D0000000E2C0200C020210E0005B331C6FFFFCB
64474+:102D1000023B28218CAD000000025400004030210D
64475+:102D2000AFAD00108FAC0010318BFFFFAFAB0010C8
64476+:102D30008FA2001001424825AFA900108FA70010F4
64477+:102D40000A000631ACA700008F8F0040148FFFC926
64478+:102D50000000000097420104960B00023C050800A9
64479+:102D60008CA5046C3049FFFF316AFFFF3C1108005D
64480+:102D70008E310468012A382124F2FFFE00B240217E
64481+:102D80000012FFC30112C82B023FC02103192021EA
64482+:102D90003C010800AC28046C3C010800AC24046829
64483+:102DA0000A00066B0000000000A4102B1040000970
64484+:102DB000240300010005284000A4102B04A00003F8
64485+:102DC000000318405440FFFC000528401060000735
64486+:102DD000000000000085302B14C0000200031842E0
64487+:102DE000008520231460FFFB0005284203E0000853
64488+:102DF000008010218F85002C27BDFFE800053027BB
64489+:102E00002CC300012CA400020083102510400003F5
64490+:102E1000AFBF00102405007FAF85002C00052827D8
64491+:102E200030A5FFFF0E000592240426F58F830030A5
64492+:102E3000240402BD004030210083382B10E000093B
64493+:102E400024050001000420400083102B04800003AF
64494+:102E5000000528405440FFFC0004204010A000085A
64495+:102E600000C350210064402B1500000200052842D9
64496+:102E70000064182314A0FFFB0004204200C350216B
64497+:102E80008FBF0010000A4C02312200FF27BD00183E
64498+:102E9000AF8A002C03E00008AF8900300A00002A46
64499+:102EA00000000000000000000000000D7478703683
64500+:102EB0002E322E3300000000060203000000000046
64501+:102EC000000001360000EA60000000000000000081
64502+:102ED00000000000000000000000000000000000F2
64503+:102EE00000000000000000000000000000000000E2
64504+:102EF00000000000000000000000000000000016BC
64505+:102F000000000000000000000000000000000000C1
64506+:102F100000000000000000000000000000000000B1
64507+:102F200000000000000000000000000000000000A1
64508+:102F3000000000000000138800000000000005DC15
64509+:102F4000000000000000000010000003000000006E
64510+:102F50000000000D0000000D3C02080024423C204F
64511+:102F60003C03080024633DD4AC4000000043202B08
64512+:102F70001480FFFD244200043C1D080037BD7FFC87
64513+:102F800003A0F0213C100800261000A83C1C0800FB
64514+:102F9000279C3C200E0002BA000000000000000D3B
64515+:102FA0008F8300383C088000350700708CE50000F6
64516+:102FB000008330253C02900000C22025AF85003000
64517+:102FC000AF4400208F4900200520FFFE3C03800015
64518+:102FD000346200708C4500008F8600303C19080078
64519+:102FE0008F39007C3C0E08008DCE007800A620238F
64520+:102FF00003245821000078210164682B01CF60214F
64521+:10300000018D50213C010800AC2B007C3C010800E4
64522+:10301000AC2A007803E00008000000000A0000412C
64523+:10302000240400018F8400383C05800034A2000194
64524+:103030000082182503E00008AF43002003E00008E9
64525+:10304000000010213084FFFF30A5FFFF1080000733
64526+:1030500000001821308200011040000200042042CC
64527+:10306000006518211480FFFB0005284003E00008DC
64528+:103070000060102110C00007000000008CA20000BA
64529+:1030800024C6FFFF24A50004AC82000014C0FFFB8F
64530+:103090002484000403E000080000000010A00008E1
64531+:1030A00024A3FFFFAC860000000000000000000029
64532+:1030B0002402FFFF2463FFFF1462FFFA248400044C
64533+:1030C00003E0000800000000308AFFFF93A800130F
64534+:1030D000A74A014497490E1630C600FF3C02100073
64535+:1030E000A7490146AF450148A3460152A748015AE6
64536+:1030F000AF4701608FA400188FA30014A7440158A4
64537+:10310000AF43015403E00008AF42017803E0000838
64538+:10311000000000003C038000346200708C49000015
64539+:103120008F8800002484000727BDFFF83084FFF853
64540+:10313000AF890030974D008A31ACFFFFAFAC000083
64541+:103140008FAB0000016850232547FFFF30E61FFFCB
64542+:1031500000C4282B14A0FFF73C0C8000358B0070B6
64543+:103160008D6A00003C0708008CE700843C060800DC
64544+:103170008CC6008000081082014918230002788064
64545+:1031800000E370210000202101C3C82B00C4C0212E
64546+:1031900001FA4021031948212502400027BD0008FB
64547+:1031A0003C010800AC2E00843C010800AC290080E2
64548+:1031B00003E00008000000008F8200002486000762
64549+:1031C00030C5FFF800A2182130641FFF03E000089B
64550+:1031D000AF8400008F8700388F8A004027BDFFB87A
64551+:1031E0008F860044AFB60040AFBF0044AFB5003C8F
64552+:1031F000AFB40038AFB30034AFB20030AFB1002C81
64553+:10320000AFB000288F4501048D4900ACAF47008066
64554+:103210008CC8002000A938230000B021AF480E1050
64555+:103220008F440E1000004821AF440E148CC20024BD
64556+:10323000AF420E188F430E18AF430E1C10E001254D
64557+:103240002D230001936B0008116000D400000000E2
64558+:10325000976E001031CDFFFF00ED602B158000CF81
64559+:103260000000000097700010320FFFFFAF4F0E00FC
64560+:103270008F520000325100081220FFFD00000000B4
64561+:1032800097540E088F460E043285FFFF30B30001BD
64562+:1032900012600132000000000000000D30B8A040B4
64563+:1032A00024150040131500C030A9A0001120012DE5
64564+:1032B00000000000937F000813E0000800000000F9
64565+:1032C00097630010306BFFFF00CB402B1100000311
64566+:1032D00030AC00401180012300000000A785003CB5
64567+:1032E000AF8600349366000800E02821AFA70020D5
64568+:1032F00014C0012427B30020AF60000C9782003C6B
64569+:103300003047400014E00002240300162403000E9E
64570+:1033100024194007A363000AAF790014938A003E82
64571+:103320008F740014315800070018AA4002959025A8
64572+:10333000AF7200149784003C8F700014309100101D
64573+:1033400002117825AF6F0014978E003C31CD000834
64574+:1033500011A00147000028218F6700143C021000D3
64575+:103360003C0C810000E22825AF65001497460E0A48
64576+:103370002408000E3405FFFC30C3FFFF006C582505
64577+:10338000AF6B0004A3680002937F000A27E90004E2
64578+:10339000A369000A9786003C9363000A30CC1F00A3
64579+:1033A000000C598301634021251F0028A37F0009D9
64580+:1033B00097490E0CA769001093790009272A00028B
64581+:1033C000315800070018A82332B10007A371000B81
64582+:1033D00093740009976400108F910034978F003C1C
64583+:1033E000329200FF024480210205702131ED00403D
64584+:1033F00011A0000531C4FFFF0091282B3C12800072
64585+:1034000010A000140000A0210224382B14E0011B9E
64586+:103410008FA500208F4D0E14AF4D0E108F420E1C45
64587+:10342000AF420E18AF440E008F4F000031EE00087F
64588+:1034300011C0FFFD0000000097540E080080882195
64589+:1034400000009021A794003C8F500E04241400012A
64590+:10345000AF900034976400103095FFFF8E68000035
64591+:103460000111F82317E00009AE7F00008F650014FA
64592+:103470008F8B004434A60040AF6600148F4C0E10B2
64593+:10348000AD6C00208F430E18AD63002493670008D5
64594+:1034900014E000D2000000000E00009E2404001082
64595+:1034A0008F8900483C08320000402821312600FF67
64596+:1034B0000006FC0003E8502525390001AF990048BB
64597+:1034C000AC4A0000937800099370000A330400FFAF
64598+:1034D00000047400320F00FF01CF6825AC4D0004DA
64599+:1034E0008F820048064000EAACA20008ACA0000CA5
64600+:1034F0009783003C306B0008156000022628000608
64601+:1035000026280002974E0E148F450E1C8F6700046C
64602+:10351000936D000231C4FFFF31A200FFAFA2001083
64603+:103520008F6C0014AFA800180E00008BAFAC001415
64604+:10353000240400100E0000C7000000008E7200007E
64605+:1035400016400005000000008F6400142405FFBF32
64606+:1035500000859824AF7300148F79000C033538214F
64607+:10356000AF67000C9375000816A00008000000006B
64608+:1035700012800006000000008F7F00143C0BEFFF5C
64609+:103580003568FFFE03E84824AF690014A3740008FF
64610+:103590008FA500200A00024602202021AF470E001E
64611+:1035A0000A0000F5000000008F5901780720FFFE97
64612+:1035B000241F08008F840000AF5F0178974B008ABA
64613+:1035C000316AFFFF014448232528FFFF31021FFF16
64614+:1035D0002C4300081460FFF9000000008F8E0048A3
64615+:1035E0008F8D003800C048210344202125C60001EA
64616+:1035F000240C0F00AF86004800E9382324864000E1
64617+:1036000031CA00FF11AC0005240800019391003E6F
64618+:103610003230000700107A4035E80001000AAC00A3
64619+:103620003C18010002B8A025AC9440008F930048DC
64620+:1036300030B2003630A40008ACD3000410800097EC
64621+:1036400001123025974E0E0A8F8D00003C0281003A
64622+:1036500031CCFFFF25AB0008018240253C03100060
64623+:1036600031651FFF25390006241F000EAF48016099
64624+:1036700000C33025A75F015AAF850000A759015844
64625+:1036800014E0000A8F93003824120F0052720002D7
64626+:103690002416000134C600408F580E108F94004449
64627+:1036A000AE9800208F550E18AE9500248F450E144D
64628+:1036B000AF4501448F590E1CAF590148A34A01522E
64629+:1036C0003C0A1000AF460154AF4A017814E0FEDD19
64630+:1036D0002D2300010076A025128000178FBF004423
64631+:1036E0008F84003824160F0010960084000000001C
64632+:1036F0008F45017804A0FFFE24150F001095006E81
64633+:10370000000000008F470E14240202403C1F1000EE
64634+:10371000AF4701448F440E1CAF440148A3400152FF
64635+:10372000A740015AAF400160A7400158AF42015481
64636+:10373000AF5F01788FBF00448FB600408FB5003C6B
64637+:103740008FB400388FB300348FB200308FB1002CAB
64638+:103750008FB0002803E0000827BD004814C0FED049
64639+:1037600030B8A0408F420E148F84004400004821DE
64640+:10377000AC8200208F510E1CAC9100240A00020E76
64641+:103780002D2300018F910034978A003C3C12800069
64642+:103790000220A821315800401700FF300000A0216E
64643+:1037A000976900108F9200343139FFFF13320035D2
64644+:1037B00000002021008048211480FEA000A03821B4
64645+:1037C0008F420E148F840044AC8200208F510E1C57
64646+:1037D000AC9100240A00020E2D230001936A000917
64647+:1037E0009378000B315000FF330F00FF020F702160
64648+:1037F00025C2000A3050FFFF0E00009E020020216B
64649+:103800008F8600483C1F410024CD0001AF8D004849
64650+:10381000936C000930C600FF00064400318300FFAE
64651+:10382000246B0002010B4825013FC825AC5900005C
64652+:103830008F67000C97440E1400F22825AC45000455
64653+:103840008F450E1C8F670004936A00023084FFFFCF
64654+:10385000315800FFAFB800108F6F0014AFB10018DF
64655+:103860000E00008BAFAF00140A0001A60200202159
64656+:10387000AF6000040A00013EA36000020A00024695
64657+:1038800000002021000090210A0001702414000192
64658+:103890003C1280000A000195ACB2000C8F91000030
64659+:1038A00025240002A744015826300008320F1FFFCC
64660+:1038B0000A0001F9AF8F0000AF40014C1120002C2D
64661+:1038C000000000008F590E10AF5901448F430E18AD
64662+:1038D000240200403C1F1000AF430148A3400152A6
64663+:1038E000A740015AAF400160A7400158AF420154C0
64664+:1038F000AF5F01780A0002278FBF00441120000645
64665+:103900000000000097460E0830CC004015800002F1
64666+:10391000000000000000000D8F4D017805A0FFFEA3
64667+:103920000000000097530E103C120500240E2000EA
64668+:10393000326AFFFF0152C025AF58014C8F4F0E1461
64669+:103940003C021000AF4F01448F500E1CAF50014895
64670+:10395000A34001528F840038A740015AAF40016054
64671+:10396000A7400158AF4E01540A000215AF4201783A
64672+:103970008F490E14AF4901448F430E1C0A00028E7A
64673+:10398000240200403C0E20FF27BDFFE03C1A8000CF
64674+:103990003C0F800835CDFFFDAFBF001CAFB2001853
64675+:1039A000AFB10014AFB00010AF8F0040AF4D0E00AC
64676+:1039B0000000000000000000000000000000000007
64677+:1039C000000000003C0C00FF358BFFFDAF4B0E00EC
64678+:1039D0003C0660048CC95000240AFF7F3C11600043
64679+:1039E000012A40243507380CACC750008E24043817
64680+:1039F00024050009AF4500083083FFFF38622F71AE
64681+:103A00002450C0B3AF8000480E000068AF800000B3
64682+:103A100052000001AE20442C0E0004353C11800001
64683+:103A20000E000ED9363000708F8A00403C1208001C
64684+:103A300026523C88020088218E0800008F5F00001B
64685+:103A40003BF900013338000113000017AF88003044
64686+:103A5000022048218D2700003C0F08008DEF006CEC
64687+:103A60003C0C08008D8C006800E8C02301F8282178
64688+:103A70000000682100B8302B018D582101664021DB
64689+:103A80003C010800AC25006C3C010800AC28006833
64690+:103A90008F44000038830001306200011440FFEDC4
64691+:103AA00000E04021AF8700308E0C00003C0508008C
64692+:103AB0008CA5006C3C0408008C84006801883023CD
64693+:103AC00000A638210000102100E6402B00821821BA
64694+:103AD0000068F8213C010800AC27006C3C0108009C
64695+:103AE000AC3F00688F49010025590088AF99004418
64696+:103AF000AF890038AF4900208E070000AF87003043
64697+:103B00008F4D017805A0FFFE000000008E0600002A
64698+:103B10003C0B08008D6B00743C0408008C84007022
64699+:103B200000C728230165F8210000102103E5402B80
64700+:103B30000082382100E8C821240908003C0108005F
64701+:103B4000AC3F00743C010800AC390070AF4901780B
64702+:103B500093580108A398003E938F003E31EE000178
64703+:103B600015C000158F830038240E0D00106E00194B
64704+:103B7000240F0F00106F001D00000000915900007D
64705+:103B800024180050332900FF113800043C1F400066
64706+:103B9000AF5F01380A0002E7000000000E00090EC6
64707+:103BA000000000008F8A00403C1F4000AF5F0138DA
64708+:103BB0000A0002E700000000938D003E31AC0006D1
64709+:103BC000000C51000E0000CE0152D8210A00034320
64710+:103BD0008F8A00403C1B0800277B3D080E0000CE6A
64711+:103BE000000000000A0003438F8A00403C1B0800CD
64712+:103BF000277B3D280E0000CE000000000A00034392
64713+:103C00008F8A004090AA00018FAB00108CAC00108E
64714+:103C10003C0300FF8D680004AD6C00208CAD0014E7
64715+:103C200000E060213462FFFFAD6D00248CA7001816
64716+:103C30003C09FF000109C024AD6700288CAE001CC0
64717+:103C40000182C82403197825AD6F0004AD6E002CE5
64718+:103C50008CAD0008314A00FFAD6D001C94A9000234
64719+:103C60003128FFFFAD68001090A70000A56000029A
64720+:103C7000A1600004A167000090A30002306200FF71
64721+:103C80000002198210600005240500011065000E75
64722+:103C90000000000003E00008A16A00018CD80028A1
64723+:103CA000354A0080AD7800188CCF0014AD6F001439
64724+:103CB0008CCE0030AD6E00088CC4002CA16A0001CF
64725+:103CC00003E00008AD64000C8CCD001CAD6D001845
64726+:103CD0008CC90014AD6900148CC80024AD680008BC
64727+:103CE0008CC70020AD67000C8CC200148C8300646C
64728+:103CF0000043C82B13200007000000008CC20014F2
64729+:103D0000144CFFE400000000354A008003E0000886
64730+:103D1000A16A00018C8200640A000399000000007F
64731+:103D200090AA000027BDFFF88FA9001CA3AA0000DD
64732+:103D30008FAE00003C0FFF808FA8001835E2FFFF18
64733+:103D40008CCD002C01C26024AFAC0000A120000487
64734+:103D500000E06021A7A000028FB800008D270004BA
64735+:103D60000188182100A0582100C05021006D28268C
64736+:103D70003C06FF7F3C0F00FF2CAD000135EEFFFF3E
64737+:103D800034D9FFFF3C02FF0003193024000D1DC091
64738+:103D9000010EC82400E2C02400C370250319782551
64739+:103DA000AD2E0000AD2F00048D450024AFAE000005
64740+:103DB000AD2500088D4D00202405FFFFAD2D000C22
64741+:103DC000956800023107FFFFAD27001091660018CB
64742+:103DD00030C200FF000219C2506000018D4500345E
64743+:103DE000AD2500148D67000827BD0008AD27001C15
64744+:103DF0008C8B00CCAD2C0028AD20002CAD2B0024EA
64745+:103E0000AD20001803E00008AD20002027BDFFE032
64746+:103E1000AFB20018AFB10014AFB00010AFBF001CBC
64747+:103E20009098000000C088213C0D00FF330F007FF8
64748+:103E3000A0CF0000908E000135ACFFFF3C0AFF00D0
64749+:103E4000A0CE000194A6001EA22000048CAB00149A
64750+:103E50008E29000400A08021016C2824012A40241E
64751+:103E60000080902101052025A6260002AE24000432
64752+:103E700026050020262400080E00007624060002F5
64753+:103E800092470000260500282624001400071E0083
64754+:103E90000003160324060004044000032403FFFF6C
64755+:103EA000965900023323FFFF0E000076AE23001068
64756+:103EB000262400248FBF001C8FB200188FB100147D
64757+:103EC0008FB0001024050003000030210A0000809C
64758+:103ED00027BD002027BDFFD8AFB1001CAFB0001830
64759+:103EE000AFBF002090A80000240200018FB0003C6A
64760+:103EF0003103003F00808821106200148FAA00382F
64761+:103F0000240B0005506B0016AFAA001000A0202162
64762+:103F100000C028210E0003DC02003021922400BCE6
64763+:103F2000308300021060000326060030ACC00000A1
64764+:103F300024C600048FBF00208FB1001C8FB0001872
64765+:103F400000C0102103E0000827BD002801403821EF
64766+:103F50000E00035AAFB000100A0004200000000059
64767+:103F60000E0003A1AFB000140A00042000000000FE
64768+:103F70003C02000A034218213C04080024843D6CE2
64769+:103F80002405001A000030210A000080AF8300548D
64770+:103F90003C038000346200708C48000000A058216F
64771+:103FA00000C04821308A00FFAF8800308F4401787C
64772+:103FB0000480FFFE3C0C8000358600708CC500003C
64773+:103FC0003C0308008C6300743C1808008F180070D4
64774+:103FD00000A82023006468210000C82101A4782BD8
64775+:103FE0000319702101CF60213C010800AC2D007441
64776+:103FF0003C010800AC2C00708F480E14AF480144FF
64777+:10400000AF47014CA34A0152A74B01589346010800
64778+:1040100030C5000854A0000135291000934B090059
64779+:1040200024070050316A00FF11470007000000001C
64780+:104030008F450E1CAF450148AF4901543C091000A3
64781+:1040400003E00008AF490178934D010831A800084A
64782+:104050001100001000000000934F010831EE001025
64783+:1040600051C00001352900083C04080090843DD06F
64784+:10407000A34401508F4309A4AF4301488F4209A0D4
64785+:10408000AF420144AF4901543C09100003E000086D
64786+:10409000AF4901783C1908008F393D8C333800084E
64787+:1040A0005700FFF1352900080A00047300000000E2
64788+:1040B00024070040AF470814AF4008108F4209445E
64789+:1040C0008F4309508F4409548F45095C8F46094C32
64790+:1040D000AF820064AF830050AF84004CAF85005CBA
64791+:1040E00003E00008AF8600609346010930C5007FF9
64792+:1040F000000518C0000521400083102103E00008DE
64793+:10410000244200883C09080091293D9124A800021E
64794+:104110003C05110000093C0000E8302500C51825C9
64795+:1041200024820008AC83000003E00008AC80000497
64796+:104130009347010B8F4A002C974F09083C18000E3B
64797+:104140000358482131EEFFFF000E41C0AF48002C5C
64798+:1041500097430908952C001A008040212403000190
64799+:10416000318BFFFFAC8B00008D2D001C00A058216F
64800+:1041700000C06021AC8D00048D24002030E7004099
64801+:10418000AD04000891220019304400031083004858
64802+:104190002885000214A00062240600021086005642
64803+:1041A00024190003109900660000000010E0003A96
64804+:1041B000000000003C07080094E73D8624E200016F
64805+:1041C000934F0934934709219525002A31EE00FFCA
64806+:1041D000000E488230ED00FF978700580009360036
64807+:1041E000000D1C003044FFFF00C310250044C02513
64808+:1041F00000A778213C19400003197025000F4C00DE
64809+:10420000AD090004AD0E0000934D09203C030006EB
64810+:1042100025090014000D360000C32025AD04000858
64811+:104220008F59092C24E5000130A27FFFAD19000C45
64812+:104230008F580930A782005825020028AD180010B9
64813+:104240008F4F0938AD0F0014AD2B00048F4E09407D
64814+:10425000AD2E0008934D09373C05080090A53D9010
64815+:104260008F4409488F46094031A700FF00EC182110
64816+:10427000008678230003C7000005CC0003196025E1
64817+:1042800031E8FFFC01885825AD2B000CAD20001053
64818+:1042900003E00008AF4A002C3C0D080095AD3D86B8
64819+:1042A0003C0E080095CE3D800A0004C901AE1021E5
64820+:1042B0003C05080094A53D8A3C06080094C63D8054
64821+:1042C0003C18080097183D7C952E002400A6782104
64822+:1042D00001F86823000E240025A2FFF200821825B1
64823+:1042E00024190800AD03000CAD190014AD00001036
64824+:1042F0000A0004C4250800189526002495250028E6
64825+:104300000006C40000057C00370E810035ED080072
64826+:10431000AD0E000CAD0D00100A0004C425080014F9
64827+:104320001480FFA200000000952400240004140063
64828+:1043300034430800AD03000C0A0004C42508001033
64829+:104340003C03080094633D8A3C05080094A53D8029
64830+:104350003C06080094C63D7C953900249538002819
64831+:10436000006520210086782300196C000018740075
64832+:1043700025E2FFEE01C2202535A3810024190800A3
64833+:10438000AD03000CAD040010AD190018AD00001411
64834+:104390000A0004C42508001C03E00008240201F4FC
64835+:1043A00027BDFFE8AFB00010AFBF00140E000060E3
64836+:1043B0000080802124050040AF4508148F83005001
64837+:1043C0008F84004C8F85005C0070182100641023DE
64838+:1043D00018400004AF830050AF6300548F66005450
64839+:1043E000AF86004C1200000C000000008F440074E7
64840+:1043F000936800813409FA002D07000710E00005DA
64841+:1044000000891021936C0081240B01F4018B50046E
64842+:1044100001441021AF62000C8F4E095C01C5682376
64843+:1044200019A000048FBF00148F4F095CAF8F005C90
64844+:104430008FBF00148FB000100A00006227BD001863
64845+:104440008F8400648F8300508F82004CAF640044DF
64846+:10445000AF63005003E00008AF6200543C038000EB
64847+:10446000346200708C43000027BDFFF8308700FFE6
64848+:1044700030A900FF30C800FFAF8300308F440178BF
64849+:104480000480FFFE3C028000345900708F38000029
64850+:10449000A3A700033C0708008CE700748FAC000062
64851+:1044A0003C0608008CC60070030378233C0E7FFF97
64852+:1044B00000EFC82135CDFFFF00005021018D2824D9
64853+:1044C00000CA1821000847C0032F202B00A8102580
64854+:1044D0000064C021AFA200003C010800AC390074A8
64855+:1044E0003C010800AC380070934F010AA3A0000201
64856+:1044F0003C0E80FFA3AF00018FAC0000312B007F8A
64857+:1045000035CDFFFF018D4824000B5600012A4025C0
64858+:10451000240730002406FF803C05100027BD00085A
64859+:10452000AF48014CAF470154A7400158A346015280
64860+:1045300003E00008AF45017827BDFFE8AFBF0014D6
64861+:10454000AFB000108F6500743C068000309000FF13
64862+:1045500000A620250E000060AF6400749363000580
64863+:10456000346200080E000062A362000502002021F0
64864+:104570008FBF00148FB00010240500052406000131
64865+:104580000A00057027BD001827BDFFE03C0380002E
64866+:10459000AFB00010AFBF0018AFB1001434620070AC
64867+:1045A0008C470000309000FF30A800FFAF8700303C
64868+:1045B0008F4401780480FFFE3C18800037110070A2
64869+:1045C0008E2F00003C0D08008DAD00743C0A0800E1
64870+:1045D0008D4A007001E7702301AE282100005821A8
64871+:1045E00000AE302B014B4821012638213C01080048
64872+:1045F000AC250074000088213C010800AC27007045
64873+:104600001100000F000000008F6200742619FFFFE8
64874+:104610003208007F0002FE0233E5007F150000062D
64875+:10462000332200FF2407FF800207202624A3FFFF78
64876+:1046300000838025320200FF0040802124111008F1
64877+:104640000E000060000000008F49081831250004AA
64878+:1046500014A0FFFD3218007F001878C000187140C8
64879+:1046600001CF682125AC0088AF4C0818274A098083
64880+:104670008D4B0020AF4B01448D460024AF460148CE
64881+:10468000A35001500E000062A740015802201021E3
64882+:104690008FBF00188FB100148FB0001003E0000826
64883+:1046A00027BD002027BDFFE8308400FFAFBF00100A
64884+:1046B0000E0005BB30A500FF8F8300508FBF001098
64885+:1046C000344500402404FF903C02100027BD001830
64886+:1046D000AF43014CA3440152AF45015403E000082D
64887+:1046E000AF4201789343093E306200081040000D4C
64888+:1046F0003C0901013528080AAC8800008F47007486
64889+:10470000AC8700043C06080090C63D9030C5001000
64890+:1047100050A00006AC8000088F6A0060AC8A0008D8
64891+:104720002484000C03E00008008010210A00062207
64892+:104730002484000C27BDFFE8AFBF0014AFB0001009
64893+:104740009346093F00A050210005288000853823AA
64894+:1047500030C200FF240300063C09080095293D866D
64895+:1047600024E8FFD824050004104300372406000283
64896+:104770009750093C3C0F020400063400320EFFFF44
64897+:1047800001CF6825AC8D0000934C093E318B002091
64898+:104790001160000800000000934309363C02010349
64899+:1047A000345F0300307900FF033FC0252405000873
64900+:1047B000AC98000493430934935909210005F88209
64901+:1047C000306200FF0002C082332F00FF00186E002D
64902+:1047D000000F740001AE6025018920253C094000CE
64903+:1047E00000898025ACF0FFD8934309378F4F0948E3
64904+:1047F0008F580940306200FF004AC821033F7021F2
64905+:1048000001F86023000E6F0001A650253185FFFCE2
64906+:10481000001F58800145482501683821AD09002056
64907+:104820000E00006024F00028240400040E00006242
64908+:10483000A364003F020010218FBF00148FB000104E
64909+:1048400003E0000827BD00180A0006352406001200
64910+:1048500027BDFFD024090010AFB60028AFB5002453
64911+:10486000AFB40020AFB10014AFB000103C0108009D
64912+:10487000A0293D90AFBF002CAFB3001CAFB2001811
64913+:1048800097480908309400FF3C02000E3107FFFFF3
64914+:10489000000731C0AF46002C974409089344010B30
64915+:1048A00030B500FF03428021308300300000B0218A
64916+:1048B0001060012500008821240C00043C01080040
64917+:1048C000A02C3D90934B093E000B5600000A2E038E
64918+:1048D00004A0016000000000AF400048934F010BAE
64919+:1048E00031EE002011C00006000000009358093E80
64920+:1048F00000189E0000139603064001890000000086
64921+:104900009344010B30830040106000038F930050EC
64922+:104910008F8200502453FFFF9347093E30E6000882
64923+:1049200014C0000224120003000090219619002CEC
64924+:1049300093580934934F0937A7990058330C00FF57
64925+:1049400031EE00FF024E6821000D5880016C5021AD
64926+:10495000015140213C010800A4283D869205001821
64927+:1049600030A900FF010918213C010800A4233D885B
64928+:104970009211001816200002000000000000000D37
64929+:104980003C010800A4233D8A3C010800A4203D808E
64930+:104990003C010800A4203D7C935F010B3063FFFFC6
64931+:1049A00033F00040120000022464000A2464000B6B
64932+:1049B0003091FFFF0E00009E022020219358010B32
64933+:1049C0003C08080095083D8A0040202100185982C3
64934+:1049D000316700010E00049A01072821934C010B56
64935+:1049E0008F4B002C974E09083C0F000E034F4021BF
64936+:1049F00031CDFFFF000D51C0AF4A002C974309088D
64937+:104A00009505001A004038212404000130A9FFFF59
64938+:104A1000AC4900008D06001C00404821318A00404E
64939+:104A2000AC4600048D020020ACE20008910300199E
64940+:104A300030630003106400EC28790002172001188D
64941+:104A4000241000021070010C241F0003107F011EAF
64942+:104A500000000000114000DE000000003C090800DA
64943+:104A600095293D8625220001935F0934934E092143
64944+:104A70009504002A33F900FF0019C08231CF00FFEE
64945+:104A8000978E005800184600000F6C00010D80251D
64946+:104A90003045FFFF02051025008E50213C034000E9
64947+:104AA00000433025000A6400ACEC0004ACE60000D2
64948+:104AB000935F09203C19000624EC0014001FC60077
64949+:104AC00003197825ACEF00088F48092C25CD00018B
64950+:104AD00031A57FFFACE8000C8F500930A785005846
64951+:104AE00024E80028ACF000108F4409380100802130
64952+:104AF000ACE40014AD9300048F530940AD9300085B
64953+:104B0000934A09373C19080093393D908F4309486F
64954+:104B10008F460940314200FF0052F82100667023A1
64955+:104B2000001F7F000019C40001F8282531CDFFFCCB
64956+:104B300000AD2025AD84000CAD800010AF4B002CE3
64957+:104B4000934B093E317300081260000D3C060101D1
64958+:104B500034CC080AACEC00288F530074AD13000469
64959+:104B60003C0B0800916B3D903167001050E0000352
64960+:104B7000AD0000088F6A0060AD0A00082510000C27
64961+:104B800012C0003D000000009343093F24160006B8
64962+:104B900024060004306200FF105600C924070002FA
64963+:104BA0009758093C3C0F0204330DFFFF01AF40252D
64964+:104BB000AE0800009345093E30A400201080000894
64965+:104BC00000000000935309363C0B0103357F0300BE
64966+:104BD000327900FF033F7025AE0E00042406000862
64967+:104BE000934F093493480921312AFFFF31ED00FF2B
64968+:104BF000000D1082310300FF0002B60000032C00FC
64969+:104C000002C56025018A9825001220803C094000D9
64970+:104C10000204502302695825AD4BFFD8935F093732
64971+:104C20008F4F09488F58094033F900FF0332702134
64972+:104C30000006B08201D668210007440001F828234D
64973+:104C4000000D1F000068302530A2FFFC2547FFD86B
64974+:104C500000C260250016808002074821ACEC0020CD
64975+:104C6000253000280E00006024120004A372003FCB
64976+:104C70000E000062000000009347010B30F200407C
64977+:104C8000124000053C1900FF8E180000372EFFFF70
64978+:104C9000030E3024AE0600000E0000C702202021C3
64979+:104CA0003C10080092103D90321100031220000FBA
64980+:104CB00002A028218F89005025330001AF930050B6
64981+:104CC000AF7300508F6B00540173F8231BE0000298
64982+:104CD000026020218F640054AF6400548F4C007434
64983+:104CE000258401F4AF64000C02A028210280202159
64984+:104CF000A76000680E0005BB3C1410008F850050B3
64985+:104D000034550006AF45014C8F8A00488FBF002CF8
64986+:104D10008FB3001C25560001AF9600488FB20018D3
64987+:104D2000A34A01528FB60028AF5501548FB1001429
64988+:104D3000AF5401788FB500248FB400208FB00010DD
64989+:104D400003E0000827BD00309358093E00189E007C
64990+:104D500000139603064200362411000293440923EF
64991+:104D6000308300021060FEDD8F8600608F8200506D
64992+:104D700014C2FEDA000000000E0000600000000017
64993+:104D80009369003F24070016312800FF1107000C2B
64994+:104D9000240500083C0C0800918C3D90358B0001E7
64995+:104DA0003C010800A02B3D90936A003F314300FF77
64996+:104DB00010650065240D000A106D005E2402000CD1
64997+:104DC0000E000062000000000A00069000000000D3
64998+:104DD0003C09080095293D863C0A0800954A3D801B
64999+:104DE0000A0006F3012A10213C09080095293D8A92
65000+:104DF0003C04080094843D803C06080094C63D7C39
65001+:104E000095030024012410210046F8230003CC0060
65002+:104E100027F0FFF20330C025240F0800ACF8000C87
65003+:104E2000ACEF0014ACE000100A0006EE24E7001816
65004+:104E30003C010800A0313D90935F093E241600011B
65005+:104E400033F900201720FEA5241100080A0006905F
65006+:104E5000241100048F6E00848F4D094011A0FE9E26
65007+:104E6000AF8E0050240F00143C010800A02F3D908D
65008+:104E70000A00068F00000000950E0024950D002802
65009+:104E8000000E6400000D2C003589810034A6080056
65010+:104E9000ACE9000CACE600100A0006EE24E70014B2
65011+:104EA0001460FEEC000000009502002400021C00CB
65012+:104EB00034640800ACE4000C0A0006EE24E700109D
65013+:104EC0000A000741240700123C02080094423D8A70
65014+:104ED0003C06080094C63D803C03080094633D7C7A
65015+:104EE00095100024951900280046F82103E3C023FB
65016+:104EF00000106C0000197400270FFFEE01CF282569
65017+:104F000035AC8100ACEC000CACE5001024070800C7
65018+:104F1000AD2700182527001C0A0006EEAD2000145E
65019+:104F20008F7F004CAF7F00548F7900540A000699A0
65020+:104F3000AF790050A362003F0E0000620000000045
65021+:104F40000A00069000000000240200140A0008274E
65022+:104F5000A362003F27BDFFE8308400FFAFBF001011
65023+:104F60000E0005BB30A500FF9378007E9379007F8B
65024+:104F7000936E00809368007A332F00FF001866005C
65025+:104F8000000F6C0031CB00FF018D4825000B520053
65026+:104F90008FBF0010012A3825310600FF344470000D
65027+:104FA00000E628252402FF813C03100027BD0018DD
65028+:104FB000AF45014CAF440154A342015203E0000845
65029+:104FC000AF43017827BDFFD8AFB20018AFB10014CE
65030+:104FD000AFB00010AFBF0020AFB3001C9342010977
65031+:104FE000308600FF30B000FF000618C23204000215
65032+:104FF0003071000114800005305200FF93670005F6
65033+:1050000030E5000810A0000D30C80010024020213B
65034+:105010000E0005A702202821240400018FBF0020D4
65035+:105020008FB3001C8FB200188FB100148FB0001026
65036+:105030000080102103E0000827BD00281500003281
65037+:105040000000000093430109000028213062007F26
65038+:10505000000220C00002F94003E49821267900886C
65039+:10506000033B98218E7800248E6F0008130F0046B2
65040+:10507000000000008F640084241800020004FD82F8
65041+:1050800033F900031338007C0000000093660083AE
65042+:10509000934A0109514600043205007C10A00060CB
65043+:1050A000000000003205007C14A0005302402021C3
65044+:1050B00016200006320400018E7F00248F5901045F
65045+:1050C00017F9FFD600002021320400011080000AE9
65046+:1050D000024020218F4209408F9300641053000644
65047+:1050E000000000000E00066D022028218F430940B9
65048+:1050F000AF630044024020210E0006020220282156
65049+:105100000A000860240400013C0908008D2900649D
65050+:10511000252600013C010800AC26006416000012A0
65051+:10512000000000008F6D00843C0E00C001AE6024C2
65052+:1051300015800005024020210E00082E02202821A3
65053+:105140000A00086024040001240500040E00057014
65054+:1051500024060001024020210E00082E02202821F2
65055+:105160000A000860240400010E000041240400012C
65056+:10517000936B007D020B50250E000062A36A007D38
65057+:105180000A0008A38F6D00848F6600748F480104A5
65058+:105190008E67002400064E021507FFB63126007FF9
65059+:1051A000936B008326440001308A007F1146004340
65060+:1051B000316300FF5464FFB08F6400842645000112
65061+:1051C00030B1007F30A200FF122600042405000148
65062+:1051D000004090210A00087624110001240FFF806E
65063+:1051E000024F702401CF9026324200FF00409021F0
65064+:1051F0000A000876241100010E00066D0220282105
65065+:10520000321800301300FFAA321000820240202121
65066+:105210000E0005A7022028210A00086024040001CE
65067+:105220008F6E00743C0F80002405000301CF902591
65068+:10523000AF72007493710083240600010E000570A4
65069+:10524000322400FF0E00004124040001936D007D14
65070+:10525000020D60250E000062A36C007D3C0B08006F
65071+:105260008D6B0054257000013C010800AC300054E7
65072+:105270000A000860240400018F6800743C09800063
65073+:105280002405000401093825AF6700749363008387
65074+:10529000240600010E000570306400FF0E0000417E
65075+:1052A000240400019362007D020298250E00006232
65076+:1052B000A373007D0A00086024040001324D0080C1
65077+:1052C00039AC0080546CFF6C8F6400840A0008C9FC
65078+:1052D0002645000127BDFFC83C0A0008AFBF0030CB
65079+:1052E000AFB5002CAFB40028AFB30024AFB200209C
65080+:1052F000AFB1001CAFB00018034AD8212409004008
65081+:10530000AF490814AF4008108F4209448F43095039
65082+:105310008F4609548F47095C8F48094C9344010814
65083+:105320009345010BAF820064308400FF30A500FF7D
65084+:10533000AF830050AF86004CAF87005C0E00084A78
65085+:10534000AF8800601440017D8FBF0030A760006807
65086+:10535000934D0900240B00503C15080026B53D482C
65087+:1053600031AC00FF3C12080026523D58118B00035F
65088+:10537000000000000000A8210000902193510109C5
65089+:105380008F9F005024040010322E007F000E68C052
65090+:10539000000E6140018D282124B40088AF54081804
65091+:1053A0008F4901048F4A09A43C0B000E034BC02116
65092+:1053B000012A10233C010800AC223D6C8F430958A0
65093+:1053C0003C010800A0243D9097470908007F302346
65094+:1053D0003C010800AC263D7030E8FFFF0008C9C062
65095+:1053E0003C010800AC3F3D94AF59002C974209089E
65096+:1053F0009710002C8EB10000930F001803749821B1
65097+:10540000A7900058AF9300440220F80931F000FF44
65098+:10541000304E000215C001B2304F000111E0014FC3
65099+:10542000000000009343093E3066000814C00002EB
65100+:10543000241400030000A0218F5809A424130001A4
65101+:105440003C010800AC383D98934F0934935109371B
65102+:1054500031EC00FF322E00FF028E6821000D288003
65103+:1054600000AC5021015058213C010800A42B3D887C
65104+:105470003C010800A42A3D8693490934312200FFEB
65105+:1054800002022021249000103C010800A4303D8439
65106+:10549000240700068F9F00503C010800AC273D8C7C
65107+:1054A0008F88005C8F59095800008021011F282334
65108+:1054B00004A00149033F20230480014700A4302BAE
65109+:1054C00010C00149000000003C010800AC253D70FF
65110+:1054D0008E4200000040F809000000003043000246
65111+:1054E000146000F80040882130440001548000100E
65112+:1054F0008E4200043C0908008D293D743C0AC0001E
65113+:10550000012A8025AF500E008F45000030AB000807
65114+:105510001160FFFD00000000974D0E0824100001EF
65115+:10552000A78D003C8F4C0E04AF8C00348E420004DB
65116+:105530000040F8090000000002228825322E0002F7
65117+:1055400015C00180000000003C09080095293D7C41
65118+:105550003C06080094C63D883C0A0800954A3D7EFA
65119+:105560003C1908008F393D74012660213C18080061
65120+:105570008F183D983C03080094633D92018A2021D6
65121+:105580008F4E09400329F821248F000203E32821CC
65122+:10559000031968213C010800A42C3D8AAF8E0064E9
65123+:1055A0003C010800AC2D3D983C010800A4253D803D
65124+:1055B0000E00009E31E4FFFF8F870048004020214D
65125+:1055C0003C010800A0273D918E42000824E800011C
65126+:1055D000AF8800480040F809000000009344010B28
65127+:1055E0008F4C002C974A09083C0B000E034B4021BE
65128+:1055F0003149FFFF000919C08F8B0050AF43002CC9
65129+:10560000974309089506001A00403821308A004067
65130+:1056100030DFFFFFAC5F00008D19001C0040482107
65131+:10562000AC5900048D180020AC580008910F0019E7
65132+:1056300031E30003107300F0000000002862000254
65133+:105640001440010924050002106500FD240D00032B
65134+:10565000106D010D00000000114000D90000000095
65135+:105660003C0A0800954A3D8625420001934D0934C5
65136+:1056700093580921950E002A31A300FF00032082D0
65137+:10568000331F00FF9798005800047E00001FCC00D5
65138+:1056900001F940253049FFFF0109102501D83021CB
65139+:1056A0003C0540000045502500066C00ACED0004B0
65140+:1056B000ACEA0000934309203C04000624ED0014EA
65141+:1056C0000003FE0003E4C825ACF900088F49092C4B
65142+:1056D000270F000131EE7FFFACE9000C8F48093045
65143+:1056E000A78E005824E90028ACE800108F4509383F
65144+:1056F00001204021ACE50014ADAB00048F4209400D
65145+:10570000ADA20008934B09373C1F080093FF3D9062
65146+:105710008F4309488F4A0940316600FF00D4202199
65147+:10572000006A78230004C700001FCC000319282555
65148+:1057300031EEFFFC00AE1025ADA2000CADA00010B4
65149+:10574000AF4C002C934C093E318B00085160000F88
65150+:105750008E58000C3C06010134CA080AACEA002845
65151+:105760008F4B0074AD2B00043C0C0800918C3D90D5
65152+:105770003187001050E00003AD2000088F62006008
65153+:10578000AD2200082528000C8E58000C0300F809F3
65154+:10579000010020213C19080097393D8A3C1F080070
65155+:1057A00097FF3D7E033F782125E900020E0000C7E8
65156+:1057B0003124FFFF3C0E08008DCE3D6C3C080800F4
65157+:1057C0008D083D7401C828233C010800AC253D6CC0
65158+:1057D00014A00006000000003C0308008C633D8C10
65159+:1057E000346400403C010800AC243D8C1200007081
65160+:1057F0008F8C00448F470E108F900044AE0700201E
65161+:105800008F4D0E18AE0D00243C10080096103D8000
65162+:105810000E0000600000000024020040AF420814A7
65163+:105820008F8600508F8A004C00D01821006A5823C0
65164+:1058300019600004AF830050AF6300548F650054BB
65165+:10584000AF85004C1200000C000000008F44007473
65166+:10585000936800813409FA002D0E000711C000057D
65167+:1058600000891821937F0081241901F403F9780439
65168+:1058700001E41821AF63000C8F44095C8F83005C46
65169+:105880000083C0231B000003000000008F50095C50
65170+:10589000AF90005C0E000062000000008F8C005092
65171+:1058A0008E4700103C010800AC2C3D9400E0F80944
65172+:1058B000000000003C0D08008DAD3D6C55A0FEF5CC
65173+:1058C000240700068F450024975909088F8B006430
65174+:1058D0008F9400503C0F001F978200588F86005411
65175+:1058E0008F93004C3328FFFF35E9FF8000A9502437
65176+:1058F000000871C032320100AF4E0024A4C2002C57
65177+:10590000AF4A0024AF6B0044AF740050AF73005433
65178+:105910001640008032380010570000868EA4000424
65179+:10592000322300405460001B8EB100088EB0000C82
65180+:105930000200F809000000008FBF00308FB5002C76
65181+:105940008FB400288FB300248FB200208FB1001CC9
65182+:105950008FB0001803E0000827BD00389347010905
65183+:105960008F8800380007FE0003E8C825AF59008083
65184+:105970008F5809A08F5309A4AFB80010AF580E1468
65185+:105980008FB40010AF540E10AF530E1C0A00096202
65186+:10599000AF530E180220F809000000008EB0000C72
65187+:1059A0000200F809000000000A000AA88FBF0030BA
65188+:1059B000A5800020A59300220A000A5BAD93002475
65189+:1059C0003C09080095293D863C06080094C63D80A8
65190+:1059D0000A0009F4012610213C010800AC203D70AA
65191+:1059E0000A00098E8E4200003C010800AC243D7084
65192+:1059F0000A00098E8E4200003C03080094633D8A31
65193+:105A00003C04080094843D803C1F080097FF3D7CC7
65194+:105A1000951800240064C821033F782300186C0007
65195+:105A200025EEFFF201AE2825AC45000C240208004B
65196+:105A3000ACE20014ACE000100A0009EF24E7001803
65197+:105A400095060024950900280006240000091C0082
65198+:105A5000349F810034790800ACFF000CACF90010D1
65199+:105A60000A0009EF24E700141460FEFB00000000A8
65200+:105A70009518002400187C0035EE0800ACEE000CF0
65201+:105A80000A0009EF24E700103C07080094E73D8076
65202+:105A90003C04080094843D8A3C03080094633D7CE8
65203+:105AA00095190024951800280087F82103E378232E
65204+:105AB0002407080000192C0000186C0025EEFFEEEA
65205+:105AC00001AE302534A28100AD2700182527001C27
65206+:105AD000AD22000CAD2600100A0009EFAD20001425
65207+:105AE00093520109000028210E000602324400FFF3
65208+:105AF0008FBF00308FB5002C8FB400288FB30024E7
65209+:105B00008FB200208FB1001C8FB0001803E0000896
65210+:105B100027BD0038935F010933E400FF0E00066DD6
65211+:105B200000002821323800105300FF7E322300404D
65212+:105B30008EA400040080F809000000000A000AA2F8
65213+:105B4000322300401200FF5F000000008F540E144B
65214+:105B50008F920044AE5400208F530E1C0A000A8A14
65215+:105B6000AE5300248F82001C008040213C040100C1
65216+:105B70009047008530E3002010600009000000001D
65217+:105B80003C0708008CE73D948F83001800E3202336
65218+:105B9000048000089389000414E30003010020211D
65219+:105BA00003E00008008010213C04010003E000082D
65220+:105BB000008010211120000B006738238F8C0020FB
65221+:105BC00024090034918B00BC316A0002514000016D
65222+:105BD0002409003000E9682B15A0FFF10100202105
65223+:105BE00000E938232419FFFC00B9C02400F9782407
65224+:105BF00000F8702B15C0FFEA01E8202130C2000335
65225+:105C00000002182314C00012306900030000302184
65226+:105C100000A9702101C6682100ED602B1180FFE012
65227+:105C20003C0401002D2F00010006482B01053821FE
65228+:105C300001E9302414C0FFDA24E4FFFC2419FFFC3E
65229+:105C400000B9C0240308202103E0000800801021CF
65230+:105C50008F8B002024060004916A00BC31440004AC
65231+:105C60001480FFEC00A970210A000B5E00003021B7
65232+:105C700027BDFFE8AFBF00108F460100934A01091E
65233+:105C80003C1F08008FFF00902407FF80314F00FF6A
65234+:105C900031E8007F0008614003E6C821032CC021E1
65235+:105CA00027090120012770243C010800A02F3DD0C6
65236+:105CB000AF4E080C3C0D08008DAD00903C040080F8
65237+:105CC0003482000301A65821016C182124650120AB
65238+:105CD00030AA007801424025AF48081C3C1F08004C
65239+:105CE0008FFF00908F88004003E6C0213319000722
65240+:105CF00003074824033A7821AF49002825E909C061
65241+:105D0000952E00023C0D08008DAD008C3C0A080069
65242+:105D10008D4A009031CC3FFF01A61821000C59801C
65243+:105D2000006B282100A72024AF44002C95220002FC
65244+:105D30003C1F08008FFF008C9107008530593FFF02
65245+:105D400003E678210019C1800146702101F868211D
65246+:105D500031CC007F31AB007F019A2821017A50219C
65247+:105D60003C03000C3C04000E00A328210144102138
65248+:105D700030E6002027470980AF82002CAF88001C46
65249+:105D8000AF890024AF85002010C00006AF8700282F
65250+:105D90008D0200508CA4010C0044302318C0007701
65251+:105DA00000000000910C0085240DFFDF018D3824D8
65252+:105DB000A10700858F8B001C8F8900248F87002806
65253+:105DC0008D65004CAF850018912F000D31EE00203D
65254+:105DD00011C000170000000024090001A38900047D
65255+:105DE000AF80000C8CE400248F85000C240A00088E
65256+:105DF000AF800008AF8000103C010800A42A3D7E5F
65257+:105E00003C010800A4203D920E000B32000030211E
65258+:105E10008F8500248FBF0010AF82001490A8000D62
65259+:105E200027BD00180008394203E0000830E20001F5
65260+:105E3000913F00022418000133F900FF001921826C
65261+:105E400010980039240800021088005B8F86002C0F
65262+:105E50008CE5002414A0001B8F9F002091220000DD
65263+:105E6000240A00053046003F10CA00472404000100
65264+:105E70008F860008A3840004AF860010AF86000C54
65265+:105E80008CE400248F85000C240A00083C010800E3
65266+:105E9000A42A3D7E3C010800A4203D920E000B3256
65267+:105EA000000000008F8500248FBF0010AF82001417
65268+:105EB00090A8000D27BD00180008394203E0000833
65269+:105EC00030E200018CF800088CF900248FEE00C449
65270+:105ED000A38000048CE40024AF8E000C8F85000C9E
65271+:105EE0008F86000803197823240A0008AF8F00105A
65272+:105EF0003C010800A42A3D7E3C010800A4203D92FC
65273+:105F00000E000B32000000008F8500248FBF0010B0
65274+:105F1000AF82001490A8000D27BD00180008394278
65275+:105F200003E0000830E20001912300003062003FEE
65276+:105F3000104400278F8500208CE400241480002169
65277+:105F4000000000008D2E00183C187FFF8F85002078
65278+:105F5000370FFFFF01CF1824AF8300088F9F000881
65279+:105F60008CA8008403E8C82B1720000203E020213E
65280+:105F70008CA400840A000BEDAF8400088CA3010CF4
65281+:105F80000A000BCBAF8300188D2C00188F860008F9
65282+:105F90003C0D7FFF8F89002035A3FFFF018358242C
65283+:105FA00024040001AF8B0010AD2000CCA3840004BA
65284+:105FB0000A000BF9AF86000C8CCA00140A000BED26
65285+:105FC000AF8A00088CA300C80A000C30AF83000819
65286+:105FD0008F84002C8CAC00648C8D0014018D582BA8
65287+:105FE00011600004000000008CA200640A000C3064
65288+:105FF000AF8200088C8200140A000C30AF820008C7
65289+:106000008F85000C27BDFFE0AFBF0018AFB10014B3
65290+:1060100014A00007AFB000108F86002424020005F2
65291+:1060200090C400003083003F106200B68F840020CF
65292+:106030008F91000800A080218F8C00283C0508006B
65293+:106040008CA53D708D8B000431663FFF00C5502B41
65294+:106050005540000100C02821938D000411A0007359
65295+:1060600000B0F82B8F98002024040034930F00BC5C
65296+:1060700031EE000251C000012404003000A4C82BFE
65297+:10608000172000D10000000000A4282300B0F82B46
65298+:106090003C010800A4243D7C17E000680200202198
65299+:1060A0003C0308008C633D6C0083102B54400001BE
65300+:1060B000008018218F8800243C010800AC233D7427
65301+:1060C000000048219104000D308300205060000141
65302+:1060D0008F490E188F8300140123382B10E00059CC
65303+:1060E000000000003C0408008C843D7400895821A5
65304+:1060F000006B502B114000560090602B006930233C
65305+:1061000000C020213C010800AC263D7412000003B1
65306+:10611000241FFFFC1090008A32270003009FC82430
65307+:106120003C010800AC393D743C010800A4203D92BC
65308+:106130008F84000C120400078F830020AF910008A9
65309+:10614000020020218C7100CCAF90000C26300001A1
65310+:10615000AC7000CC3C0208008C423D748F8A001069
65311+:10616000240700180082202301422823AF84000C5A
65312+:1061700010800002AF850010240700108F86001CDD
65313+:106180003C010800A0273D902407004090CC0085EA
65314+:10619000318B00C0116700408F8D001414A00015D2
65315+:1061A00000002021934A01098F420974314500FF04
65316+:1061B0000002260224A300013090007F3071007F8E
65317+:1061C0001230007A2407FF80A0C300833C09080036
65318+:1061D0008D293D8C8F880024240D0002352C000869
65319+:1061E0003C010800A02D3DD13C010800AC2C3D8CA9
65320+:1061F00024040010910E000D31C6002010C00005CF
65321+:1062000000801821240800013C010800AC283D74DE
65322+:10621000348300018FBF00188FB100148FB00010BD
65323+:106220000060102103E0000827BD00203C010800A9
65324+:10623000A4203D7C13E0FF9A020020210A000C817B
65325+:1062400000A020213C0408008C843D740090602B49
65326+:106250001180FFAE000000003C0F080095EF3D7C70
65327+:1062600001E4702101C6682B11A000072C820004F4
65328+:106270003C1F60008FF954043338003F1700FFE5DE
65329+:10628000240300422C8200041040FFA0240300429B
65330+:106290000A000CDF8FBF0018152DFFC000000000A2
65331+:1062A0008CDF00743C0380002405FF8003E3C825D5
65332+:1062B000ACD9007490D80085240E0004240400108A
65333+:1062C000330F003F01E54025A0C800858F880024DA
65334+:1062D0003C010800A02E3DD1240300019106000DD1
65335+:1062E00030C9002015200003000000003C03080016
65336+:1062F0008C633D743C010800AC233D6C0A000CD655
65337+:10630000000000008F8700108C88008400E8282B94
65338+:1063100014A0000200E088218C910084240900016F
65339+:10632000A38900048F440E18022028210E000B328E
65340+:1063300002203021022080210A000C67AF82001465
65341+:1063400000071823306600033C010800A4263D9294
65342+:10635000122000058F8C0020918B00BC316A000454
65343+:106360001540001524CD00043C0F080095EF3D9228
65344+:1063700001E4702100AE302B50C0FF6E8F84000C02
65345+:106380002C85000514A0FFA32403004230980003CD
65346+:1063900017000002009818232483FFFC3C0108002A
65347+:1063A000AC233D740A000CA30000000000A7582491
65348+:1063B0000A000CCB016718263C010800A42D3D9271
65349+:1063C0000A000D33000000003C010800AC203D74C1
65350+:1063D0000A000CDE240300428F83001014600007C3
65351+:1063E000000010218F88002424050005910600007C
65352+:1063F00030C400FF108500030000000003E0000827
65353+:1064000000000000910A0018314900FF000939C25C
65354+:1064100014E0FFFA8F85001C3C04080094843D7C46
65355+:106420003C0308008C633D943C1908008F393D748F
65356+:106430003C0F080095EF3D920064C0218CAD0054E4
65357+:106440000319702101CF6021018D58231960001DAF
65358+:1064500000000000910E001C8F8C002C974B0E103A
65359+:1064600031CD00FF8D850004016D30238D88000043
65360+:1064700030CEFFFF000E510000AAC82100003821D5
65361+:1064800001072021032A182B0083C021AD990004A5
65362+:10649000AD980000918F000A01CF6821A18D000AFC
65363+:1064A0008F88002C974B0E12A50B0008950A003818
65364+:1064B00025490001A50900389107000D34E60008C0
65365+:1064C000A106000D03E000080000000027BDFFE06A
65366+:1064D000938700048F8F00248FAD00143C0E7FFF44
65367+:1064E0008F89000C35C8FFFFAFBF001CAFB000188C
65368+:1064F00001A8182491EA000D000717C03C1FBFFF38
65369+:10650000006258252D2E00018F90001837F9FFFFEB
65370+:106510003C1808008F183D943C0F080095EF3D8A09
65371+:1065200001796824000E47803C07EFFF3C05F0FF2F
65372+:1065300001A818253149002034E2FFFF34ACFFFFE9
65373+:106540000310582327A500102406000225EA0002A4
65374+:1065500000621824008080211520000200004021E4
65375+:106560008F480E1CA7AA0012056000372407000000
65376+:1065700030FF00FF001FCF008F8B001C00793825F3
65377+:10658000AFA70014916F00853C08080091083D9169
65378+:106590003C18DFFF31EE00C0370AFFFF000E182B5A
65379+:1065A0003C1F080097FF3D8400EA6824A3A800115F
65380+:1065B0000003174001A248258FB90010AFA90014AD
65381+:1065C0003C0A0800914A3D93A7BF00168FA800140B
65382+:1065D000032CC0243C0B01003C0F0FFF030B1825BC
65383+:1065E0003147000335EEFFFF010C68240007160059
65384+:1065F000006EF8243C09700001A2C82503E9582563
65385+:10660000AFB90014AFAB00100E000076A3A00015C8
65386+:106610008F8C0024260200089186000D30C40020D3
65387+:10662000108000068FBF001C3C05080094A53D802B
65388+:1066300024B0FFFF3C010800A4303D808FB000185B
65389+:1066400003E0000827BD00208F9800140118502B8C
65390+:106650005540FFC7240700010A000DB630FF00FFB8
65391+:106660009382000427BDFFE0AFBF00181040000F69
65392+:10667000008050218F880024240B00058F8900089A
65393+:10668000910700008F8400200100282130E3003FA3
65394+:106690008F86002C106B000800003821AFA9001075
65395+:1066A0000E00040EAFAA0014A38000048FBF0018D0
65396+:1066B00003E0000827BD00208D1900183C0F0800DA
65397+:1066C0008DEF3D748F9800103C027FFF8D08001401
65398+:1066D000345FFFFF033F682401F8702101AE60239F
65399+:1066E00001883821AFA900100E00040EAFAA0014D3
65400+:1066F0000A000E04A38000048F8700243C050800D4
65401+:1067000094A53D923C0208008C423D8C90E6000D21
65402+:106710000005240030C300201060002C00444025F8
65403+:106720008F85001C00006021240B000190A30085D0
65404+:1067300000004821240A00013C0F800035EE007063
65405+:106740008DC70000AF8700308F5801780700FFFE2B
65406+:106750003C038000347900708F3800003C0508004D
65407+:106760008CA500743C0D08008DAD007003077823E4
65408+:1067700000AF38210000102100EF302B01A22021B2
65409+:10678000008618213C010800AC2700743C01080079
65410+:10679000AC230070AF4B01483C1908008F393D9481
65411+:1067A000A7490144A74A0146AF59014C3C0B0800D8
65412+:1067B000916B3D91A34B0152AF4801543C0810002E
65413+:1067C000A74C015803E00008AF4801788F4B0E1C1E
65414+:1067D0003C0A08008D4A3D7497490E16974D0E14D9
65415+:1067E00001456021312AFFFF0A000E2731A9FFFF72
65416+:1067F0008F8300249064000D308200201040002917
65417+:10680000000000000000482100005021000040214D
65418+:106810003C07800034EB00708D670000AF870030CC
65419+:106820008F4C01780580FFFE3C0D800035AC007078
65420+:106830008D8B00003C0508008CA500743C0408000A
65421+:106840008C8400700167302300A67821000010219D
65422+:1068500001E6C82B0082C021031970213C01080009
65423+:10686000AC2F00743C010800AC2E0070AF49014809
65424+:106870003C0D08008DAD3D94A7480144240900401B
65425+:10688000A74A01463C081000240AFF91AF4D014C75
65426+:10689000A34A0152AF490154A740015803E0000840
65427+:1068A000AF4801788F490E1897460E1297450E1083
65428+:1068B00030CAFFFF0A000E5D30A8FFFF8F8300245F
65429+:1068C00027BDFFF89064000D308200201040003A90
65430+:1068D00000000000240B000100004821240A0001F0
65431+:1068E0003C088000350700708CE30000AF83003067
65432+:1068F0008F4C01780580FFFE3C0E80003C040800B0
65433+:1069000090843DD035C700708CEC00003C05080039
65434+:106910008CA50074A3A400033C1908008F390070F3
65435+:106920008FAD00000183302300A638210000102124
65436+:106930000322782100E6C02B01F8602101AE40253A
65437+:10694000AFA800003C010800AC2700743C0108001F
65438+:10695000AC2C00709346010A3C04080090843DD1A1
65439+:10696000A3A00002A3A600018FA300003C0580FFA6
65440+:106970003099007F34A2FFFF006278240019C6001E
65441+:1069800001F87025240D3000AF4E014C27BD0008E2
65442+:10699000AF4D0154A7400158AF4B0148A7490144EE
65443+:1069A000A74A01463C091000240AFF80A34A01526D
65444+:1069B00003E00008AF4901788F4B0E1897460E127E
65445+:1069C00097450E1030CAFFFF0A000E9130A9FFFF55
65446+:1069D0008F85001C2402008090A40085308300C0B5
65447+:1069E000106200058F8600208F8800088F87000CBA
65448+:1069F000ACC800C8ACC700C403E000080000000039
65449+:106A00003C0A0800254A39543C09080025293A2047
65450+:106A10003C08080025082DD43C07080024E73B3437
65451+:106A20003C06080024C637C43C05080024A5353CB4
65452+:106A30003C040800248431643C0308002463385C6F
65453+:106A40003C020800244236303C010800AC2A3D508C
65454+:106A50003C010800AC293D4C3C010800AC283D48F5
65455+:106A60003C010800AC273D543C010800AC263D64C5
65456+:106A70003C010800AC253D5C3C010800AC243D58BD
65457+:106A80003C010800AC233D683C010800AC223D609D
65458+:086A900003E000080000000013
65459+:00000001FF
65460diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65461new file mode 100644
65462index 0000000..43d7c4f
65463--- /dev/null
65464+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65465@@ -0,0 +1,6496 @@
65466+:10000000080001180800000000005594000000C816
65467+:1000100000000000000000000000000008005594EF
65468+:10002000000000380000565C080000A00800000036
65469+:100030000000574400005694080059200000008436
65470+:100040000000ADD808005744000001C00000AE5CBD
65471+:100050000800321008000000000092580000B01C98
65472+:10006000000000000000000000000000080092589E
65473+:100070000000033C000142740800049008000400E2
65474+:10008000000012FC000145B000000000000000006C
65475+:1000900000000000080016FC00000004000158AC3D
65476+:1000A000080000A80800000000003D00000158B052
65477+:1000B00000000000000000000000000008003D00FB
65478+:1000C00000000030000195B00A000046000000006A
65479+:1000D000000000000000000D636F6D362E322E31DF
65480+:1000E00062000000060201020000000000000003A0
65481+:1000F000000000C800000032000000030000000003
65482+:1001000000000000000000000000000000000000EF
65483+:1001100000000010000001360000EA600000000549
65484+:1001200000000000000000000000000000000008C7
65485+:1001300000000000000000000000000000000000BF
65486+:1001400000000000000000000000000000000000AF
65487+:10015000000000000000000000000000000000009F
65488+:10016000000000020000000000000000000000008D
65489+:10017000000000000000000000000000000000007F
65490+:10018000000000000000000000000010000000005F
65491+:10019000000000000000000000000000000000005F
65492+:1001A000000000000000000000000000000000004F
65493+:1001B000000000000000000000000000000000003F
65494+:1001C000000000000000000000000000000000002F
65495+:1001D000000000000000000000000000000000001F
65496+:1001E0000000000010000003000000000000000DEF
65497+:1001F0000000000D3C020800244256083C030800A1
65498+:1002000024635754AC4000000043202B1480FFFDB2
65499+:10021000244200043C1D080037BD9FFC03A0F021D0
65500+:100220003C100800261001183C1C0800279C5608AA
65501+:100230000E000256000000000000000D27BDFFB4B4
65502+:10024000AFA10000AFA20004AFA30008AFA4000C50
65503+:10025000AFA50010AFA60014AFA70018AFA8001CF0
65504+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
65505+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
65506+:10028000AFB90040AFBC0044AFBF00480E001544FA
65507+:10029000000000008FBF00488FBC00448FB90040B1
65508+:1002A0008FB8003C8FAF00388FAE00348FAD003078
65509+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
65510+:1002C0008FA8001C8FA700188FA600148FA5001000
65511+:1002D0008FA4000C8FA300088FA200048FA1000040
65512+:1002E00027BD004C3C1B60108F7A5030377B502864
65513+:1002F00003400008AF7A00008F82002427BDFFE092
65514+:10030000AFB00010AFBF0018AFB100148C42000CAA
65515+:100310003C1080008E110100104000348FBF001887
65516+:100320000E000D84000000008F85002024047FFF54
65517+:100330000091202BACB100008E030104960201084D
65518+:1003400000031C003042FFFF00621825ACA300042C
65519+:100350009202010A96030114304200FF3063FFFF4E
65520+:100360000002140000431025ACA200089603010C03
65521+:100370009602010E00031C003042FFFF00621825A8
65522+:10038000ACA3000C960301109602011200031C009E
65523+:100390003042FFFF00621825ACA300108E02011846
65524+:1003A000ACA200148E02011CACA20018148000083C
65525+:1003B0008F820024978200003C0420050044182509
65526+:1003C00024420001ACA3001C0A0000C6A782000062
65527+:1003D0003C0340189442001E00431025ACA2001CB0
65528+:1003E0000E000DB8240400018FBF00188FB1001457
65529+:1003F0008FB000100000102103E0000827BD00208E
65530+:100400003C0780008CE202B834E50100044100089A
65531+:10041000240300013C0208008C42006024420001D9
65532+:100420003C010800AC22006003E0000800601021DD
65533+:100430003C0208008C42005C8CA4002094A30016AF
65534+:100440008CA6000494A5000E24420001ACE40280B6
65535+:100450002463FFFC3C010800AC22005C3C0210005D
65536+:10046000A4E30284A4E5028600001821ACE6028819
65537+:10047000ACE202B803E000080060102127BDFFE0F5
65538+:100480003C028000AFB0001034420100AFBF001C3E
65539+:10049000AFB20018AFB100148C43000094450008BF
65540+:1004A0002462FE002C42038110400003000381C23D
65541+:1004B0000A00010226100004240201001462000553
65542+:1004C0003C1180003C02800890420004305000FF44
65543+:1004D0003C11800036320100964300143202000FB6
65544+:1004E00000021500004310253C0308008C63004403
65545+:1004F00030A40004AE220080246300013C01080007
65546+:10050000AC2300441080000730A200028FBF001C03
65547+:100510008FB200188FB100148FB000100A0000CE07
65548+:1005200027BD00201040002D0000182130A20080BF
65549+:1005300010400005362200708E44001C0E000C672F
65550+:10054000240500A0362200708C4400008F82000C2D
65551+:10055000008210232C43012C10600004AF82001095
65552+:10056000240300010A000145AF84000C8E42000400
65553+:100570003C036020AF84000CAC6200143C02080015
65554+:100580008C42005850400015000018218C62000475
65555+:10059000240301FE304203FF144300100000182121
65556+:1005A0002E020004104000032E0200080A00014041
65557+:1005B0000000802114400003000000000A000140F8
65558+:1005C0002610FFF90000000D2402000202021004B0
65559+:1005D0003C036000AC626914000018218FBF001C4E
65560+:1005E0008FB200188FB100148FB00010006010217E
65561+:1005F00003E0000827BD00203C0480008C8301003C
65562+:1006000024020100506200033C0280080000000D3B
65563+:100610003C02800890430004000010213063000F6A
65564+:1006200000031D0003E00008AC8300800004188074
65565+:100630002782FF9C00621821000410C00044102390
65566+:100640008C640000000210C03C030800246356E4E0
65567+:10065000004310213C038000AC64009003E00008DC
65568+:10066000AF8200243C0208008C42011410400019A3
65569+:100670003084400030A2007F000231C03C02020002
65570+:100680001080001400A218253C026020AC43001426
65571+:100690003C0408008C8456B83C0308008C630110AD
65572+:1006A0003C02800024050900AC4500200086202182
65573+:1006B000246300013C028008AC4400643C01080053
65574+:1006C000AC2301103C010800AC2456B803E000083C
65575+:1006D000000000003C02602003E00008AC4500146C
65576+:1006E00003E000080000102103E0000800001021D2
65577+:1006F00030A2000810400008240201003C0208005B
65578+:100700008C42010C244200013C010800AC22010C87
65579+:1007100003E0000800000000148200080000000050
65580+:100720003C0208008C4200FC244200013C0108000D
65581+:10073000AC2200FC0A0001A330A200203C02080009
65582+:100740008C420084244200013C010800AC22008459
65583+:1007500030A200201040000830A200103C02080027
65584+:100760008C420108244200013C010800AC2201082F
65585+:1007700003E0000800000000104000080000000036
65586+:100780003C0208008C420104244200013C010800A4
65587+:10079000AC22010403E00008000000003C02080055
65588+:1007A0008C420100244200013C010800AC220100FF
65589+:1007B00003E000080000000027BDFFE0AFB1001417
65590+:1007C0003C118000AFB20018AFBF001CAFB00010EA
65591+:1007D0003632010096500008320200041040000733
65592+:1007E000320300028FBF001C8FB200188FB10014BB
65593+:1007F0008FB000100A0000CE27BD00201060000B53
65594+:10080000020028218E2401000E00018A0000000051
65595+:100810003202008010400003240500A10E000C6786
65596+:100820008E44001C0A0001E3240200018E2301040F
65597+:100830008F82000810430006020028218E24010048
65598+:100840000E00018A000000008E220104AF82000821
65599+:10085000000010218FBF001C8FB200188FB1001450
65600+:100860008FB0001003E0000827BD00202C82000498
65601+:1008700014400002000018212483FFFD240200021E
65602+:10088000006210043C03600003E00008AC626914DD
65603+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
65604+:1008A000AFB000103C048000948201083043700017
65605+:1008B000240220001062000A2862200154400052E5
65606+:1008C0008FBF001C24024000106200482402600018
65607+:1008D0001062004A8FBF001C0A0002518FB200183C
65608+:1008E00034820100904300098C5000189451000C90
65609+:1008F000240200091062001C0000902128620009F7
65610+:10090000144000218F8200242402000A5062001249
65611+:10091000323100FF2402000B1062000F00000000C3
65612+:100920002402000C146200188F8200243C0208008C
65613+:100930008C4256B824030900AC83002000501021DB
65614+:100940003C038008AC6200643C010800AC2256B84D
65615+:100950000A0002508FBF001C0E0001E900102602A1
65616+:100960000A0002308F8200240E0001E900102602E6
65617+:100970003C0380089462001A8C72000C3042FFFF26
65618+:10098000020280258F8200248C42000C5040001E01
65619+:100990008FBF001C0E000D84000000003C02800090
65620+:1009A00034420100944300088F82002400031C009D
65621+:1009B0009444001E8F82002000641825AC50000073
65622+:1009C00024040001AC510004AC520008AC40000CFF
65623+:1009D000AC400010AC400014AC4000180E000DB844
65624+:1009E000AC43001C0A0002508FBF001C0E000440E4
65625+:1009F000000000000A0002508FBF001C0E000C9F78
65626+:100A0000000000008FBF001C8FB200188FB10014CF
65627+:100A10008FB000100000102103E0000827BD002067
65628+:100A200027BDFFD8AFB400203C036010AFBF002447
65629+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
65630+:100A40008C6450002402FF7F3C1408002694563822
65631+:100A5000008220243484380CAC6450003C028000B6
65632+:100A6000240300370E0014B0AC4300083C07080014
65633+:100A700024E70618028010212404001D2484FFFFAF
65634+:100A8000AC4700000481FFFD244200043C02080042
65635+:100A9000244207C83C010800AC2256403C02080032
65636+:100AA000244202303C030800246306203C04080072
65637+:100AB000248403B43C05080024A506F03C06080085
65638+:100AC00024C62C9C3C010800AC2256803C02080045
65639+:100AD000244205303C010800AC2756843C01080044
65640+:100AE000AC2656943C010800AC23569C3C010800FF
65641+:100AF000AC2456A03C010800AC2556A43C010800DB
65642+:100B0000AC2256A83C010800AC23563C3C0108002E
65643+:100B1000AC2456443C010800AC2056603C0108005F
65644+:100B2000AC2556643C010800AC2056703C0108001E
65645+:100B3000AC27567C3C010800AC2656903C010800CE
65646+:100B4000AC2356980E00056E00000000AF80000C2C
65647+:100B50003C0280008C5300008F8300043C0208009C
65648+:100B60008C420020106200213262000700008821C0
65649+:100B70002792FF9C3C100800261056E43C02080017
65650+:100B80008C42002024050001022518040043202483
65651+:100B90008F820004004310245044000C26310001D1
65652+:100BA00010800008AF9000248E4300003C028000BB
65653+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
65654+:100BC00026310001AE00000C263100012E22000269
65655+:100BD000261000381440FFE9265200043C020800A9
65656+:100BE0008C420020AF820004326200071040FFD91F
65657+:100BF0003C028000326200011040002D326200028F
65658+:100C00003C0580008CA2010000002021ACA2002045
65659+:100C10008CA301042C42078110400008ACA300A85B
65660+:100C200094A2010824032000304270001443000302
65661+:100C30003C02800890420005304400FF0E0001593C
65662+:100C4000000000003C0280009042010B304300FF96
65663+:100C50002C62001E54400004000310800E00018628
65664+:100C60000A0002EC00000000005410218C42000039
65665+:100C70000040F80900000000104000043C02800021
65666+:100C80008C4301043C026020AC4300143C02080089
65667+:100C90008C4200343C0440003C03800024420001AC
65668+:100CA000AC6401383C010800AC220034326200021E
65669+:100CB00010400010326200043C1080008E0201409F
65670+:100CC000000020210E000159AE0200200E00038317
65671+:100CD000000000003C024000AE0201783C02080027
65672+:100CE0008C420038244200013C010800AC2200384C
65673+:100CF000326200041040FF973C0280003C108000EC
65674+:100D00008E020180000020210E000159AE02002059
65675+:100D10008E03018024020F00546200073C02800809
65676+:100D20008E0201883C0300E03042FFFF00431025A3
65677+:100D30000A000328AE020080344200809042000086
65678+:100D400024030050304200FF14430007000000005D
65679+:100D50000E000362000000001440000300000000C9
65680+:100D60000E000971000000003C0208008C42003CAB
65681+:100D70003C0440003C03800024420001AC6401B804
65682+:100D80003C010800AC22003C0A0002A33C028000A7
65683+:100D90003C02900034420001008220253C02800089
65684+:100DA000AC4400203C0380008C6200200440FFFE25
65685+:100DB0000000000003E00008000000003C0280008A
65686+:100DC000344300010083202503E00008AC440020E8
65687+:100DD00027BDFFE0AFB10014AFB000100080882144
65688+:100DE000AFBF00180E00033230B000FF8F83FF94B6
65689+:100DF000022020219062002502028025A07000259B
65690+:100E00008C7000183C0280000E00033D020280241A
65691+:100E10001600000B8FBF00183C0480008C8201F884
65692+:100E20000440FFFE348201C024030002AC510000E4
65693+:100E3000A04300043C021000AC8201F88FBF0018F0
65694+:100E40008FB100148FB0001003E0000827BD002010
65695+:100E500027BDFFE83C028000AFBF00103442018094
65696+:100E6000944300048C4400083063020010600005C5
65697+:100E7000000028210E00100C000000000A0003787A
65698+:100E8000240500013C02FF000480000700821824B2
65699+:100E90003C02040014620004240500018F82FF94C8
65700+:100EA00090420008240500018FBF001000A010210F
65701+:100EB00003E0000827BD00188F82FF982405000179
65702+:100EC000A040001A3C028000344201400A00034264
65703+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
65704+:100EE000AFB20018AFB10014AFB0001090A2000074
65705+:100EF000304400FF38830020388200300003182B74
65706+:100F00000002102B0062182410600003240200501D
65707+:100F1000148200A88FBF001C90A20005304200017F
65708+:100F2000104000A48FBF001C3C02800034420140EE
65709+:100F3000904200082443FFFF2C6200051040009EF1
65710+:100F40008FB20018000310803C030800246355ACE6
65711+:100F5000004310218C420000004000080000000007
65712+:100F60003C028000345101400E0003328E24000008
65713+:100F70008F92FF948E2200048E50000C1602000205
65714+:100F800024020001AE42000C0E00033D8E2400003E
65715+:100F90008E220004145000068FBF001C8FB2001870
65716+:100FA0008FB100148FB000100A000F7827BD002009
65717+:100FB0008E42000C0A000419000000003C0480006E
65718+:100FC0003482014094A300108C4200043063FFFF80
65719+:100FD0001443001C0000000024020001A4A2001021
65720+:100FE0008C8202380441000F3C0380003C02003F29
65721+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
65722+:1010000000461824004810240002130200031D8229
65723+:10101000106200583C0280008C8202380440FFF7C6
65724+:101020003C038000346201408C44000034620200C2
65725+:10103000AC4400003C021000AC6202380A00043BE1
65726+:101040008FBF001C94A200100A00041900000000C9
65727+:10105000240200201482000F3C0280003C03800028
65728+:1010600094A20012346301408C6300043042FFFFFD
65729+:10107000146200050000000024020001A4A2001276
65730+:101080000A0004028FBF001C94A200120A00041977
65731+:1010900000000000345101400E0003328E24000095
65732+:1010A0008F92FF948E230004964200123050FFFF6F
65733+:1010B0001603000224020001A64200120E00033DA6
65734+:1010C0008E2400008E220004160200068FBF001C32
65735+:1010D0008FB200188FB100148FB000100A00037C8B
65736+:1010E00027BD0020964200120A00041900000000EB
65737+:1010F0003C03800094A20014346301408C6300041C
65738+:101100003042FFFF14620008240200018FBF001C60
65739+:101110008FB200188FB100148FB00010A4A2001479
65740+:101120000A00146327BD002094A20014144000217B
65741+:101130008FBF001C0A000435000000003C03800043
65742+:1011400094A20016346301408C6300043042FFFF18
65743+:101150001462000D240200018FBF001C8FB2001822
65744+:101160008FB100148FB00010A4A200160A000B1457
65745+:1011700027BD00209442007824420004A4A200105D
65746+:101180000A00043B8FBF001C94A200162403000138
65747+:101190003042FFFF144300078FBF001C3C020800D1
65748+:1011A0008C420070244200013C010800AC22007017
65749+:1011B0008FBF001C8FB200188FB100148FB00010C9
65750+:1011C00003E0000827BD002027BDFFD8AFB20018FC
65751+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
65752+:1011E000AFB000103C028000345101008C5001006F
65753+:1011F0009242000092230009304400FF2402001FA5
65754+:10120000106200AB28620020104000192402003850
65755+:101210002862000A1040000D2402000B286200081A
65756+:101220001040002E8F820024046001042862000216
65757+:101230001440002A8F820024240200061062002637
65758+:101240008FBF00200A00055F8FB3001C1062006092
65759+:101250002862000B144000FA8FBF00202402000E09
65760+:10126000106200788F8200240A00055F8FB3001C93
65761+:10127000106200D2286200391040000A2402008067
65762+:1012800024020036106200E528620037104000C3D7
65763+:1012900024020035106200D98FBF00200A00055FCC
65764+:1012A0008FB3001C1062002D2862008110400006E0
65765+:1012B000240200C824020039106200C98FBF002038
65766+:1012C0000A00055F8FB3001C106200A28FBF0020D0
65767+:1012D0000A00055F8FB3001C8F8200248C42000C33
65768+:1012E000104000D78FBF00200E000D8400000000CA
65769+:1012F0003C038000346301008C6200008F85002075
65770+:10130000946700089466000CACA200008C64000492
65771+:101310008F82002400063400ACA400049448001E10
65772+:101320008C62001800073C0000E83825ACA20008D9
65773+:101330008C62001C24040001ACA2000C9062000A24
65774+:1013400000C23025ACA60010ACA00014ACA0001860
65775+:10135000ACA7001C0A00051D8FBF00208F8200244F
65776+:101360008C42000C104000B68FBF00200E000D8490
65777+:10137000000000008F820024962400089625000CAF
65778+:101380009443001E000422029626000E8F82002045
65779+:10139000000426000083202500052C003C0300806B
65780+:1013A00000A6282500832025AC400000AC400004A6
65781+:1013B000AC400008AC40000CAC450010AC40001440
65782+:1013C000AC400018AC44001C0A00051C24040001B9
65783+:1013D0009622000C14400018000000009242000504
65784+:1013E0003042001014400014000000000E000332D0
65785+:1013F0000200202192420005020020213442001008
65786+:101400000E00033DA242000592420000240300208A
65787+:10141000304200FF10430089020020218FBF0020CE
65788+:101420008FB3001C8FB200188FB100148FB0001062
65789+:101430000A00107527BD00280000000D0A00055E97
65790+:101440008FBF00208C42000C1040007D8FBF002019
65791+:101450000E000D84000000008E2200048F84002006
65792+:101460009623000CAC8200003C0280089445002CBE
65793+:101470008F82002400031C0030A5FFFF9446001E4D
65794+:101480003C02400E0065182500C23025AC830004E4
65795+:10149000AC800008AC80000CAC800010AC80001464
65796+:1014A000AC800018AC86001C0A00051C2404000156
65797+:1014B0000E000332020020218F93FF9802002021AA
65798+:1014C0000E00033DA660000C020020210E00034226
65799+:1014D000240500018F8200248C42000C104000582B
65800+:1014E0008FBF00200E000D84000000009622000C2B
65801+:1014F0008F83002000021400AC700000AC62000476
65802+:10150000AC6000088E4400388F820024AC64000C6C
65803+:101510008E46003C9445001E3C02401FAC66001005
65804+:1015200000A228258E62000424040001AC6200148D
65805+:10153000AC600018AC65001C8FBF00208FB3001C8E
65806+:101540008FB200188FB100148FB000100A000DB8D0
65807+:1015500027BD0028240200201082003A8FB3001C0F
65808+:101560000E000F5E00000000104000358FBF00200D
65809+:101570003C0480008C8201F80440FFFE348201C0EC
65810+:1015800024030002AC500000A04300043C02100001
65811+:10159000AC8201F80A00055E8FBF00200200202106
65812+:1015A0008FBF00208FB3001C8FB200188FB10014C2
65813+:1015B0008FB000100A000EA727BD00289625000C4A
65814+:1015C000020020218FBF00208FB3001C8FB20018B3
65815+:1015D0008FB100148FB000100A000ECC27BD002878
65816+:1015E000020020218FB3001C8FB200188FB10014AD
65817+:1015F0008FB000100A000EF727BD00289225000DBD
65818+:10160000020020218FB3001C8FB200188FB100148C
65819+:101610008FB000100A000F4827BD002802002021CB
65820+:101620008FBF00208FB3001C8FB200188FB1001441
65821+:101630008FB000100A000F1F27BD00288FBF0020A9
65822+:101640008FB3001C8FB200188FB100148FB0001040
65823+:1016500003E0000827BD00283C0580008CA202782A
65824+:101660000440FFFE34A2024024030002AC44000008
65825+:10167000A04300043C02100003E00008ACA2027882
65826+:10168000A380001803E00008A38000193C03800039
65827+:101690008C6202780440FFFE8F82001CAC62024024
65828+:1016A00024020002A06202443C02100003E0000891
65829+:1016B000AC6202783C02600003E000088C425404F3
65830+:1016C0009083003024020005008040213063003FF9
65831+:1016D0000000482114620005000050219082004C57
65832+:1016E0009483004E304900FF306AFFFFAD00000CCC
65833+:1016F000AD000010AD000024950200148D05001C03
65834+:101700008D0400183042FFFF004910230002110031
65835+:10171000000237C3004038210086202300A2102B8E
65836+:101720000082202300A72823AD05001CAD0400186B
65837+:10173000A5090014A5090020A50A001603E0000869
65838+:10174000A50A002203E000080000000027BDFFD822
65839+:10175000AFB200183C128008AFB40020AFB3001C39
65840+:10176000AFB10014AFBF0024AFB00010365101007C
65841+:101770003C0260008C4254049222000C3C1408008D
65842+:10178000929400F7304300FF2402000110620032FF
65843+:101790000080982124020002146200353650008037
65844+:1017A0000E00143D000000009202004C2403FF8054
65845+:1017B0003C0480003042007F000211C024420240FD
65846+:1017C0000262102100431824AC8300949245000863
65847+:1017D0009204004C3042007F3C03800614850007D1
65848+:1017E000004380212402FFFFA22200112402FFFFF8
65849+:1017F000A62200120A0005D22402FFFF9602002052
65850+:10180000A222001196020022A62200128E020024BB
65851+:101810003C048008AE2200143485008090A2004C65
65852+:1018200034830100A06200108CA2003CAC6200185E
65853+:101830008C820068AC6200F48C820064AC6200F0C0
65854+:101840008C82006CAC6200F824020001A0A2006847
65855+:101850000A0005EE3C0480080E001456000000004B
65856+:1018600036420080A04000680A0005EE3C04800873
65857+:10187000A2000068A20000690A0006293C02800854
65858+:10188000348300808C62003834850100AC62006CC7
65859+:1018900024020001A062006990A200D59083000894
65860+:1018A000305100FF3072007F12320019001111C058
65861+:1018B00024420240026210212403FF8000431824C6
65862+:1018C0003C048000AC8300943042007F3C038006DF
65863+:1018D000004380218E02000C1040000D02002021E8
65864+:1018E0000E00057E0000000026220001305100FF9E
65865+:1018F0009203003C023410260002102B0002102339
65866+:101900003063007F022288240A0005F8A203003C0D
65867+:101910003C088008350401008C8200E03507008017
65868+:10192000ACE2003C8C8200E0AD02000090E5004C8F
65869+:10193000908600D590E3004C908400D52402FF806F
65870+:1019400000A228243063007F308400FF00A62825F1
65871+:101950000064182A1060000230A500FF38A500803E
65872+:10196000A0E5004CA10500093C0280089043000E50
65873+:10197000344400803C058000A043000A8C8300189A
65874+:101980003C027FFF3442FFFF00621824AC83001842
65875+:101990008CA201F80440FFFE00000000ACB301C0BF
65876+:1019A0008FBF00248FB400208FB3001C8FB20018AB
65877+:1019B0008FB100148FB0001024020002A0A201C455
65878+:1019C00027BD00283C02100003E00008ACA201F88B
65879+:1019D00090A2000024420001A0A200003C030800E5
65880+:1019E0008C6300F4304200FF144300020080302179
65881+:1019F000A0A0000090A200008F84001C000211C073
65882+:101A00002442024024830040008220212402FF80DF
65883+:101A1000008220243063007F3C02800A006218218B
65884+:101A20003C028000AC44002403E00008ACC300008A
65885+:101A300094820006908300058C85000C8C86001033
65886+:101A40008C8700188C88001C8C8400203C010800C6
65887+:101A5000A42256C63C010800A02356C53C0108003C
65888+:101A6000AC2556CC3C010800AC2656D03C01080001
65889+:101A7000AC2756D83C010800AC2856DC3C010800D5
65890+:101A8000AC2456E003E00008000000003C0280089F
65891+:101A9000344201008C4400343C038000346504006F
65892+:101AA000AC6400388C420038AF850028AC62003C42
65893+:101AB0003C020005AC6200300000000000000000A5
65894+:101AC00003E00008000000003C020006308400FF34
65895+:101AD000008220253C028000AC4400300000000061
65896+:101AE00000000000000000003C0380008C62000049
65897+:101AF000304200101040FFFD3462040003E0000893
65898+:101B0000AF82002894C200003C080800950800CA73
65899+:101B100030E7FFFF0080482101021021A4C200002D
65900+:101B200094C200003042FFFF00E2102B544000013D
65901+:101B3000A4C7000094A200003C0308008C6300CC02
65902+:101B400024420001A4A2000094A200003042FFFF42
65903+:101B5000144300073C0280080107102BA4A00000DA
65904+:101B60005440000101003821A4C700003C02800855
65905+:101B7000344601008CC3002894A200003C0480007D
65906+:101B80003042FFFE000210C000621021AC82003C17
65907+:101B90008C82003C006218231860000400000000E2
65908+:101BA0008CC200240A0006BA244200018CC2002420
65909+:101BB000AC8200383C020050344200103C038000EC
65910+:101BC000AC620030000000000000000000000000D7
65911+:101BD0008C620000304200201040FFFD0000000039
65912+:101BE00094A200003C04800030420001000210C0BA
65913+:101BF000004410218C430400AD2300008C420404F7
65914+:101C0000AD2200043C02002003E00008AC8200305A
65915+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
65916+:101C2000AFBF001C94C2000000C080213C1208001D
65917+:101C3000965200C624420001A6020000960300004E
65918+:101C400094E2000000E03021144300058FB1003021
65919+:101C50000E00068F024038210A0006F10000000045
65920+:101C60008C8300048C82000424420040046100073D
65921+:101C7000AC8200048C8200040440000400000000D8
65922+:101C80008C82000024420001AC8200009602000019
65923+:101C90003042FFFF50520001A600000096220000D3
65924+:101CA00024420001A62200003C02800834420100C8
65925+:101CB000962300009442003C144300048FBF001C94
65926+:101CC00024020001A62200008FBF001C8FB2001862
65927+:101CD0008FB100148FB0001003E0000827BD002072
65928+:101CE00027BDFFE03C028008AFBF0018344201006E
65929+:101CF0008C4800343C03800034690400AC68003830
65930+:101D00008C42003830E700FFAF890028AC62003C0D
65931+:101D10003C020005AC620030000000000000000042
65932+:101D200000000000000000000000000000000000B3
65933+:101D30008C82000C8C82000C97830016AD22000070
65934+:101D40008C82001000604021AD2200048C820018BB
65935+:101D5000AD2200088C82001CAD22000C8CA2001465
65936+:101D6000AD2200108C820020AD220014908200056C
65937+:101D7000304200FF00021200AD2200188CA20018B1
65938+:101D8000AD22001C8CA2000CAD2200208CA2001001
65939+:101D9000AD2200248CA2001CAD2200288CA20020C1
65940+:101DA000AD22002C3402FFFFAD260030AD20003400
65941+:101DB000506200013408FFFFAD28003850E00011E8
65942+:101DC0003C0280083C048008348401009482005066
65943+:101DD0003042FFFFAD22003C9483004494850044D0
65944+:101DE000240200013063FFFF000318C200641821C1
65945+:101DF0009064006430A5000700A210040A00075C8C
65946+:101E00000044102534420100AD20003C94430044BE
65947+:101E1000944400443063FFFF000318C2006218219D
65948+:101E200030840007906500642402000100821004E1
65949+:101E30000002102700451024A0620064000000008A
65950+:101E400000000000000000003C0200063442004098
65951+:101E50003C038000AC620030000000000000000085
65952+:101E6000000000008C620000304200101040FFFDB6
65953+:101E70003C06800834C201503463040034C7014A70
65954+:101E800034C4013434C5014034C60144AFA200104B
65955+:101E90000E0006D2AF8300288FBF001803E00008B1
65956+:101EA00027BD00208F8300143C0608008CC600E884
65957+:101EB0008F82001C30633FFF000319800046102111
65958+:101EC000004310212403FF80004318243C068000B7
65959+:101ED000ACC300283042007F3C03800C004330211B
65960+:101EE00090C2000D30A500FF0000382134420010E0
65961+:101EF000A0C2000D8F8900143C028008344201000A
65962+:101F00009443004400091382304800032402000176
65963+:101F1000A4C3000E1102000B2902000210400005AC
65964+:101F2000240200021100000C240300010A0007A48F
65965+:101F30000000182111020006000000000A0007A49A
65966+:101F4000000018218CC2002C0A0007A424430001C1
65967+:101F50008CC20014244300018CC200180043102BD3
65968+:101F60005040000A240700012402002714A20003A5
65969+:101F70003C0380080A0007B1240700013463010014
65970+:101F80009462004C24420001A462004C00091382B8
65971+:101F9000304300032C620002104000090080282119
65972+:101FA000146000040000000094C200340A0007C15D
65973+:101FB0003046FFFF8CC600380A0007C10080282188
65974+:101FC000000030213C040800248456C00A000706A3
65975+:101FD0000000000027BDFF90AFB60068AFB50064F9
65976+:101FE000AFB40060AFB3005CAFB20058AFB1005403
65977+:101FF000AFBF006CAFB000508C9000000080B021EB
65978+:102000003C0208008C4200E8960400328F83001CDA
65979+:102010002414FF8030843FFF0062182100042180D7
65980+:1020200000641821007410243C13800000A090214B
65981+:1020300090A50000AE620028920400323C02800CA1
65982+:102040003063007F00628821308400C02402004099
65983+:10205000148200320000A8218E3500388E2200182C
65984+:102060001440000224020001AE2200189202003C3B
65985+:10207000304200201440000E8F83001C000511C068
65986+:102080002442024000621821306400783C02008043
65987+:102090000082202500741824AE630800AE64081086
65988+:1020A0008E2200188E03000800431021AE22001873
65989+:1020B0008E22002C8E230018244200010062182B6F
65990+:1020C0001060004300000000924200002442000122
65991+:1020D000A24200003C0308008C6300F4304200FF81
65992+:1020E00050430001A2400000924200008F84001C77
65993+:1020F000000211C024420240248300403063007F6C
65994+:10210000008220213C02800A0094202400621821D1
65995+:10211000AE6400240A0008D2AEC30000920300326D
65996+:102120002402FFC000431024304200FF1440000589
65997+:1021300024020001AE220018962200340A00084250
65998+:102140003055FFFF8E22001424420001AE220018F9
65999+:102150009202003000021600000216030441001C27
66000+:10216000000000009602003227A400100080282101
66001+:10217000A7A20016960200320000302124070001B9
66002+:102180003042FFFFAF8200140E000706AFA0001C14
66003+:10219000960200328F83001C3C0408008C8400E807
66004+:1021A00030423FFF000211800064182100621821B4
66005+:1021B00000741024AE62002C3063007F3C02800E5D
66006+:1021C000006218219062000D3042007FA062000D75
66007+:1021D0009222000D304200105040007892420000E0
66008+:1021E0003C028008344401009482004C8EC30000FD
66009+:1021F0003C130800967300C62442FFFFA482004CE3
66010+:10220000946200329623000E3054FFFF3070FFFFBF
66011+:102210003C0308008C6300D000701807A7A30038A7
66012+:102220009482003E3063FFFF3042FFFF14620007DC
66013+:10223000000000008C8200303C038000244200300B
66014+:10224000AC62003C0A00086A8C82002C9482004038
66015+:102250003042FFFF5462000927A400408C820038FE
66016+:102260003C03800024420030AC62003C8C8200348D
66017+:10227000AC6200380A0008793C03800027A50038CA
66018+:1022800027A60048026038210E00068FA7A000484C
66019+:102290008FA300403C02800024630030AC43003830
66020+:1022A0008FA30044AC43003C3C0380003C0200058B
66021+:1022B000AC6200303C028008344401009482004249
66022+:1022C000346304003042FFFF0202102B1440000769
66023+:1022D000AF8300289482004E9483004202021021B2
66024+:1022E000004310230A00088F3043FFFF9483004E01
66025+:1022F00094820042026318210050102300621823C8
66026+:102300003063FFFF3C028008344401009482003CAB
66027+:102310003042FFFF14430003000000000A00089F42
66028+:10232000240300019482003C3042FFFF0062102B26
66029+:10233000144000058F8200289482003C0062102324
66030+:102340003043FFFF8F820028AC550000AC400004F2
66031+:10235000AC540008AC43000C3C02000634420010B0
66032+:102360003C038000AC620030000000000000000070
66033+:10237000000000008C620000304200101040FFFDA1
66034+:102380003C04800834840100001018C20064182145
66035+:102390009065006432020007240600010046100424
66036+:1023A00000451025A0620064948300429622000E2E
66037+:1023B00050430001A386001892420000244200010D
66038+:1023C000A24200003C0308008C6300F4304200FF8E
66039+:1023D00050430001A2400000924200008F84001C84
66040+:1023E000000211C0244202402483004000822021C8
66041+:1023F0002402FF80008220243063007F3C02800A98
66042+:10240000006218213C028000AC440024AEC30000EE
66043+:102410008FBF006C8FB600688FB500648FB400600A
66044+:102420008FB3005C8FB200588FB100548FB0005052
66045+:1024300003E0000827BD007027BDFFD8AFB3001C24
66046+:10244000AFB20018AFB10014AFB00010AFBF0020A2
66047+:102450000080982100E0802130B1FFFF0E000D8444
66048+:1024600030D200FF0000000000000000000000006B
66049+:102470008F8200208F830024AC510000AC520004F6
66050+:10248000AC530008AC40000CAC400010AC40001451
66051+:10249000AC4000189463001E02038025AC50001C61
66052+:1024A0000000000000000000000000002404000103
66053+:1024B0008FBF00208FB3001C8FB200188FB10014A3
66054+:1024C0008FB000100A000DB827BD002830A5FFFF0F
66055+:1024D0000A0008DC30C600FF3C02800834430100DB
66056+:1024E0009462000E3C080800950800C63046FFFFC5
66057+:1024F00014C000043402FFFF946500EA0A000929B1
66058+:102500008F84001C10C20027000000009462004E5F
66059+:102510009464003C3045FFFF00A6102300A6182B52
66060+:102520003087FFFF106000043044FFFF00C5102318
66061+:1025300000E210233044FFFF0088102B1040000EF3
66062+:1025400000E810233C028008344401002403000109
66063+:1025500034420080A44300162402FFFFA482000E30
66064+:10256000948500EA8F84001C0000302130A5FFFF15
66065+:102570000A0009013C0760200044102A10400009AD
66066+:102580003C0280083443008094620016304200010F
66067+:10259000104000043C0280009442007E244200145B
66068+:1025A000A462001603E000080000000027BDFFE061
66069+:1025B0003C028008AFBF001CAFB0001834420100DD
66070+:1025C000944300429442004C104000193068FFFFD1
66071+:1025D0009383001824020001146200298FBF001C9D
66072+:1025E0003C06800834D00100000810C200501021C1
66073+:1025F000904200643103000734C70148304200FFB5
66074+:10260000006210073042000134C9014E34C4012C6D
66075+:1026100034C5013E1040001634C601420E0006D2F9
66076+:10262000AFA90010960200420A0009463048FFFF99
66077+:102630003C028008344401009483004494820042A8
66078+:102640001043000F8FBF001C94820044A4820042FC
66079+:1026500094820050A482004E8C820038AC820030FC
66080+:1026600094820040A482003E9482004AA4820048E2
66081+:102670008FBF001C8FB000180A00090427BD00207E
66082+:102680008FB0001803E0000827BD002027BDFFA081
66083+:10269000AFB1004C3C118000AFBF0058AFB3005445
66084+:1026A000AFB20050AFB000483626018890C2000398
66085+:1026B0003044007FA3A400108E32018090C200003D
66086+:1026C0003043007F240200031062003BAF92001CE5
66087+:1026D00028620004104000062402000424020002C4
66088+:1026E000106200098FBF00580A000B0F8FB300540F
66089+:1026F0001062004D240200051062014E8FBF005889
66090+:102700000A000B0F8FB30054000411C002421021C5
66091+:102710002404FF8024420240004410242643004049
66092+:10272000AE2200243063007F3C02800A0062182140
66093+:102730009062003CAFA3003C00441025A062003C26
66094+:102740008FA3003C9062003C304200401040016C7E
66095+:102750008FBF00583C108008A3800018361001007D
66096+:102760008E0200E08C63003427A4003C27A50010F3
66097+:10277000004310210E0007C3AE0200E093A2001038
66098+:102780003C038000A20200D58C6202780440FFFE68
66099+:102790008F82001CAC62024024020002A06202444C
66100+:1027A0003C021000AC6202780E0009390000000003
66101+:1027B0000A000B0E8FBF00583C05800890C3000133
66102+:1027C00090A2000B1443014E8FBF005834A4008028
66103+:1027D0008C8200189082004C90A200083C0260009D
66104+:1027E0008C4254048C8300183C027FFF3442FFFF6C
66105+:1027F000006218243C0208008C4200B4AC8300182C
66106+:102800003C038000244200013C010800AC2200B4DB
66107+:102810008C6201F80440FFFE8F82001CAC6201C094
66108+:102820000A000AD6240200023C10800890C300016E
66109+:102830009202000B144301328FBF005827A40018E6
66110+:1028400036050110240600033C0260008C4254044B
66111+:102850000E000E470000000027A40028360501F0F6
66112+:102860000E000E47240600038FA200283603010045
66113+:10287000AE0200648FA2002CAE0200688FA200306E
66114+:10288000AE02006C93A40018906300D52402FF8070
66115+:102890000082102400431025304900FF3084007F5F
66116+:1028A0003122007F0082102A544000013929008023
66117+:1028B000000411C0244202402403FF800242102180
66118+:1028C00000431024AE220094264200403042007F94
66119+:1028D0003C038006004340218FA3001C2402FFFF1D
66120+:1028E000AFA800403C130800927300F71062003359
66121+:1028F00093A2001995030014304400FF3063FFFFDA
66122+:102900000064182B106000100000000095040014F3
66123+:102910008D07001C8D0600183084FFFF0044202323
66124+:102920000004210000E438210000102100E4202BE5
66125+:1029300000C2302100C43021AD07001CAD060018D4
66126+:102940000A000A2F93A20019950400148D07001C99
66127+:102950008D0600183084FFFF008220230004210030
66128+:10296000000010210080182100C2302300E4202B39
66129+:1029700000C4302300E33823AD07001CAD06001867
66130+:1029800093A200198FA30040A462001497A2001A1A
66131+:10299000A46200168FA2001CAC6200108FA2001C63
66132+:1029A000AC62000C93A20019A462002097A2001A46
66133+:1029B000A46200228FA2001CAC6200243C048008A8
66134+:1029C000348300808C6200388FA20020012088218F
66135+:1029D000AC62003C8FA20020AC82000093A20018E1
66136+:1029E000A062004C93A20018A0820009A0600068B9
66137+:1029F00093A20018105100512407FF803229007F54
66138+:102A0000000911C024420240024210213046007FDA
66139+:102A10003C03800000471024AC6200943C02800616
66140+:102A200000C2302190C2003CAFA60040000020212F
66141+:102A300000471025A0C2003C8FA80040950200026C
66142+:102A4000950300148D07001C3042FFFF3063FFFF29
66143+:102A50008D060018004310230002110000E2382107
66144+:102A600000E2102B00C4302100C23021AD07001C51
66145+:102A7000AD06001895020002A5020014A50000167C
66146+:102A80008D020008AD0200108D020008AD02000C9E
66147+:102A900095020002A5020020A50000228D02000878
66148+:102AA000AD0200249102003C304200401040001A68
66149+:102AB000262200013C108008A3A90038A38000183A
66150+:102AC000361001008E0200E08D03003427A4004080
66151+:102AD00027A50038004310210E0007C3AE0200E016
66152+:102AE00093A200383C038000A20200D58C620278D9
66153+:102AF0000440FFFE8F82001CAC62024024020002F0
66154+:102B0000A06202443C021000AC6202780E00093957
66155+:102B100000000000262200013043007F14730004EF
66156+:102B2000004020212403FF8002231024004320269C
66157+:102B300093A200180A000A4B309100FF93A40018DA
66158+:102B40008FA3001C2402FFFF1062000A308900FFDF
66159+:102B500024820001248300013042007F14530005C9
66160+:102B6000306900FF2403FF800083102400431026F7
66161+:102B7000304900FF3C028008904200080120882173
66162+:102B8000305000FF123000193222007F000211C0C5
66163+:102B900002421021244202402403FF8000431824F3
66164+:102BA0003C048000AC8300943042007F3C038006EC
66165+:102BB000004310218C43000C004020211060000BCA
66166+:102BC000AFA200400E00057E000000002623000199
66167+:102BD0002405FF803062007F145300020225202468
66168+:102BE000008518260A000AAF307100FF3C048008F7
66169+:102BF000348400808C8300183C027FFF3442FFFF46
66170+:102C000000621824AC8300183C0380008C6201F839
66171+:102C10000440FFFE00000000AC7201C0240200026C
66172+:102C2000A06201C43C021000AC6201F80A000B0E65
66173+:102C30008FBF00583C04800890C300019082000BB5
66174+:102C40001443002F8FBF0058349000809202000878
66175+:102C500030420040104000200000000092020008B6
66176+:102C60000002160000021603044100050240202164
66177+:102C70000E000ECC240500930A000B0E8FBF0058E7
66178+:102C80009202000924030018304200FF1443000D93
66179+:102C900002402021240500390E000E64000030217E
66180+:102CA0000E0003328F84001C8F82FF9424030012D5
66181+:102CB000A04300090E00033D8F84001C0A000B0E88
66182+:102CC0008FBF0058240500360E000E64000030212E
66183+:102CD0000A000B0E8FBF00580E0003320240202165
66184+:102CE000920200058F84001C344200200E00033D38
66185+:102CF000A20200050E0010758F84001C8FBF0058C3
66186+:102D00008FB300548FB200508FB1004C8FB0004889
66187+:102D100003E0000827BD00603C0280083445010044
66188+:102D20003C0280008C42014094A3000E0000302140
66189+:102D300000402021AF82001C3063FFFF3402FFFF00
66190+:102D4000106200063C0760202402FFFFA4A2000ED0
66191+:102D500094A500EA0A00090130A5FFFF03E000087E
66192+:102D60000000000027BDFFC83C0280003C06800830
66193+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
66194+:102D8000AFB30024AFB20020AFB00018345101003F
66195+:102D900034C501008C4301008E2200148CA400E491
66196+:102DA0000000A821AF83001C0044102318400052EB
66197+:102DB000A38000188E22001400005021ACA200E471
66198+:102DC00090C3000890A200D53073007FA3A200102A
66199+:102DD0008CB200E08CB400E4304200FF1053003BA2
66200+:102DE00093A200108F83001C2407FF80000211C0F3
66201+:102DF0000062102124420240246300400047102456
66202+:102E00003063007F3C0980003C08800A006818217C
66203+:102E1000AD2200248C62003427A4001427A50010E2
66204+:102E2000024280210290102304400028AFA3001426
66205+:102E30009062003C00E21024304200FF1440001970
66206+:102E4000020090219062003C34420040A062003CAD
66207+:102E50008F86001C93A3001024C200403042007FE4
66208+:102E6000004828213C0208008C4200F42463000141
66209+:102E7000306400FF14820002A3A30010A3A000107E
66210+:102E800093A20010AFA50014000211C0244202401A
66211+:102E900000C2102100471024AD2200240A000B4577
66212+:102EA00093A200100E0007C3000000003C0280083F
66213+:102EB00034420100AC5000E093A30010240A00014A
66214+:102EC000A04300D50A000B4593A200102402000184
66215+:102ED000154200093C0380008C6202780440FFFE2A
66216+:102EE0008F82001CAC62024024020002A0620244F5
66217+:102EF0003C021000AC6202789222000B2403000214
66218+:102F0000304200FF144300720000000096220008C7
66219+:102F1000304300FF24020082146200402402008437
66220+:102F20003C028000344901008D22000C95230006EC
66221+:102F3000000216023063FFFF3045003F24020027E5
66222+:102F400010A2000FAF83001428A200281040000830
66223+:102F5000240200312402002110A2000924020025CD
66224+:102F600010A20007938200190A000BBD00000000A8
66225+:102F700010A20007938200190A000BBD0000000098
66226+:102F80000E000777012020210A000C3D0000000000
66227+:102F90003C0380008C6202780440FFFE8F82001C9C
66228+:102FA000AC62024024020002A06202443C02100013
66229+:102FB000AC6202780A000C3D000000009523000678
66230+:102FC000912400058D25000C8D2600108D270018FA
66231+:102FD0008D28001C8D290020244200013C0108009E
66232+:102FE000A42356C63C010800A02456C53C01080095
66233+:102FF000AC2556CC3C010800AC2656D03C0108005C
66234+:10300000AC2756D83C010800AC2856DC3C0108002F
66235+:10301000AC2956E00A000C3DA38200191462000A94
66236+:10302000240200813C02800834420100944500EAF9
66237+:10303000922600058F84001C30A5FFFF30C600FFDC
66238+:103040000A000BFE3C0760211462005C00000000D7
66239+:103050009222000A304300FF306200201040000737
66240+:10306000306200403C02800834420100944500EA8E
66241+:103070008F84001C0A000BFC24060040104000074F
66242+:10308000000316003C02800834420100944500EA27
66243+:103090008F84001C0A000BFC24060041000216036A
66244+:1030A000044100463C02800834420100944500EA95
66245+:1030B0008F84001C2406004230A5FFFF3C076019E6
66246+:1030C0000E000901000000000A000C3D0000000095
66247+:1030D0009222000B24040016304200FF1044000628
66248+:1030E0003C0680009222000B24030017304200FFB0
66249+:1030F000144300320000000034C5010090A2000B10
66250+:10310000304200FF1444000B000080218CA20020FC
66251+:103110008CA400202403FF800043102400021140EF
66252+:103120003084007F004410253C032000004310251C
66253+:10313000ACC2083094A2000800021400000214037C
66254+:10314000044200012410000194A2000830420080D3
66255+:103150005040001A0200A82194A20008304220002A
66256+:10316000504000160200A8218CA300183C021C2D20
66257+:10317000344219ED106200110200A8213C0208003F
66258+:103180008C4200D4104000053C0280082403000457
66259+:1031900034420100A04300FC3C028008344201009C
66260+:1031A000944500EA8F84001C2406000630A5FFFF2A
66261+:1031B0000E0009013C0760210200A8210E00093918
66262+:1031C000000000009222000A304200081040000473
66263+:1031D00002A010210E0013790000000002A01021AF
66264+:1031E0008FBF00308FB5002C8FB400288FB3002420
66265+:1031F0008FB200208FB1001C8FB0001803E00008D0
66266+:1032000027BD00382402FF80008220243C02900069
66267+:1032100034420007008220253C028000AC4400209C
66268+:103220003C0380008C6200200440FFFE0000000090
66269+:1032300003E00008000000003C0380002402FF803F
66270+:10324000008220243462000700822025AC64002024
66271+:103250008C6200200440FFFE0000000003E0000834
66272+:103260000000000027BDFFD8AFB3001CAFB10014B1
66273+:10327000AFB00010AFBF0020AFB200183C1180000B
66274+:103280003C0280088E32002034530100AE2400201E
66275+:10329000966300EA000514003C074000004738250B
66276+:1032A00000A08021000030210E0009013065FFFFE1
66277+:1032B000240200A1160200022402FFFFA2620009FC
66278+:1032C000AE3200208FBF00208FB3001C8FB20018D9
66279+:1032D0008FB100148FB0001003E0000827BD002854
66280+:1032E0003C0280082403000527BDFFE834420100AA
66281+:1032F000A04300FCAFBF00103C0280008C420100E4
66282+:10330000240500A1004020210E000C67AF82001CA4
66283+:103310003C0380008C6202780440FFFE8F82001C18
66284+:103320008FBF001027BD0018AC62024024020002CB
66285+:10333000A06202443C021000AC62027803E0000884
66286+:103340000000000027BDFFE83C068000AFBF001072
66287+:1033500034C7010094E20008304400FF3883008243
66288+:10336000388200842C6300012C4200010062182581
66289+:103370001060002D24020083938200195040003B0E
66290+:103380008FBF00103C020800904256CC8CC4010054
66291+:103390003C06080094C656C63045003F38A30032AC
66292+:1033A00038A2003F2C6300012C4200010062182566
66293+:1033B000AF84001CAF860014A380001914600007BE
66294+:1033C00000E020212402002014A2001200000000CE
66295+:1033D0003402FFFF14C2000F00000000240200208E
66296+:1033E00014A2000500E028218CE300142402FFFF52
66297+:1033F0005062000B8FBF00103C040800248456C0AC
66298+:10340000000030210E000706240700010A000CD638
66299+:103410008FBF00100E000777000000008FBF001064
66300+:103420000A00093927BD001814820004240200850F
66301+:103430008CC501040A000CE1000020211482000662
66302+:103440002482FF808CC50104240440008FBF00103B
66303+:103450000A00016727BD0018304200FF2C4200021D
66304+:1034600010400004240200228FBF00100A000B2726
66305+:1034700027BD0018148200048F8200248FBF001023
66306+:103480000A000C8627BD00188C42000C1040001E5C
66307+:1034900000E0282190E300092402001814620003D0
66308+:1034A000240200160A000CFC240300081462000722
66309+:1034B00024020017240300123C02800834420080DA
66310+:1034C000A04300090A000D0994A7000854620007F0
66311+:1034D00094A700088F82FF942404FFFE9043000508
66312+:1034E00000641824A043000594A7000890A6001BC0
66313+:1034F0008CA4000094A500068FBF001000073C00BC
66314+:103500000A0008DC27BD00188FBF001003E0000888
66315+:1035100027BD00188F8500243C04800094A2002A57
66316+:103520008CA30034000230C02402FFF000C210243B
66317+:1035300000621821AC83003C8CA200303C03800068
66318+:10354000AC8200383C02005034420010AC620030C3
66319+:103550000000000000000000000000008C6200007D
66320+:10356000304200201040FFFD30C20008104000062D
66321+:103570003C0280008C620408ACA200208C62040C27
66322+:103580000A000D34ACA200248C430400ACA300203C
66323+:103590008C420404ACA200243C0300203C028000C6
66324+:1035A000AC4300303C0480008C8200300043102487
66325+:1035B0001440FFFD8F8600243C020040AC820030A6
66326+:1035C00094C3002A94C2002894C4002C94C5002EF1
66327+:1035D00024630001004410213064FFFFA4C20028CE
66328+:1035E00014850002A4C3002AA4C0002A03E0000836
66329+:1035F000000000008F84002427BDFFE83C05800404
66330+:1036000024840010AFBF00100E000E472406000AED
66331+:103610008F840024948200129483002E3042000F85
66332+:10362000244200030043180424027FFF0043102BB0
66333+:1036300010400002AC8300000000000D0E000D13CE
66334+:10364000000000008F8300248FBF001027BD0018EA
66335+:10365000946200149463001A3042000F00021500B7
66336+:10366000006218253C02800003E00008AC4300A083
66337+:103670008F8300243C028004944400069462001A64
66338+:103680008C650000A4640016004410233042FFFF44
66339+:103690000045102B03E00008384200018F8400240D
66340+:1036A0003C0780049486001A8C85000094E2000692
66341+:1036B000A482001694E3000600C310233042FFFFEB
66342+:1036C0000045102B384200011440FFF8A483001677
66343+:1036D00003E00008000000008F8400243C02800406
66344+:1036E000944200069483001A8C850000A482001680
66345+:1036F000006210233042FFFF0045102B38420001CA
66346+:103700005040000D8F850024006030213C0780046C
66347+:1037100094E20006A482001694E3000600C310237E
66348+:103720003042FFFF0045102B384200011440FFF8E3
66349+:10373000A48300168F8500243C03800034620400BB
66350+:103740008CA40020AF820020AC6400388CA200243E
66351+:10375000AC62003C3C020005AC62003003E00008B3
66352+:10376000ACA000048F8400243C0300068C8200047B
66353+:1037700000021140004310253C038000AC62003081
66354+:103780000000000000000000000000008C6200004B
66355+:10379000304200101040FFFD34620400AC80000491
66356+:1037A00003E00008AF8200208F86002427BDFFE0E1
66357+:1037B000AFB10014AFB00010AFBF00188CC300044D
66358+:1037C0008CC500248F820020309000FF94C4001A22
66359+:1037D00024630001244200202484000124A7002047
66360+:1037E000ACC30004AF820020A4C4001AACC70024FC
66361+:1037F00004A100060000882104E2000594C2001A1A
66362+:103800008CC2002024420001ACC2002094C2001AE5
66363+:1038100094C300282E040001004310262C4200010E
66364+:10382000004410245040000594C2001A24020001F4
66365+:10383000ACC2000894C2001A94C300280010202BC8
66366+:10384000004310262C4200010044102514400007BC
66367+:10385000000000008CC20008144000042402001084
66368+:103860008CC300041462000F8F8500240E000DA786
66369+:10387000241100018F820024944300289442001AEE
66370+:1038800014430003000000000E000D1300000000B0
66371+:10389000160000048F8500240E000D840000000037
66372+:1038A0008F85002494A2001E94A4001C24420001D1
66373+:1038B0003043FFFF14640002A4A2001EA4A0001E57
66374+:1038C0001200000A3C02800494A2001494A3001A7F
66375+:1038D0003042000F00021500006218253C028000F3
66376+:1038E000AC4300A00A000E1EACA0000894420006E3
66377+:1038F00094A3001A8CA40000A4A200160062102356
66378+:103900003042FFFF0044102B384200011040000DF0
66379+:1039100002201021006030213C07800494E2000660
66380+:10392000A4A2001694E3000600C310233042FFFF58
66381+:103930000044102B384200011440FFF8A4A30016E5
66382+:10394000022010218FBF00188FB100148FB000101B
66383+:1039500003E0000827BD002003E00008000000008D
66384+:103960008F82002C3C03000600021140004310250A
66385+:103970003C038000AC62003000000000000000004A
66386+:10398000000000008C620000304200101040FFFD7B
66387+:1039900034620400AF82002803E00008AF80002CEE
66388+:1039A00003E000080000102103E000080000000010
66389+:1039B0003084FFFF30A5FFFF0000182110800007B2
66390+:1039C000000000003082000110400002000420428C
66391+:1039D000006518210A000E3D0005284003E000089C
66392+:1039E0000060102110C0000624C6FFFF8CA200005A
66393+:1039F00024A50004AC8200000A000E4724840004C1
66394+:103A000003E000080000000010A0000824A3FFFF4E
66395+:103A1000AC86000000000000000000002402FFFF50
66396+:103A20002463FFFF1462FFFA2484000403E000080B
66397+:103A3000000000003C0280083442008024030001A2
66398+:103A4000AC43000CA4430010A4430012A443001490
66399+:103A500003E00008A44300168F82002427BDFFD88E
66400+:103A6000AFB3001CAFB20018AFB10014AFB000107C
66401+:103A7000AFBF00208C47000C248200802409FF8007
66402+:103A80003C08800E3043007F008080213C0A80008B
66403+:103A9000004920240068182130B100FF30D200FF17
66404+:103AA00010E000290000982126020100AD44002CFE
66405+:103AB000004928243042007F004820219062000005
66406+:103AC00024030050304200FF1443000400000000B3
66407+:103AD000AD45002C948200EA3053FFFF0E000D84A8
66408+:103AE000000000008F8200248F83002000112C0032
66409+:103AF0009442001E001224003484000100A22825F4
66410+:103B00003C02400000A22825AC7000008FBF0020BE
66411+:103B1000AC6000048FB20018AC7300088FB10014C1
66412+:103B2000AC60000C8FB3001CAC6400108FB00010B0
66413+:103B3000AC60001424040001AC60001827BD00280C
66414+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
66415+:103B50008FB200188FB100148FB0001003E000087E
66416+:103B600027BD00283C06800034C201009043000FAE
66417+:103B7000240200101062000E2865001110A000073A
66418+:103B800024020012240200082405003A10620006F4
66419+:103B90000000302103E0000800000000240500358B
66420+:103BA0001462FFFC000030210A000E6400000000D7
66421+:103BB0008CC200748F83FF9424420FA003E000089E
66422+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
66423+:103BD000240500013C0480088FBF0010240200016E
66424+:103BE00034830080A462001227BD00182402000163
66425+:103BF00003E00008A080001A27BDFFE0AFB2001864
66426+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
66427+:103C10000E000332008088213C028008345000806E
66428+:103C20009202000924030004304200FF1443000CF8
66429+:103C30003C028008124000082402000A0E000E5BBD
66430+:103C400000000000920200052403FFFE0043102440
66431+:103C5000A202000524020012A20200093C02800810
66432+:103C600034420080022020210E00033DA0400027A6
66433+:103C700016400003022020210E000EBF00000000AD
66434+:103C800002202021324600FF8FBF001C8FB2001897
66435+:103C90008FB100148FB00010240500380A000E64A4
66436+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
66437+:103CB000AFB10014AFB000100E00033200808021BD
66438+:103CC0000E000E5B000000003C02800834450080BE
66439+:103CD00090A2000924120018305100FF1232000394
66440+:103CE0000200202124020012A0A2000990A20005D7
66441+:103CF0002403FFFE004310240E00033DA0A2000594
66442+:103D00000200202124050020163200070000302187
66443+:103D10008FBF001C8FB200188FB100148FB000103D
66444+:103D20000A00034227BD00208FBF001C8FB200187D
66445+:103D30008FB100148FB00010240500390A000E6402
66446+:103D400027BD002027BDFFE83C028000AFB0001077
66447+:103D5000AFBF0014344201009442000C2405003629
66448+:103D60000080802114400012304600FF0E00033214
66449+:103D7000000000003C02800834420080240300124E
66450+:103D8000A043000990430005346300100E000E5B51
66451+:103D9000A04300050E00033D020020210200202167
66452+:103DA0000E000342240500200A000F3C0000000022
66453+:103DB0000E000E64000000000E00033202002021FD
66454+:103DC0003C0280089043001B2405FF9F0200202135
66455+:103DD000006518248FBF00148FB00010A043001B93
66456+:103DE0000A00033D27BD001827BDFFE0AFBF001844
66457+:103DF000AFB10014AFB0001030B100FF0E000332BD
66458+:103E0000008080213C02800824030012344200809C
66459+:103E10000E000E5BA04300090E00033D02002021AE
66460+:103E200002002021022030218FBF00188FB1001422
66461+:103E30008FB00010240500350A000E6427BD002055
66462+:103E40003C0480089083000E9082000A1443000B0B
66463+:103E5000000028218F82FF942403005024050001D4
66464+:103E600090420000304200FF1443000400000000B4
66465+:103E70009082000E24420001A082000E03E00008A0
66466+:103E800000A010213C0380008C6201F80440FFFE7A
66467+:103E900024020002AC6401C0A06201C43C02100014
66468+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
66469+:103EB0003C128008AFB10014AFBF001CAFB00010BF
66470+:103EC00036510080922200092403000A304200FF8C
66471+:103ED0001443003E000000008E4300048E22003890
66472+:103EE000506200808FBF001C92220000240300500B
66473+:103EF000304200FF144300253C0280008C42014008
66474+:103F00008E4300043642010002202821AC43001CED
66475+:103F10009622005C8E2300383042FFFF00021040E2
66476+:103F200000621821AE23001C8E4300048E2400384A
66477+:103F30009622005C006418233042FFFF0003184300
66478+:103F4000000210400043102A10400006000000004C
66479+:103F50008E4200048E230038004310230A000FAA6B
66480+:103F6000000220439622005C3042FFFF0002204006
66481+:103F70003C0280083443010034420080ACA4002C91
66482+:103F8000A040002424020001A062000C0E000F5E7D
66483+:103F900000000000104000538FBF001C3C02800056
66484+:103FA0008C4401403C0380008C6201F80440FFFE19
66485+:103FB00024020002AC6401C0A06201C43C021000F3
66486+:103FC000AC6201F80A0010078FBF001C92220009A2
66487+:103FD00024030010304200FF144300043C02800020
66488+:103FE0008C4401400A000FEE0000282192220009B3
66489+:103FF00024030016304200FF14430006240200147C
66490+:10400000A22200093C0280008C4401400A001001F9
66491+:104010008FBF001C8E2200388E23003C00431023EB
66492+:10402000044100308FBF001C92220027244200016F
66493+:10403000A2220027922200272C42000414400016DE
66494+:104040003C1080009222000924030004304200FF4B
66495+:10405000144300093C0280008C4401408FBF001CC7
66496+:104060008FB200188FB100148FB000102405009398
66497+:104070000A000ECC27BD00208C440140240500938B
66498+:104080008FBF001C8FB200188FB100148FB00010CA
66499+:104090000A000F4827BD00208E0401400E000332A5
66500+:1040A000000000008E4200042442FFFFAE420004E4
66501+:1040B0008E22003C2442FFFFAE22003C0E00033D56
66502+:1040C0008E0401408E0401408FBF001C8FB2001887
66503+:1040D0008FB100148FB00010240500040A000342C1
66504+:1040E00027BD00208FB200188FB100148FB00010D0
66505+:1040F00003E0000827BD00203C0680008CC2018838
66506+:104100003C038008346500809063000E00021402B6
66507+:10411000304400FF306300FF1464000E3C0280084E
66508+:1041200090A20026304200FF104400098F82FF94C5
66509+:10413000A0A400262403005090420000304200FF5B
66510+:1041400014430006000000000A0005A18CC4018091
66511+:104150003C02800834420080A044002603E00008AE
66512+:104160000000000027BDFFE030E700FFAFB20018FD
66513+:10417000AFBF001CAFB10014AFB0001000809021A1
66514+:1041800014E0000630C600FF000000000000000D33
66515+:10419000000000000A001060240001163C038008A3
66516+:1041A0009062000E304200FF14460023346200800B
66517+:1041B00090420026304200FF1446001F000000001D
66518+:1041C0009062000F304200FF1446001B0000000008
66519+:1041D0009062000A304200FF144600038F90FF9463
66520+:1041E0000000000D8F90FF948F82FF983C1180009B
66521+:1041F000AE05003CAC450000A066000A0E0003328C
66522+:104200008E240100A20000240E00033D8E24010034
66523+:104210003C0380008C6201F80440FFFE240200028F
66524+:10422000AC7201C0A06201C43C021000AC6201F893
66525+:104230000A0010618FBF001C000000000000000D8C
66526+:10424000000000002400013F8FBF001C8FB2001847
66527+:104250008FB100148FB0001003E0000827BD0020CC
66528+:104260008F83FF943C0280008C44010034420100A3
66529+:104270008C65003C9046001B0A00102724070001B3
66530+:104280003C0280089043000E9042000A0043102632
66531+:10429000304200FF03E000080002102B27BDFFE0C2
66532+:1042A0003C028008AFB10014AFB00010AFBF0018DF
66533+:1042B0003450008092020005240300303042003068
66534+:1042C00014430085008088218F8200248C42000CDA
66535+:1042D000104000828FBF00180E000D840000000007
66536+:1042E0008F860020ACD100009202000892030009E2
66537+:1042F000304200FF00021200306300FF004310252F
66538+:10430000ACC200049202004D000216000002160327
66539+:1043100004410005000000003C0308008C630048D5
66540+:104320000A00109F3C1080089202000830420040B2
66541+:10433000144000030000182192020027304300FFC0
66542+:104340003C108008361100809222004D00031E00B0
66543+:10435000304200FF0002140000621825ACC30008C0
66544+:104360008E2400308F820024ACC4000C8E250034D3
66545+:104370009443001E3C02C00BACC50010006218251F
66546+:104380008E22003800002021ACC200148E22003C96
66547+:10439000ACC200180E000DB8ACC3001C8E020004A5
66548+:1043A0008F8400203C058000AC8200008E2200201B
66549+:1043B000AC8200048E22001CAC8200088E220058C1
66550+:1043C0008CA3007400431021AC82000C8E22002CC0
66551+:1043D000AC8200108E2200408E23004400021400A4
66552+:1043E00000431025AC8200149222004D240300806B
66553+:1043F000304200FF1443000400000000AC800018AD
66554+:104400000A0010E38F8200248E23000C2402000196
66555+:104410001062000E2402FFFF92220008304200408A
66556+:104420001440000A2402FFFF8E23000C8CA20074AB
66557+:10443000006218233C0208000062102414400002AD
66558+:10444000000028210060282100051043AC820018DC
66559+:104450008F820024000020219443001E3C02C00CE7
66560+:10446000006218258F8200200E000DB8AC43001C9E
66561+:104470003C038008346201008C4200008F850020DC
66562+:10448000346300808FBF0018ACA20000ACA0000411
66563+:104490008C6400488F8200248FB10014ACA4000803
66564+:1044A000ACA0000CACA00010906300059446001E68
66565+:1044B0003C02400D00031E0000C23025ACA30014D6
66566+:1044C0008FB00010ACA0001824040001ACA6001CA2
66567+:1044D0000A000DB827BD00208FBF00188FB100144F
66568+:1044E0008FB0001003E0000827BD00203C028000D0
66569+:1044F0009443007C3C02800834460100308400FF75
66570+:104500003065FFFF2402000524A34650A0C4000C20
66571+:104510005482000C3065FFFF90C2000D2C42000752
66572+:104520001040000724A30A0090C3000D24020014C9
66573+:104530000062100400A210210A00111F3045FFFF85
66574+:104540003065FFFF3C0280083442008003E0000831
66575+:10455000A44500143C03800834680080AD05003891
66576+:10456000346701008CE2001C308400FF00A210239D
66577+:104570001840000330C600FF24A2FFFCACE2001C80
66578+:1045800030820001504000083C0380088D02003C4E
66579+:1045900000A2102304410012240400058C620004D0
66580+:1045A00010A2000F3C0380088C62000414A2001EBD
66581+:1045B000000000003C0208008C4200D8304200207D
66582+:1045C000104000093C0280083462008090630008BB
66583+:1045D0009042004C144300043C0280082404000470
66584+:1045E0000A00110900000000344300803442010039
66585+:1045F000A040000C24020001A462001410C0000AB4
66586+:104600003C0280008C4401003C0380008C6201F875
66587+:104610000440FFFE24020002AC6401C0A06201C499
66588+:104620003C021000AC6201F803E00008000000004A
66589+:1046300027BDFFE800A61823AFBF00101860008058
66590+:10464000308800FF3C02800834470080A0E000244E
66591+:1046500034440100A0E000278C82001C00A210233B
66592+:1046600004400056000000008CE2003C94E3005C33
66593+:104670008CE4002C004530233063FFFF00C3182179
66594+:104680000083202B1080000400E018218CE2002C15
66595+:104690000A00117800A2102194E2005C3042FFFF72
66596+:1046A00000C2102100A21021AC62001C3C02800854
66597+:1046B000344400809482005C8C83001C3042FFFFF5
66598+:1046C0000002104000A210210043102B10400004F3
66599+:1046D000000000008C82001C0A00118B3C06800840
66600+:1046E0009482005C3042FFFF0002104000A21021C3
66601+:1046F0003C06800834C3010034C70080AC82001C33
66602+:10470000A060000CACE500388C62001C00A21023F5
66603+:104710001840000224A2FFFCAC62001C3102000120
66604+:10472000104000083C0380088CE2003C00A21023EB
66605+:1047300004410012240400058CC2000410A20010E1
66606+:104740008FBF00108C62000414A2004F8FBF0010B6
66607+:104750003C0208008C4200D8304200201040000A81
66608+:104760003C02800834620080906300089042004C54
66609+:10477000144300053C028008240400048FBF00108D
66610+:104780000A00110927BD001834430080344201009B
66611+:10479000A040000C24020001A46200143C0280002E
66612+:1047A0008C4401003C0380008C6201F80440FFFE51
66613+:1047B000240200020A0011D8000000008CE2001C54
66614+:1047C000004610230043102B54400001ACE5001CB0
66615+:1047D00094E2005C3042FFFF0062102B144000079F
66616+:1047E0002402000294E2005C8CE3001C3042FFFFD4
66617+:1047F00000621821ACE3001C24020002ACE5003882
66618+:104800000E000F5EA082000C1040001F8FBF001032
66619+:104810003C0280008C4401003C0380008C6201F863
66620+:104820000440FFFE24020002AC6401C0A06201C487
66621+:104830003C021000AC6201F80A0011F08FBF0010BA
66622+:1048400031020010104000108FBF00103C028008A1
66623+:10485000344500808CA3001C94A2005C00661823E1
66624+:104860003042FFFF006218213C023FFF3444FFFF4B
66625+:104870000083102B544000010080182100C3102138
66626+:10488000ACA2001C8FBF001003E0000827BD001879
66627+:1048900027BDFFE800C0402100A63023AFBF0010B5
66628+:1048A00018C00026308A00FF3C028008344900808E
66629+:1048B0008D24001C8D23002C008820230064182BDD
66630+:1048C0001060000F344701008CE2002000461021E8
66631+:1048D000ACE200208CE200200044102B1440000BBE
66632+:1048E0003C023FFF8CE2002000441023ACE2002099
66633+:1048F0009522005C3042FFFF0A0012100082202146
66634+:10490000ACE00020008620213C023FFF3443FFFF43
66635+:104910000064102B54400001006020213C028008FC
66636+:104920003442008000851821AC43001CA0400024C4
66637+:10493000A04000270A0012623C03800831420010A8
66638+:10494000104000433C0380083C06800834C40080CB
66639+:104950008C82003C004810235840003E34660080A2
66640+:104960009082002424420001A0820024908200242E
66641+:104970003C0308008C630024304200FF0043102BEE
66642+:10498000144000688FBF001034C201008C42001C2C
66643+:1049900000A2102318400063000000008CC3000434
66644+:1049A0009482005C006818233042FFFF0003184324
66645+:1049B000000210400043102A1040000500000000D3
66646+:1049C0008CC20004004810230A0012450002104364
66647+:1049D0009482005C3042FFFF000210403C068008D9
66648+:1049E000AC82002C34C5008094A2005C8CA4002C06
66649+:1049F00094A3005C3042FFFF00021040008220219F
66650+:104A00003063FFFF0083202101041021ACA2001CB1
66651+:104A10008CC2000434C60100ACC2001C2402000297
66652+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
66653+:104A30003C0280008C4401003C0380008C6201F841
66654+:104A40000440FFFE240200020A001292000000004F
66655+:104A500034660080ACC50038346401008C82001CD0
66656+:104A600000A210231840000224A2FFFCAC82001C0C
66657+:104A7000314200015040000A3C0380088CC2003CD7
66658+:104A800000A2102304430014240400058C620004D7
66659+:104A900014A200033C0380080A00128424040005C9
66660+:104AA0008C62000414A2001F8FBF00103C0208009B
66661+:104AB0008C4200D8304200201040000A3C0280089E
66662+:104AC00034620080906300089042004C144300055B
66663+:104AD0003C028008240400048FBF00100A00110962
66664+:104AE00027BD00183443008034420100A040000C70
66665+:104AF00024020001A46200143C0280008C440100E6
66666+:104B00003C0380008C6201F80440FFFE2402000296
66667+:104B1000AC6401C0A06201C43C021000AC6201F8A8
66668+:104B20008FBF001003E0000827BD001827BDFFE875
66669+:104B30003C0A8008AFBF0010354900808D22003C40
66670+:104B400000C04021308400FF004610231840009D23
66671+:104B500030E700FF354701002402000100A63023A2
66672+:104B6000A0E0000CA0E0000DA522001418C0002455
66673+:104B7000308200108D23001C8D22002C0068182329
66674+:104B80000043102B1040000F000000008CE20020BA
66675+:104B900000461021ACE200208CE200200043102BE4
66676+:104BA0001440000B3C023FFF8CE200200043102326
66677+:104BB000ACE200209522005C3042FFFF0A0012C1E7
66678+:104BC00000621821ACE00020006618213C023FFF83
66679+:104BD0003446FFFF00C3102B5440000100C01821D1
66680+:104BE0003C0280083442008000651821AC43001C60
66681+:104BF000A0400024A04000270A00130F3C038008B7
66682+:104C0000104000403C0380088D22003C00481023E7
66683+:104C10005840003D34670080912200242442000166
66684+:104C2000A1220024912200243C0308008C6300246C
66685+:104C3000304200FF0043102B1440009A8FBF001039
66686+:104C40008CE2001C00A21023184000960000000017
66687+:104C50008D4300049522005C006818233042FFFF5A
66688+:104C600000031843000210400043102A10400005C2
66689+:104C7000012020218D420004004810230A0012F276
66690+:104C8000000210439522005C3042FFFF00021040FA
66691+:104C90003C068008AC82002C34C5008094A2005CE5
66692+:104CA0008CA4002C94A3005C3042FFFF0002104053
66693+:104CB000008220213063FFFF0083182101031021AF
66694+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
66695+:104CD000240200020E000F5EA0C2000C1040007102
66696+:104CE0008FBF00103C0280008C4401003C03800018
66697+:104CF0008C6201F80440FFFE240200020A0013390E
66698+:104D00000000000034670080ACE500383466010024
66699+:104D10008CC2001C00A210231840000224A2FFFC39
66700+:104D2000ACC2001C30820001504000083C038008E7
66701+:104D30008CE2003C00A2102304430051240400052F
66702+:104D40008C62000410A2003E3C0380088C620004C8
66703+:104D500054A200548FBF00103C0208008C4200D8BF
66704+:104D600030420020104000063C028008346200807F
66705+:104D7000906300089042004C104300403C028008C1
66706+:104D80003443008034420100A040000C24020001A2
66707+:104D9000A46200143C0280008C4401003C038000AB
66708+:104DA0008C6201F80440FFFE24020002AC6401C0E2
66709+:104DB000A06201C43C021000AC6201F80A00137743
66710+:104DC0008FBF001024020005A120002714E2000A72
66711+:104DD0003C038008354301009062000D2C42000620
66712+:104DE000504000053C0380089062000D2442000101
66713+:104DF000A062000D3C03800834670080ACE50038F9
66714+:104E0000346601008CC2001C00A21023184000026E
66715+:104E100024A2FFFCACC2001C308200015040000AFA
66716+:104E20003C0380088CE2003C00A2102304410014E3
66717+:104E3000240400058C62000414A200033C038008D3
66718+:104E40000A00136E240400058C62000414A20015ED
66719+:104E50008FBF00103C0208008C4200D83042002076
66720+:104E60001040000A3C028008346200809063000811
66721+:104E70009042004C144300053C02800824040004C6
66722+:104E80008FBF00100A00110927BD001834430080AD
66723+:104E900034420100A040000C24020001A46200146E
66724+:104EA0008FBF001003E0000827BD00183C0B8008EE
66725+:104EB00027BDFFE83C028000AFBF00103442010074
66726+:104EC000356A00809044000A356901008C45001461
66727+:104ED0008D4800389123000C308400FF0105102319
66728+:104EE0001C4000B3306700FF2CE20006504000B1C8
66729+:104EF0008FBF00102402000100E2300430C2000322
66730+:104F00005440000800A8302330C2000C144000A117
66731+:104F100030C20030144000A38FBF00100A00143BC1
66732+:104F20000000000018C00024308200108D43001CD7
66733+:104F30008D42002C006818230043102B1040000FF6
66734+:104F4000000000008D22002000461021AD2200202C
66735+:104F50008D2200200043102B1440000B3C023FFF29
66736+:104F60008D22002000431023AD2200209542005CDA
66737+:104F70003042FFFF0A0013AF00621821AD2000206D
66738+:104F8000006618213C023FFF3446FFFF00C3102B90
66739+:104F90005440000100C018213C02800834420080C7
66740+:104FA00000651821AC43001CA0400024A04000274D
66741+:104FB0000A0013FD3C038008104000403C038008B9
66742+:104FC0008D42003C004810231840003D34670080AB
66743+:104FD0009142002424420001A14200249142002475
66744+:104FE0003C0308008C630024304200FF0043102B78
66745+:104FF000144000708FBF00108D22001C00A21023EF
66746+:105000001840006C000000008D6300049542005CB5
66747+:10501000006818233042FFFF0003184300021040CD
66748+:105020000043102A10400005014020218D62000439
66749+:10503000004810230A0013E0000210439542005C70
66750+:105040003042FFFF000210403C068008AC82002C7A
66751+:1050500034C5008094A2005C8CA4002C94A3005C56
66752+:105060003042FFFF00021040008220213063FFFF2A
66753+:105070000083182101031021ACA2001C8CC2000483
66754+:1050800034C60100ACC2001C240200020E000F5EF8
66755+:10509000A0C2000C104000478FBF00103C028000EF
66756+:1050A0008C4401003C0380008C6201F80440FFFE48
66757+:1050B000240200020A00142D000000003467008062
66758+:1050C000ACE50038346601008CC2001C00A210233D
66759+:1050D0001840000224A2FFFCACC2001C3082000178
66760+:1050E0005040000A3C0380088CE2003C00A21023E0
66761+:1050F00004430014240400058C62000414A200037D
66762+:105100003C0380080A00141F240400058C6200047C
66763+:1051100014A200288FBF00103C0208008C4200D867
66764+:10512000304200201040000A3C02800834620080B7
66765+:10513000906300089042004C144300053C02800834
66766+:10514000240400048FBF00100A00110927BD0018B5
66767+:105150003443008034420100A040000C24020001CE
66768+:10516000A46200143C0280008C4401003C038000D7
66769+:105170008C6201F80440FFFE24020002AC6401C00E
66770+:10518000A06201C43C021000AC6201F80A00143BAA
66771+:105190008FBF00108FBF0010010030210A00115A8C
66772+:1051A00027BD0018010030210A00129927BD001800
66773+:1051B0008FBF001003E0000827BD00183C038008E3
66774+:1051C0003464010024020003A082000C8C620004FD
66775+:1051D00003E00008AC82001C3C05800834A300807A
66776+:1051E0009062002734A501002406004324420001F8
66777+:1051F000A0620027906300273C0208008C42004810
66778+:10520000306300FF146200043C07602194A500EAAB
66779+:105210000A00090130A5FFFF03E0000800000000BC
66780+:1052200027BDFFE8AFBF00103C0280000E00144411
66781+:105230008C4401803C02800834430100A060000CD3
66782+:105240008C4200048FBF001027BD001803E0000847
66783+:10525000AC62001C27BDFFE03C028008AFBF001815
66784+:10526000AFB10014AFB000103445008034460100E7
66785+:105270003C0880008D09014090C3000C8CA4003CC8
66786+:105280008CA200381482003B306700FF9502007C3E
66787+:1052900090A30027146000093045FFFF2402000599
66788+:1052A00054E200083C04800890C2000D2442000132
66789+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
66790+:1052C0003C048008348201009042000C2403000555
66791+:1052D000304200FF1443000A24A205DC348300801E
66792+:1052E000906200272C4200075040000524A20A00CB
66793+:1052F00090630027240200140062100400A2102111
66794+:105300003C108008361000803045FFFF012020212E
66795+:105310000E001444A60500149602005C8E030038AB
66796+:105320003C1180003042FFFF000210400062182153
66797+:10533000AE03001C0E0003328E24014092020025B1
66798+:1053400034420040A20200250E00033D8E2401409D
66799+:105350008E2401403C0380008C6201F80440FFFE73
66800+:1053600024020002AC6401C0A06201C43C0210002F
66801+:10537000AC6201F88FBF00188FB100148FB000101D
66802+:1053800003E0000827BD00203C0360103C02080039
66803+:1053900024420174AC62502C8C6250003C048000AA
66804+:1053A00034420080AC6250003C0208002442547C2D
66805+:1053B0003C010800AC2256003C020800244254384C
66806+:1053C0003C010800AC2256043C020002AC840008F8
66807+:1053D000AC82000C03E000082402000100A0302190
66808+:1053E0003C1C0800279C56083C0200023C050400B7
66809+:1053F00000852826008220260004102B2CA5000101
66810+:105400002C840001000210803C0308002463560035
66811+:105410000085202500431821108000030000102182
66812+:10542000AC6600002402000103E000080000000058
66813+:105430003C1C0800279C56083C0200023C05040066
66814+:1054400000852826008220260004102B2CA50001B0
66815+:105450002C840001000210803C03080024635600E5
66816+:105460000085202500431821108000050000102130
66817+:105470003C02080024425438AC62000024020001BF
66818+:1054800003E00008000000003C0200023C030400AE
66819+:1054900000821026008318262C4200012C63000194
66820+:1054A000004310251040000B000028213C1C080080
66821+:1054B000279C56083C0380008C62000824050001EC
66822+:1054C00000431025AC6200088C62000C00441025DB
66823+:1054D000AC62000C03E0000800A010213C1C080096
66824+:1054E000279C56083C0580008CA3000C0004202754
66825+:1054F000240200010064182403E00008ACA3000C9F
66826+:105500003C020002148200063C0560008CA208D018
66827+:105510002403FFFE0043102403E00008ACA208D0DF
66828+:105520003C02040014820005000000008CA208D098
66829+:105530002403FFFD00431024ACA208D003E00008C0
66830+:10554000000000003C02601A344200108C430080CE
66831+:1055500027BDFFF88C440084AFA3000093A3000094
66832+:10556000240200041462001AAFA4000493A20001F4
66833+:105570001040000797A300023062FFFC3C0380004C
66834+:10558000004310218C4200000A001536AFA200042F
66835+:105590003062FFFC3C03800000431021AC4400005B
66836+:1055A000A3A000003C0560008CA208D02403FFFEED
66837+:1055B0003C04601A00431024ACA208D08FA300045E
66838+:1055C0008FA2000034840010AC830084AC82008081
66839+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
66840+:1055E0003C1C0800279C56083C0280008C43000CA1
66841+:1055F0008C420004004318243C0200021060001496
66842+:10560000006228243C0204003C04000210A00005B3
66843+:10561000006210243C0208008C4256000A00155B10
66844+:1056200000000000104000073C0404003C02080099
66845+:105630008C4256040040F809000000000A00156082
66846+:10564000000000000000000D3C1C0800279C5608CC
66847+:105650008FBF001003E0000827BD0018800802403B
66848+:1056600080080100800800808008000000000C8095
66849+:105670000000320008000E9808000EF408000F88A1
66850+:1056800008001028080010748008010080080080BD
66851+:10569000800800000A000028000000000000000050
66852+:1056A0000000000D6370362E322E316200000000C3
66853+:1056B00006020104000000000000000000000000DD
66854+:1056C000000000000000000038003C000000000066
66855+:1056D00000000000000000000000000000000020AA
66856+:1056E00000000000000000000000000000000000BA
66857+:1056F00000000000000000000000000000000000AA
66858+:10570000000000000000000021003800000000013F
66859+:105710000000002B000000000000000400030D400A
66860+:105720000000000000000000000000000000000079
66861+:105730000000000000000000100000030000000056
66862+:105740000000000D0000000D3C020800244259AC8E
66863+:105750003C03080024635BF4AC4000000043202BB2
66864+:105760001480FFFD244200043C1D080037BD9FFC4F
66865+:1057700003A0F0213C100800261000A03C1C0800EB
66866+:10578000279C59AC0E0002F6000000000000000D3E
66867+:1057900027BDFFB4AFA10000AFA20004AFA3000873
66868+:1057A000AFA4000CAFA50010AFA60014AFA700185F
66869+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
66870+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
66871+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
66872+:1057E0000E000820000000008FBF00488FBC00445E
66873+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
66874+:105800008FAD00308FAC002C8FAB00288FAA002406
66875+:105810008FA900208FA8001C8FA700188FA6001446
66876+:105820008FA500108FA4000C8FA300088FA2000486
66877+:105830008FA1000027BD004C3C1B60188F7A5030B0
66878+:10584000377B502803400008AF7A000000A01821E1
66879+:1058500000801021008028213C0460003C0760008B
66880+:105860002406000810600006348420788C42000072
66881+:10587000ACE220088C63000003E00008ACE3200CDD
66882+:105880000A000F8100000000240300403C02600079
66883+:1058900003E00008AC4320003C0760008F86000452
66884+:1058A0008CE520740086102100A2182B14600007DC
66885+:1058B000000028218F8AFDA024050001A1440013C7
66886+:1058C0008F89000401244021AF88000403E0000810
66887+:1058D00000A010218F84FDA08F8500049086001306
66888+:1058E00030C300FF00A31023AF82000403E00008D0
66889+:1058F000A08000138F84FDA027BDFFE8AFB000108B
66890+:10590000AFBF001490890011908700112402002875
66891+:10591000312800FF3906002830E300FF2485002CE1
66892+:105920002CD00001106200162484001C0E00006EB2
66893+:10593000000000008F8FFDA03C05600024020204DF
66894+:1059400095EE003E95ED003C000E5C0031ACFFFF93
66895+:10595000016C5025ACAA2010520000012402000462
66896+:10596000ACA22000000000000000000000000000C9
66897+:105970008FBF00148FB0001003E0000827BD00188F
66898+:105980000A0000A6000028218F85FDA027BDFFD8B2
66899+:10599000AFBF0020AFB3001CAFB20018AFB100140E
66900+:1059A000AFB000100080982190A4001124B0001C1A
66901+:1059B00024B1002C308300FF386200280E000090D4
66902+:1059C0002C5200010E00009800000000020020216F
66903+:1059D0001240000202202821000028210E00006E43
66904+:1059E000000000008F8DFDA03C0880003C05600099
66905+:1059F00095AC003E95AB003C02683025000C4C0095
66906+:105A0000316AFFFF012A3825ACA7201024020202C8
66907+:105A1000ACA6201452400001240200028FBF0020D7
66908+:105A20008FB3001C8FB200188FB100148FB000101C
66909+:105A300027BD002803E00008ACA2200027BDFFE03E
66910+:105A4000AFB20018AFB10014AFB00010AFBF001C70
66911+:105A50003C1160008E2320748F82000430D0FFFF41
66912+:105A600030F2FFFF1062000C2406008F0E00006E63
66913+:105A7000000000003C06801F0010440034C5FF00F9
66914+:105A80000112382524040002AE2720100000302126
66915+:105A9000AE252014AE2420008FBF001C8FB200184A
66916+:105AA0008FB100148FB0001000C0102103E0000877
66917+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
66918+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
66919+:105AD00000102400009180253C036000AC70201071
66920+:105AE0008FBF00188FB100148FB000102402000483
66921+:105AF000AC62200027BD002003E000080000102158
66922+:105B000027BDFFE03C046018AFBF0018AFB1001420
66923+:105B1000AFB000108C8850002403FF7F34028071E6
66924+:105B20000103382434E5380C241F00313C1980006F
66925+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
66926+:105B40000E00054CAF9100400E00050A3C116000AC
66927+:105B50000E00007D000000008E3008083C0F570941
66928+:105B60002418FFF00218602435EEE00035EDF00057
66929+:105B7000018E5026018D58262D4600012D69000109
66930+:105B8000AF86004C0E000D09AF8900503C06601630
66931+:105B90008CC700003C0860148D0500A03C03FFFF8B
66932+:105BA00000E320243C02535300052FC2108200550D
66933+:105BB00034D07C00960201F2A780006C10400003F4
66934+:105BC000A780007C384B1E1EA78B006C960201F844
66935+:105BD000104000048F8D0050384C1E1EA78C007C96
66936+:105BE0008F8D005011A000058F83004C240E0020E3
66937+:105BF000A78E007CA78E006C8F83004C1060000580
66938+:105C00009785007C240F0020A78F007CA78F006C55
66939+:105C10009785007C2CB8008153000001240500808A
66940+:105C20009784006C2C91040152200001240404008C
66941+:105C30001060000B3C0260008FBF00188FB1001491
66942+:105C40008FB0001027BD0020A784006CA785007CC2
66943+:105C5000A380007EA780007403E00008A780009264
66944+:105C60008C4704382419103C30FFFFFF13F9000360
66945+:105C700030A8FFFF1100004624030050A380007EDF
66946+:105C80009386007E50C00024A785007CA780007CFE
66947+:105C90009798007CA780006CA7800074A780009272
66948+:105CA0003C010800AC3800800E00078700000000AF
66949+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
66950+:105CC000260C0388356A00100000482100002821B6
66951+:105CD00001AE20243C105709AF8C0010AF8A004859
66952+:105CE000AF89001810900023AF8500148FBF0018F3
66953+:105CF0008FB100148FB0001027BD002003E0000812
66954+:105D0000AF80005400055080014648218D260004D4
66955+:105D10000A00014800D180219798007CA784006C7C
66956+:105D2000A7800074A78000923C010800AC38008076
66957+:105D30000E000787000000003C0F60008DED080892
66958+:105D4000240EFFF03C0B600E260C0388356A001011
66959+:105D5000000048210000282101AE20243C105709F2
66960+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
66961+:105D7000AF85001424110001AF9100548FBF0018AB
66962+:105D80008FB100148FB0001003E0000827BD002081
66963+:105D90000A00017BA383007E3083FFFF8F880040D1
66964+:105DA0008F87003C000321403C0580003C020050EE
66965+:105DB000008248253C0660003C0A010034AC040027
66966+:105DC0008CCD08E001AA58241160000500000000F5
66967+:105DD0008CCF08E024E7000101EA7025ACCE08E092
66968+:105DE0008D19001001805821ACB900388D180014AD
66969+:105DF000ACB8003CACA9003000000000000000007E
66970+:105E00000000000000000000000000000000000092
66971+:105E100000000000000000003C0380008C640000D3
66972+:105E2000308200201040FFFD3C0F60008DED08E047
66973+:105E30003C0E010001AE18241460FFE100000000D8
66974+:105E4000AF87003C03E00008AF8B00588F8500400F
66975+:105E5000240BFFF03C06800094A7001A8CA90024B4
66976+:105E600030ECFFFF000C38C000EB5024012A402129
66977+:105E7000ACC8003C8CA400248CC3003C00831023DD
66978+:105E800018400033000000008CAD002025A2000166
66979+:105E90003C0F0050ACC2003835EE00103C068000CC
66980+:105EA000ACCE003000000000000000000000000048
66981+:105EB00000000000000000000000000000000000E2
66982+:105EC000000000003C0480008C9900003338002062
66983+:105ED0001300FFFD30E20008104000173C0980006D
66984+:105EE0008C880408ACA800108C83040CACA30014AC
66985+:105EF0003C1900203C188000AF19003094AE001807
66986+:105F000094AF001C01CF3021A4A6001894AD001A54
66987+:105F100025A70001A4A7001A94AB001A94AC001E98
66988+:105F2000118B00030000000003E0000800000000E7
66989+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
66990+:105F40008D240404ACA400140A0002183C1900209B
66991+:105F50008CA200200A0002003C0F00500A0001EE53
66992+:105F60000000000027BDFFE8AFBF00100E000232A6
66993+:105F7000000000008F8900408FBF00103C038000AC
66994+:105F8000A520000A9528000A9527000427BD0018BF
66995+:105F90003105FFFF30E6000F0006150000A22025A6
66996+:105FA00003E00008AC6400803C0508008CA50020DC
66997+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
66998+:105FC00010A300100000802124040001020430040A
66999+:105FD00000A6202400C3102450440006261000010F
67000+:105FE000001018802787FDA41480000A006718217C
67001+:105FF000261000012E0900025520FFF38F83000CAC
67002+:10600000AF85000C8FBF00148FB0001003E00008B4
67003+:1060100027BD00188C6800003C058000ACA8002457
67004+:106020000E000234261000013C0508008CA500205B
67005+:106030000A0002592E0900022405000100851804F7
67006+:106040003C0408008C84002027BDFFC8AFBF00348B
67007+:1060500000831024AFBE0030AFB7002CAFB60028CD
67008+:10606000AFB50024AFB40020AFB3001CAFB200182E
67009+:10607000AFB1001410400051AFB000108F84004049
67010+:10608000948700069488000A00E8302330D5FFFF8B
67011+:1060900012A0004B8FBF0034948B0018948C000A20
67012+:1060A000016C50233142FFFF02A2482B1520000251
67013+:1060B00002A02021004020212C8F000515E00002C5
67014+:1060C00000809821241300040E0001C102602021E9
67015+:1060D0008F87004002609021AF80004494F4000A52
67016+:1060E000026080211260004E3291FFFF3C1670006A
67017+:1060F0003C1440003C1E20003C1760008F99005863
67018+:106100008F380000031618241074004F0283F82BF8
67019+:1061100017E0003600000000107E00478F86004424
67020+:1061200014C0003A2403000102031023022320219B
67021+:106130003050FFFF1600FFF13091FFFF8F870040C6
67022+:106140003C1100203C108000AE11003094EB000A9E
67023+:106150003C178000024B5021A4EA000A94E9000A8F
67024+:1061600094E800043123FFFF3106000F00062D00E4
67025+:106170000065F025AEFE008094F3000A94F6001846
67026+:1061800012D30036001221408CFF00148CF4001052
67027+:1061900003E468210000C02101A4782B029870213B
67028+:1061A00001CF6021ACED0014ACEC001002B238233A
67029+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
67030+:1061C0008FBE00308FB7002C8FB600288FB500240B
67031+:1061D0008FB400208FB3001C8FB200188FB1001451
67032+:1061E0008FB0001003E0000827BD00381477FFCC03
67033+:1061F0008F8600440E000EE202002021004018218C
67034+:106200008F86004410C0FFC9020310230270702360
67035+:106210008F87004001C368210A0002E431B2FFFF0A
67036+:106220008F86004414C0FFC93C1100203C10800040
67037+:106230000A0002AEAE1100300E00046602002021FA
67038+:106240000A0002DB00401821020020210E0009395B
67039+:10625000022028210A0002DB004018210E0001EE76
67040+:10626000000000000A0002C702B2382327BDFFC8A1
67041+:10627000AFB7002CAFB60028AFB50024AFB40020F4
67042+:10628000AFB3001CAFB20018AFB10014AFB0001034
67043+:10629000AFBF00300E00011B241300013C047FFF40
67044+:1062A0003C0380083C0220003C010800AC20007048
67045+:1062B0003496FFFF34770080345200033C1512C03F
67046+:1062C000241400013C1080002411FF800E000245C0
67047+:1062D000000000008F8700488F8B00188F89001402
67048+:1062E0008CEA00EC8CE800E8014B302B01092823F4
67049+:1062F00000A6102314400006014B18231440000E82
67050+:106300003C05800002A3602B1180000B0000000000
67051+:106310003C0560008CEE00EC8CED00E88CA4180CC1
67052+:10632000AF8E001804800053AF8D00148F8F0010C3
67053+:10633000ADF400003C0580008CBF00003BF900017B
67054+:10634000333800011700FFE13C0380008C6201003C
67055+:1063500024060C0010460009000000008C680100B3
67056+:106360002D043080548000103C0480008C690100B2
67057+:106370002D2331811060000C3C0480008CAA0100A8
67058+:1063800011460004000020218CA6010024C5FF81D5
67059+:1063900030A400FF8E0B01000E000269AE0B00243A
67060+:1063A0000A00034F3C0480008C8D01002DAC3300AB
67061+:1063B00011800022000000003C0708008CE70098D4
67062+:1063C00024EE00013C010800AC2E00983C04800043
67063+:1063D0008C8201001440000300000000566000148D
67064+:1063E0003C0440008C9F01008C9801000000982123
67065+:1063F00003F1C82400193940330F007F00EF7025E6
67066+:1064000001D26825AC8D08308C8C01008C85010090
67067+:10641000258B0100017130240006514030A3007F1C
67068+:106420000143482501324025AC8808303C04400037
67069+:10643000AE0401380A00030E000000008C99010030
67070+:10644000240F0020AC99002092F80000330300FFD5
67071+:10645000106F000C241F0050547FFFDD3C048000AF
67072+:106460008C8401000E00154E000000000A00034F4E
67073+:106470003C04800000963824ACA7180C0A000327BF
67074+:106480008F8F00108C8501000E0008F72404008017
67075+:106490000A00034F3C04800000A4102B24030001D9
67076+:1064A00010400009000030210005284000A4102BF6
67077+:1064B00004A00003000318405440FFFC00052840DE
67078+:1064C0005060000A0004182B0085382B54E00004AB
67079+:1064D0000003184200C33025008520230003184222
67080+:1064E0001460FFF9000528420004182B03E000089F
67081+:1064F00000C310213084FFFF30C600FF3C0780003E
67082+:106500008CE201B80440FFFE00064C000124302557
67083+:106510003C08200000C820253C031000ACE00180AE
67084+:10652000ACE50184ACE4018803E00008ACE301B809
67085+:106530003C0660008CC5201C2402FFF03083020062
67086+:10654000308601001060000E00A2282434A500014E
67087+:106550003087300010E0000530830C0034A50004C3
67088+:106560003C04600003E00008AC85201C1060FFFDC7
67089+:106570003C04600034A5000803E00008AC85201C42
67090+:1065800054C0FFF334A500020A0003B03087300086
67091+:1065900027BDFFE8AFB00010AFBF00143C0760009C
67092+:1065A000240600021080001100A080218F83005873
67093+:1065B0000E0003A78C6400188F8200580000202171
67094+:1065C000240600018C45000C0E000398000000001A
67095+:1065D0001600000224020003000010218FBF0014E7
67096+:1065E0008FB0001003E0000827BD00188CE8201CC5
67097+:1065F0002409FFF001092824ACE5201C8F870058EE
67098+:106600000A0003CD8CE5000C3C02600E00804021A6
67099+:1066100034460100240900180000000000000000BA
67100+:10662000000000003C0A00503C0380003547020097
67101+:10663000AC68003834640400AC65003CAC670030E2
67102+:106640008C6C0000318B00201160FFFD2407FFFFE0
67103+:106650002403007F8C8D00002463FFFF248400044A
67104+:10666000ACCD00001467FFFB24C60004000000004E
67105+:10667000000000000000000024A402000085282B78
67106+:106680003C0300203C0E80002529FFFF010540212E
67107+:10669000ADC300301520FFE00080282103E0000892
67108+:1066A000000000008F82005827BDFFD8AFB3001C48
67109+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
67110+:1066C00094460002008098218C5200182CC300814F
67111+:1066D0008C4800048C4700088C51000C8C49001039
67112+:1066E000106000078C4A00142CC4000414800013AE
67113+:1066F00030EB000730C5000310A0001000000000C0
67114+:106700002410008B02002021022028210E00039873
67115+:10671000240600031660000224020003000010217A
67116+:106720008FBF00208FB3001C8FB200188FB10014F0
67117+:106730008FB0001003E0000827BD00281560FFF1AE
67118+:106740002410008B3C0C80003C030020241F00011F
67119+:10675000AD830030AF9F0044000000000000000047
67120+:10676000000000002419FFF024D8000F031978243A
67121+:106770003C1000D0AD88003801F0702524CD000316
67122+:106780003C08600EAD87003C35850400AD8E0030BE
67123+:10679000000D38823504003C3C0380008C6B000007
67124+:1067A000316200201040FFFD0000000010E00008F2
67125+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
67126+:1067C00024A50004AC8800001467FFFB24840004A7
67127+:1067D0003C05600EACA60038000000000000000080
67128+:1067E000000000008F8600543C0400203C0780001D
67129+:1067F000ACE4003054C000060120202102402021DA
67130+:106800000E0003A7000080210A00041D02002021C1
67131+:106810000E0003DD01402821024020210E0003A7C5
67132+:10682000000080210A00041D0200202127BDFFE096
67133+:10683000AFB200183092FFFFAFB10014AFBF001C21
67134+:10684000AFB000101640000D000088210A0004932C
67135+:106850000220102124050003508500278CE5000C40
67136+:106860000000000D262800013111FFFF24E2002066
67137+:106870000232802B12000019AF8200588F82004430
67138+:10688000144000168F8700583C0670003C0320001F
67139+:106890008CE5000000A62024148300108F84006083
67140+:1068A000000544023C09800000A980241480FFE90F
67141+:1068B000310600FF2CCA000B5140FFEB26280001D7
67142+:1068C000000668803C0E080025CE575801AE6021B6
67143+:1068D0008D8B0000016000080000000002201021E4
67144+:1068E0008FBF001C8FB200188FB100148FB0001042
67145+:1068F00003E0000827BD00200E0003982404008454
67146+:106900001600FFD88F8700580A000474AF8000601B
67147+:10691000020028210E0003BF240400018F870058C5
67148+:106920000A000474AF820060020028210E0003BF39
67149+:10693000000020210A0004A38F8700580E000404E1
67150+:10694000020020218F8700580A000474AF82006083
67151+:1069500030AFFFFF000F19C03C0480008C9001B8DD
67152+:106960000600FFFE3C1920043C181000AC83018097
67153+:10697000AC800184AC990188AC9801B80A00047518
67154+:106980002628000190E2000390E30002000020218D
67155+:106990000002FE0000033A0000FF2825240600083C
67156+:1069A0000E000398000000001600FFDC2402000324
67157+:1069B0008F870058000010210A000474AF82006025
67158+:1069C00090E8000200002021240600090A0004C308
67159+:1069D00000082E0090E4000C240900FF308500FF21
67160+:1069E00010A900150000302190F9000290F8000372
67161+:1069F000308F00FF94EB000400196E000018740043
67162+:106A0000000F62000186202501AE5025014B28258C
67163+:106A10003084FF8B0A0004C32406000A90E30002BE
67164+:106A200090FF0004000020210003360000DF28252D
67165+:106A30000A0004C32406000B0A0004D52406008BB8
67166+:106A4000000449C23127003F000443423C02800059
67167+:106A500000082040240316802CE60020AC43002CC4
67168+:106A600024EAFFE02482000114C0000330A900FFE3
67169+:106A700000801021314700FF000260803C0D800043
67170+:106A8000240A0001018D20213C0B000E00EA28049D
67171+:106A9000008B302111200005000538278CCE000026
67172+:106AA00001C5382503E00008ACC700008CD8000001
67173+:106AB0000307782403E00008ACCF000027BDFFE007
67174+:106AC000AFB10014AFB00010AFBF00183C076000BA
67175+:106AD0008CE408083402F0003C1160003083F000C0
67176+:106AE000240501C03C04800E000030211062000625
67177+:106AF000241000018CEA08083149F0003928E00030
67178+:106B00000008382B000780403C0D0200AE2D081411
67179+:106B1000240C16803C0B80008E2744000E000F8B47
67180+:106B2000AD6C002C120000043C02169124050001FB
67181+:106B3000120500103C023D2C345800E0AE384408E9
67182+:106B40003C1108008E31007C8FBF00183C066000AD
67183+:106B500000118540360F16808FB100148FB00010E1
67184+:106B60003C0E020027BD0020ACCF442003E000080B
67185+:106B7000ACCE08103C0218DA345800E0AE384408B5
67186+:106B80003C1108008E31007C8FBF00183C0660006D
67187+:106B900000118540360F16808FB100148FB00010A1
67188+:106BA0003C0E020027BD0020ACCF442003E00008CB
67189+:106BB000ACCE08100A0004EB240500010A0004EB27
67190+:106BC0000000282124020400A7820024A780001CC2
67191+:106BD000000020213C06080024C65A582405FFFF67
67192+:106BE00024890001000440803124FFFF01061821A0
67193+:106BF0002C87002014E0FFFAAC6500002404040098
67194+:106C0000A7840026A780001E000020213C06080063
67195+:106C100024C65AD82405FFFF248D0001000460809B
67196+:106C200031A4FFFF018658212C8A00201540FFFA6D
67197+:106C3000AD650000A7800028A7800020A780002263
67198+:106C4000000020213C06080024C65B582405FFFFF5
67199+:106C5000249900010004C0803324FFFF030678213B
67200+:106C60002C8E000415C0FFFAADE500003C05600065
67201+:106C70008CA73D002403E08F00E31024344601403C
67202+:106C800003E00008ACA63D002487007F000731C266
67203+:106C900024C5FFFF000518C2246400013082FFFFF5
67204+:106CA000000238C0A78400303C010800AC27003047
67205+:106CB000AF80002C0000282100002021000030219E
67206+:106CC0002489000100A728213124FFFF2CA81701E7
67207+:106CD000110000032C8300801460FFF924C600011A
67208+:106CE00000C02821AF86002C10C0001DA786002AF6
67209+:106CF00024CAFFFF000A11423C08080025085B581F
67210+:106D00001040000A00002021004030212407FFFF2E
67211+:106D1000248E00010004688031C4FFFF01A86021B7
67212+:106D20000086582B1560FFFAAD87000030A2001FC7
67213+:106D30005040000800043080240300010043C804D0
67214+:106D400000041080004878212738FFFF03E0000886
67215+:106D5000ADF8000000C820212405FFFFAC8500002D
67216+:106D600003E000080000000030A5FFFF30C6FFFF71
67217+:106D700030A8001F0080602130E700FF0005294295
67218+:106D80000000502110C0001D24090001240B000147
67219+:106D900025180001010B2004330800FF0126782686
67220+:106DA000390E00202DED00012DC2000101A2182591
67221+:106DB0001060000D014450250005C880032C4021BF
67222+:106DC0000100182110E0000F000A20278D040000A8
67223+:106DD000008A1825AD03000024AD00010000402109
67224+:106DE0000000502131A5FFFF252E000131C9FFFF12
67225+:106DF00000C9102B1040FFE72518000103E0000830
67226+:106E0000000000008D0A0000014440240A0005D162
67227+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
67228+:106E2000AFB00010AFBF001430E7FFFF00005021EB
67229+:106E30003410FFFF0000602124AF001F00C0482174
67230+:106E4000241800012419002005E0001601E010219B
67231+:106E50000002F943019F682A0009702B01AE40240B
67232+:106E600011000017000C18800064102110E00005CC
67233+:106E70008C4B000000F840040008382301675824B8
67234+:106E800000003821154000410000402155600016E7
67235+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
67236+:106EA00001E0102124A2003E0002F943019F682A5C
67237+:106EB0000009702B01AE40241500FFEB000C188078
67238+:106EC000154600053402FFFF020028210E0005B51B
67239+:106ED00000003821020010218FBF00148FB0001075
67240+:106EE00003E0000827BD00181520000301601821E9
67241+:106EF000000B1C0224080010306A00FF154000053A
67242+:106F0000306E000F250D000800031A0231A800FFA3
67243+:106F1000306E000F15C00005307F000325100004FF
67244+:106F200000031902320800FF307F000317E000055C
67245+:106F3000386900012502000200031882304800FF72
67246+:106F4000386900013123000110600004310300FFA3
67247+:106F5000250A0001314800FF310300FF000C6940A1
67248+:106F600001A34021240A000110CAFFD53110FFFF00
67249+:106F7000246E000131C800FF1119FFC638C9000195
67250+:106F80002D1F002053E0001C258B0001240D000163
67251+:106F90000A000648240E002051460017258B0001E8
67252+:106FA00025090001312800FF2D0900205120001281
67253+:106FB000258B000125430001010D5004014B1024D5
67254+:106FC000250900011440FFF4306AFFFF3127FFFF5D
67255+:106FD00010EE000C2582FFFF304CFFFF0000502117
67256+:106FE0003410FFFF312800FF2D0900205520FFF24B
67257+:106FF00025430001258B0001014648260A000602B0
67258+:10700000316CFFFF00003821000050210A000654B7
67259+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
67260+:10702000AFB10014001039423211FFE000071080A8
67261+:10703000AFB3001C00B1282330D3FFFFAFB200185C
67262+:1070400030A5FFFF00809021026030210044202104
67263+:10705000AFBF00200E0005E03207001F022288218A
67264+:107060003403FFFF0240202102002821026030216A
67265+:1070700000003821104300093231FFFF02201021A7
67266+:107080008FBF00208FB3001C8FB200188FB1001487
67267+:107090008FB0001003E0000827BD00280E0005E0B7
67268+:1070A0000000000000408821022010218FBF002036
67269+:1070B0008FB3001C8FB200188FB100148FB0001076
67270+:1070C00003E0000827BD0028000424003C03600002
67271+:1070D000AC603D0810A00002348210063482101605
67272+:1070E00003E00008AC623D0427BDFFE0AFB0001034
67273+:1070F000309000FF2E020006AFBF001810400008BD
67274+:10710000AFB10014001030803C03080024635784A2
67275+:1071100000C328218CA400000080000800000000AB
67276+:10712000000020218FBF00188FB100148FB0001015
67277+:107130000080102103E0000827BD00209791002A5D
67278+:1071400016200051000020213C020800904200332C
67279+:107150000A0006BB00000000978D002615A0003134
67280+:10716000000020210A0006BB2402000897870024A3
67281+:1071700014E0001A00001821006020212402000100
67282+:107180001080FFE98FBF0018000429C2004530219C
67283+:1071900000A6582B1160FFE43C0880003C0720004B
67284+:1071A000000569C001A76025AD0C00203C038008E4
67285+:1071B0002402001F2442FFFFAC6000000441FFFDD9
67286+:1071C0002463000424A5000100A6702B15C0FFF560
67287+:1071D000000569C00A0006A58FBF00189787001C2C
67288+:1071E0003C04080024845A58240504000E0006605C
67289+:1071F00024060001978B002424440001308AFFFFFD
67290+:107200002569FFFF2D48040000402821150000409B
67291+:10721000A789002424AC3800000C19C00A0006B964
67292+:10722000A780001C9787001E3C04080024845AD8BD
67293+:10723000240504000E00066024060001979900262C
67294+:10724000244400013098FFFF272FFFFF2F0E04007A
67295+:107250000040882115C0002CA78F0026A780001EA3
67296+:107260003A020003262401003084FFFF0E00068D41
67297+:107270002C4500010011F8C027F00100001021C0CA
67298+:107280000A0006BB240200089785002E978700227B
67299+:107290003C04080024845B580E00066024060001AC
67300+:1072A0009787002A8F89002C2445000130A8FFFF12
67301+:1072B00024E3FFFF0109302B0040802114C0001897
67302+:1072C000A783002AA7800022978500300E000F7543
67303+:1072D00002002021244A05003144FFFF0E00068DE4
67304+:1072E000240500013C05080094A500320E000F752E
67305+:1072F00002002021244521003C0208009042003376
67306+:107300000A0006BB000521C00A0006F3A784001E80
67307+:1073100024AC3800000C19C00A0006B9A784001C70
67308+:107320000A00070DA7850022308400FF27BDFFE873
67309+:107330002C820006AFBF0014AFB000101040001543
67310+:1073400000A03821000440803C0308002463579CBF
67311+:10735000010328218CA40000008000080000000028
67312+:1073600024CC007F000751C2000C59C23170FFFFCE
67313+:107370002547C40030E5FFFF2784001C02003021B0
67314+:107380000E0005B52407000197860028020620217B
67315+:10739000A78400288FBF00148FB0001003E00008FE
67316+:1073A00027BD00183C0508008CA50030000779C2F5
67317+:1073B0000E00038125E4DF003045FFFF3C04080098
67318+:1073C00024845B58240600010E0005B52407000143
67319+:1073D000978E002A8FBF00148FB0001025CD0001BA
67320+:1073E00027BD001803E00008A78D002A0007C9C2C6
67321+:1073F0002738FF00001878C231F0FFFF3C04080076
67322+:1074000024845AD802002821240600010E0005B564
67323+:1074100024070001978D0026260E0100000E84002F
67324+:1074200025AC00013C0B6000A78C0026AD603D0838
67325+:1074300036040006000030213C0760008CE23D0469
67326+:10744000305F000617E0FFFD24C9000100061B00A5
67327+:10745000312600FF006440252CC50004ACE83D0443
67328+:1074600014A0FFF68FBF00148FB0001003E00008D7
67329+:1074700027BD0018000751C22549C8002406000195
67330+:10748000240700013C04080024845A580E0005B566
67331+:107490003125FFFF978700248FBF00148FB00010A5
67332+:1074A00024E6000127BD001803E00008A786002499
67333+:1074B0003C0660183C090800252900FCACC9502C8A
67334+:1074C0008CC850003C0580003C020002350700805B
67335+:1074D000ACC750003C04080024841FE03C030800B3
67336+:1074E00024631F98ACA50008ACA2000C3C01080066
67337+:1074F000AC2459A43C010800AC2359A803E00008BF
67338+:107500002402000100A030213C1C0800279C59AC3B
67339+:107510003C0C04003C0B0002008B3826008C4026FB
67340+:107520002CE200010007502B2D050001000A4880C5
67341+:107530003C030800246359A4004520250123182199
67342+:107540001080000300001021AC660000240200013E
67343+:1075500003E00008000000003C1C0800279C59AC18
67344+:107560003C0B04003C0A0002008A3026008B3826BF
67345+:107570002CC200010006482B2CE5000100094080C8
67346+:107580003C030800246359A4004520250103182169
67347+:1075900010800005000010213C0C0800258C1F986D
67348+:1075A000AC6C00002402000103E0000800000000B1
67349+:1075B0003C0900023C080400008830260089382677
67350+:1075C0002CC30001008028212CE400010083102539
67351+:1075D0001040000B000030213C1C0800279C59ACD7
67352+:1075E0003C0A80008D4E00082406000101CA68256F
67353+:1075F000AD4D00088D4C000C01855825AD4B000C9D
67354+:1076000003E0000800C010213C1C0800279C59AC76
67355+:107610003C0580008CA6000C0004202724020001F9
67356+:1076200000C4182403E00008ACA3000C3C020002D4
67357+:107630001082000B3C0560003C070400108700032B
67358+:107640000000000003E00008000000008CA908D042
67359+:10765000240AFFFD012A402403E00008ACA808D05A
67360+:107660008CA408D02406FFFE0086182403E000083E
67361+:10767000ACA308D03C05601A34A600108CC300806F
67362+:1076800027BDFFF88CC50084AFA3000093A40000C1
67363+:107690002402001010820003AFA5000403E00008DC
67364+:1076A00027BD000893A7000114E0001497AC000266
67365+:1076B00097B800023C0F8000330EFFFC01CF682119
67366+:1076C000ADA50000A3A000003C0660008CC708D058
67367+:1076D0002408FFFE3C04601A00E82824ACC508D04A
67368+:1076E0008FA300048FA200003499001027BD00086A
67369+:1076F000AF22008003E00008AF2300843C0B800031
67370+:10770000318AFFFC014B48218D2800000A00080C3B
67371+:10771000AFA8000427BDFFE8AFBF00103C1C080065
67372+:10772000279C59AC3C0580008CA4000C8CA2000462
67373+:107730003C0300020044282410A0000A00A31824DF
67374+:107740003C0604003C0400021460000900A610245A
67375+:107750001440000F3C0404000000000D3C1C080015
67376+:10776000279C59AC8FBF001003E0000827BD00180C
67377+:107770003C0208008C4259A40040F80900000000B7
67378+:107780003C1C0800279C59AC0A0008358FBF00102C
67379+:107790003C0208008C4259A80040F8090000000093
67380+:1077A0000A00083B000000003C0880008D0201B880
67381+:1077B0000440FFFE35090180AD2400003C031000A9
67382+:1077C00024040040AD250004A1240008A1260009DE
67383+:1077D000A527000A03E00008AD0301B83084FFFFCD
67384+:1077E0000080382130A5FFFF000020210A00084555
67385+:1077F000240600803087FFFF8CA400002406003898
67386+:107800000A000845000028218F8300788F860070C9
67387+:107810001066000B008040213C07080024E75B68ED
67388+:10782000000328C000A710218C440000246300013D
67389+:10783000108800053063000F5466FFFA000328C06B
67390+:1078400003E00008000010213C07080024E75B6CFF
67391+:1078500000A7302103E000088CC200003C03900028
67392+:1078600034620001008220253C038000AC640020CB
67393+:107870008C65002004A0FFFE0000000003E000086B
67394+:10788000000000003C0280003443000100832025FA
67395+:1078900003E00008AC44002027BDFFE0AFB10014B6
67396+:1078A0003091FFFFAFB00010AFBF001812200013DF
67397+:1078B00000A080218CA20000240400022406020003
67398+:1078C0001040000F004028210E0007250000000096
67399+:1078D00000001021AE000000022038218FBF0018E8
67400+:1078E0008FB100148FB0001000402021000028212B
67401+:1078F000000030210A00084527BD00208CA20000AE
67402+:10790000022038218FBF00188FB100148FB00010F3
67403+:107910000040202100002821000030210A000845F5
67404+:1079200027BD002000A010213087FFFF8CA5000498
67405+:107930008C4400000A000845240600068F83FD9C45
67406+:1079400027BDFFE8AFBF0014AFB00010906700087C
67407+:10795000008010210080282130E600400000202116
67408+:1079600010C000088C5000000E0000BD0200202155
67409+:10797000020020218FBF00148FB000100A000548BC
67410+:1079800027BD00180E0008A4000000000E0000BD76
67411+:1079900002002021020020218FBF00148FB00010B0
67412+:1079A0000A00054827BD001827BDFFE0AFB0001052
67413+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
67414+:1079C00092060001008088210E00087230D2000467
67415+:1079D00092040005001129C2A6050000348300406E
67416+:1079E000A20300050E00087C022020210E00054A9B
67417+:1079F0000220202124020001AE02000C02202821D6
67418+:107A0000A602001024040002A602001224060200AE
67419+:107A1000A60200140E000725A60200161640000F4D
67420+:107A20008FBF001C978C00743C0B08008D6B007896
67421+:107A30002588FFFF3109FFFF256A0001012A382B45
67422+:107A400010E00006A78800743C0F6006240E0016A4
67423+:107A500035ED0010ADAE00508FBF001C8FB2001886
67424+:107A60008FB100148FB0001003E0000827BD002084
67425+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
67426+:107A80001080000400A088212402008010820007DA
67427+:107A9000000000000000000D8FBF00188FB100141F
67428+:107AA0008FB0001003E0000827BD00200E00087210
67429+:107AB00000A020218F86FD9C0220202190C500057A
67430+:107AC0000E00087C30B000FF2403003E1603FFF1D7
67431+:107AD0003C0680008CC401780480FFFE34C801405D
67432+:107AE000240900073C071000AD11000002202021EE
67433+:107AF000A10900048FBF00188FB100148FB00010CF
67434+:107B0000ACC701780A0008C527BD002027BDFFE0EB
67435+:107B1000AFB00010AFBF0018AFB100143C10800030
67436+:107B20008E110020000000000E00054AAE04002067
67437+:107B3000AE1100208FBF00188FB100148FB000105D
67438+:107B400003E0000827BD00203084FFFF00803821BB
67439+:107B50002406003500A020210A0008450000282145
67440+:107B60003084FFFF008038212406003600A0202149
67441+:107B70000A0008450000282127BDFFD0AFB500242A
67442+:107B80003095FFFFAFB60028AFB40020AFBF002C88
67443+:107B9000AFB3001CAFB20018AFB10014AFB000100B
67444+:107BA00030B6FFFF12A000270000A0218F920058DE
67445+:107BB0008E4300003C0680002402004000033E0289
67446+:107BC00000032C0230E4007F006698241482001D1C
67447+:107BD00030A500FF8F8300682C68000A1100001098
67448+:107BE0008F8D0044000358803C0C0800258C57B84A
67449+:107BF000016C50218D4900000120000800000000A8
67450+:107C000002D4302130C5FFFF0E0008522404008446
67451+:107C1000166000028F920058AF8000688F8D00447C
67452+:107C20002659002026980001032090213314FFFFDD
67453+:107C300015A00004AF9900580295202B1480FFDC9A
67454+:107C400000000000028010218FBF002C8FB600289A
67455+:107C50008FB500248FB400208FB3001C8FB20018A2
67456+:107C60008FB100148FB0001003E0000827BD003072
67457+:107C70002407003414A70149000000009247000EB9
67458+:107C80008F9FFDA08F90FD9C24181600A3E700197C
67459+:107C90009242000D3C0880003C07800CA3E20018D3
67460+:107CA000964A00123C0D60003C117FFFA60A005C62
67461+:107CB000964400103623FFFF240200053099FFFF91
67462+:107CC000AE1900548E46001CAD1800288CEF000041
67463+:107CD0008DAE444801E6482601C93021AE06003881
67464+:107CE0008E05003824CB00013C0E7F00AE05003C21
67465+:107CF0008E0C003CAFEC0004AE0B00208E13002075
67466+:107D0000AE13001CA3E0001BAE03002CA3E2001284
67467+:107D10008E4A001424130050AE0A00348E0400343E
67468+:107D2000AFE400148E590018AE1900489258000CA8
67469+:107D3000A218004E920D000835AF0020A20F0008D7
67470+:107D40008E090018012E282434AC4000AE0C001817
67471+:107D5000920B0000317200FF1253027F2403FF8058
67472+:107D60003C04080024845BE80E0008AA0000000020
67473+:107D70003C1108008E315BE80E00087202202021C1
67474+:107D80002405000424080001A2050025022020216A
67475+:107D90000E00087CA20800053C0580008CB001782C
67476+:107DA0000600FFFE8F92005834AE0140240F0002FF
67477+:107DB0003C091000ADD10000A1CF0004ACA90178AE
67478+:107DC0000A000962AF8000682CAD003751A0FF9413
67479+:107DD0008F8D0044000580803C110800263157E05B
67480+:107DE000021178218DEE000001C0000800000000A3
67481+:107DF0002411000414B1008C3C0780003C080800EA
67482+:107E00008D085BE88F86FD9CACE800208E4500085D
67483+:107E10008F99FDA0240D0050ACC500308E4C000899
67484+:107E2000ACCC00508E4B000CACCB00348E43001019
67485+:107E3000ACC300388E4A0010ACCA00548E42001405
67486+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
67487+:107E5000ACD0002090C40000309800FF130D024AFF
67488+:107E6000000000008CC400348CD00030009030231F
67489+:107E700004C000F12404008C126000EE2402000310
67490+:107E80000A000962AF8200682419000514B900666F
67491+:107E90003C0580003C0808008D085BE88F86FD9C4F
67492+:107EA000ACA800208E4C00048F8AFDA0240720007F
67493+:107EB000ACCC001C924B000824120008A14B001906
67494+:107EC0008F82005890430009A14300188F85005805
67495+:107ED00090BF000A33E400FF1092001028890009C7
67496+:107EE000152000BA240E0002240D0020108D000B76
67497+:107EF000340780002898002117000008240740005C
67498+:107F000024100040109000053C0700012419008057
67499+:107F1000109900023C070002240740008CC20018A0
67500+:107F20003C03FF00004350240147F825ACDF001854
67501+:107F300090B2000BA0D200278F8300589464000CED
67502+:107F4000108001FE000000009467000C3C1F8000C0
67503+:107F50002405FFBFA4C7005C9063000E2407000443
67504+:107F6000A0C300088F820058904A000FA0CA0009E1
67505+:107F70008F8900588D3200108FE400740244C823AA
67506+:107F8000ACD900588D300014ACD0002C95380018B6
67507+:107F9000330DFFFFACCD00409531001A322FFFFFAB
67508+:107FA000ACCF00448D2E001CACCE00489128000EB2
67509+:107FB000A0C8000890CC000801855824126001B6C2
67510+:107FC000A0CB00088F9200580A000962AF870068B2
67511+:107FD0002406000614A600143C0E80003C0F080086
67512+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
67513+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
67514+:1080000024040005ACA800048CCC003C1260008164
67515+:10801000AD6C00000A000962AF84006824110007FB
67516+:1080200010B1004B240400063C05080024A55BE8C1
67517+:108030000E000881240400818F9200580013102B39
67518+:108040000A000962AF820068241F002314BFFFF6F4
67519+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
67520+:10806000AD8500208F91FD9C8E4600042564002084
67521+:1080700026450014AE260028240600030E000F81BA
67522+:10808000257000308F87005802002021240600034D
67523+:108090000E000F8124E500083C04080024845BE8FE
67524+:1080A0000E0008AA0000000092230000240A0050DD
67525+:1080B000306200FF544AFFE18F9200580E000F6CAF
67526+:1080C000000000000A000A6A8F920058240800335A
67527+:1080D00014A800323C0380003C1108008E315BE89C
67528+:1080E0008F8FFDA0AC7100208E420008240D002867
67529+:1080F0008F89FD9CADE200308E4A000C24060009F9
67530+:10810000ADEA00348E5F0010ADFF00388E440014DD
67531+:10811000ADE400208E590018ADF900248E58001CE3
67532+:10812000ADF80028A1ED00118E4E00041260003160
67533+:10813000AD2E00288F9200580A000962AF860068B1
67534+:10814000240D002214ADFFB8000000002404000735
67535+:108150003C1008008E105BE83C188000AF10002037
67536+:108160005660FEAEAF8400683C04080024845BE8DF
67537+:108170000E0008AA241300508F84FD9C90920000EA
67538+:10818000325900FF1333014B000000008F9200585A
67539+:10819000000020210A000962AF8400683C05080045
67540+:1081A00024A55BE80E000858240400810A000A6A2E
67541+:1081B0008F92005802D498213265FFFF0E000852BA
67542+:1081C000240400840A0009628F920058108EFF5325
67543+:1081D000240704002887000310E00179241100041B
67544+:1081E000240F0001548FFF4D240740000A000A228B
67545+:1081F000240701003C05080024A55BE80E0008A444
67546+:10820000240400828F920058000030210A00096285
67547+:10821000AF8600683C04080024845BE88CC2003808
67548+:108220000E0008AA8CC3003C8F9200580A000AC0B6
67549+:1082300000002021240400823C05080024A55BE8FE
67550+:108240000E0008A4000000008F92005800001021CA
67551+:108250000A000962AF8200688E5000048F91FD9C75
67552+:108260003C078000ACF00020922C00050200282181
67553+:10827000318B0002156001562404008A8F92FDA004
67554+:108280002404008D9245001B30A6002014C001502C
67555+:1082900002002821922E00092408001231C900FF93
67556+:1082A0001128014B240400810E00087202002021D5
67557+:1082B0009258001B240F000402002021370D0042B9
67558+:1082C000A24D001B0E00087CA22F00253C0580005B
67559+:1082D0008CA401780480FFFE34B90140241F000201
67560+:1082E000AF300000A33F00048F9200583C101000F4
67561+:1082F000ACB001780A000A6B0013102B8E500004FA
67562+:108300008F91FD9C3C038000AC700020922A0005F8
67563+:108310000200282131420002144000172404008A80
67564+:10832000922C00092412000402002821318B00FF46
67565+:1083300011720011240400810E0008720200202135
67566+:108340008F89FDA0240800122405FFFE912F001B39
67567+:108350000200202135EE0020A12E001BA2280009DA
67568+:108360009226000500C538240E00087CA2270005CF
67569+:1083700002002821000020210E0009330000000027
67570+:108380000A000A6A8F9200588E4C00043C07800055
67571+:108390003C10080026105BE8ACEC00203C01080013
67572+:1083A000AC2C5BE8924B0003317100041220013BBE
67573+:1083B0008F84FD9C24020006A0820009924F001BBE
67574+:1083C000240EFFC031E9003F012E4025A08800089F
67575+:1083D0009245000330A6000114C0013200000000E5
67576+:1083E0008E420008AE0200083C0208008C425BF09E
67577+:1083F000104001318F90FDA0000219C28F8DFD9CAD
67578+:10840000A603000C8E4A000C24180001240400145A
67579+:10841000AE0A002C8E420010AE02001C965F0016C1
67580+:10842000A61F003C96590014A619003EADB8000CDA
67581+:10843000A5B80010A5B80012A5B80014A5B800167C
67582+:1084400012600144A2040011925100033232000272
67583+:108450002E5300018F920058266200080A0009621C
67584+:10846000AF8200688E4400043C1980003C068008FE
67585+:10847000AF2400208E45000890D80000240D005045
67586+:10848000331100FF122D009C2407008824060009E8
67587+:108490000E000845000000000A000A6A8F9200588A
67588+:1084A0008E5000043C0980003C118008AD30002053
67589+:1084B0009228000024050050310400FF10850110AF
67590+:1084C0002407008802002021000028210E00084512
67591+:1084D0002406000E922D00002418FF80020028219F
67592+:1084E00001B8802524040004240600300E0007256E
67593+:1084F000A23000000A000A6A8F9200588E500004D1
67594+:108500008F91FDA03C028000AC500020923F001BE8
67595+:1085100033F900101320006C240700810200202191
67596+:10852000000028212406001F0E000845000000005E
67597+:108530000A000A6A8F9200588E44001C0E00085DE3
67598+:1085400000000000104000E3004048218F880058E0
67599+:1085500024070089012020218D05001C240600012C
67600+:108560000E000845000000000A000A6A8F920058B9
67601+:10857000964900023C10080026105BE831280004F0
67602+:10858000110000973C0460008E4E001C3C0F8000E0
67603+:10859000ADEE00203C010800AC2E5BE896470002DF
67604+:1085A00030E40001148000E6000000008E42000468
67605+:1085B000AE0200083C1008008E105BF0120000ECC8
67606+:1085C0003C0F80008F92FD9C241000018E4E0018FD
67607+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
67608+:1085E000A2400005AE50000C3C0808008D085BF06E
67609+:1085F0008F840058A6500010000839C2A6500012FF
67610+:10860000A6500014A6500016A5A7000C8C8C0008DC
67611+:108610008F8B00588F8A0058ADAC002C8D63000CF6
67612+:1086200024070002ADA3001C91460010A1A6001172
67613+:108630008F82005890450011A3E500088F990058DB
67614+:1086400093380012A258004E8F910058922F0013B9
67615+:10865000A1AF00128F920058964E0014A5AE003CB8
67616+:1086600096490016A5A9003E8E480018ADA8001432
67617+:108670005660FD6AAF8700683C05080024A55BE8EA
67618+:108680000E000881000020218F9200580000382140
67619+:108690000A000962AF8700683C05080024A55BE872
67620+:1086A0000E0008A4240400828F9200580A000A4D8C
67621+:1086B000000038210E000F6C000000008F9200585F
67622+:1086C0000A000AC0000020210E00087202002021CA
67623+:1086D0009223001B02002021346A00100E00087C47
67624+:1086E000A22A001B000038210200202100002821BE
67625+:1086F0000A000BA52406001F9242000C305F000107
67626+:1087000013E0000300000000964A000EA4CA002CEB
67627+:10871000924B000C316300025060000600003821CB
67628+:108720008E470014964C0012ACC7001CA4CC001A53
67629+:10873000000038210A000B7F240600093C050800D0
67630+:1087400024A55BE80E0008A42404008B8F92005837
67631+:108750000A000A4D0013382B3C0C08008D8C5BE896
67632+:1087600024DFFFFE25930100326B007F016790211B
67633+:1087700002638824AD110028AE4600E0AE4000E45C
67634+:108780000A0009B3AE5F001CACC000543C0D0800E9
67635+:108790008DAD5BE83C18800C37090100ACED00287A
67636+:1087A0008E510014AD3100E08E4F0014AD2F00E467
67637+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
67638+:1087C0005491FDD6240740000A000A222407100015
67639+:1087D0000E00092D000000000A000A6A8F9200585E
67640+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
67641+:1087F000AC205BE810710062000000003C196C6264
67642+:1088000037387970147800082404000297850074C2
67643+:108810009782006C2404009200A2F82B13E0001948
67644+:1088200002002821240400020E00069524050200FF
67645+:108830003C068000ACC200203C010800AC225BE892
67646+:108840001040000D8F8C0058240A002824040003D7
67647+:10885000918B0010316300FF546A00012404000171
67648+:108860000E0000810000000010400004240400837A
67649+:108870000A000BC28F920058240400833C050800B4
67650+:1088800024A55BE80E000881000000008F920058CC
67651+:108890000013382B0A000962AF8700680A000B49F1
67652+:1088A000240200128E4400080E00085D0000000043
67653+:1088B0000A000B55AE0200083C05080024A55BE841
67654+:1088C0000E000858240400878F9200580A000B728B
67655+:1088D0000013102B240400040E000695240500301C
67656+:1088E0001440002A004048218F8800582407008344
67657+:1088F000012020218D05001C0A000BB32406000175
67658+:108900008F8300788F8600701066FEEE000038219D
67659+:108910003C07080024E75B6C000320C00087282187
67660+:108920008CAE000011D0005D246F000131E3000F18
67661+:108930005466FFFA000320C00A000B8C00003821A7
67662+:108940008E4400040E00085D000000000A000BC801
67663+:10895000AE0200083C05080024A55BE80E0008A450
67664+:10896000240400828F9200580A000B72000010212C
67665+:108970003C05080024A55BE80A000C7C2404008761
67666+:108980008C83442C0A000C5B3C196C628F88005865
67667+:108990003C0780083C0C8000240B0050240A000196
67668+:1089A000AD820020A0EB0000A0EA000191030004CA
67669+:1089B000A0E3001891040005A0E400199106000648
67670+:1089C0003C04080024845B6CA0E6001A91020007B6
67671+:1089D0003C06080024C65B68A0E2001B9105000865
67672+:1089E000A0E5001C911F0009A0FF001D9119000ABD
67673+:1089F000A0F9001E9118000BA0F8001F9112000CA6
67674+:108A0000A0F200209111000DA0F100219110000EA4
67675+:108A1000A0F00022910F000FA0EF0023910E001094
67676+:108A2000A0EE0024910D0011A0ED0025950C00147E
67677+:108A3000A4EC0028950B00168F8A00708F920078A6
67678+:108A4000A4EB002A95030018000A10C02545000178
67679+:108A5000A4E3002C8D1F001C0044C0210046C82147
67680+:108A600030A5000FAF3F0000AF09000010B20006B4
67681+:108A7000AF850070000038218D05001C01202021E9
67682+:108A80000A000BB32406000124AD000131A7000F3A
67683+:108A9000AF8700780A000CF9000038213C06080076
67684+:108AA00024C65B680086902100003821ACA000003D
67685+:108AB0000A000B8CAE4000003C0482013C036000C5
67686+:108AC00034820E02AC603D68AF80009803E000087D
67687+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
67688+:108AE000001018422C620041AFBF00141440000275
67689+:108AF00024040080240300403C010800AC300060E6
67690+:108B00003C010800AC2300640E000F7500602821B2
67691+:108B1000244802BF2409FF8001092824001039805D
67692+:108B2000001030408FBF00148FB0001000A720212C
67693+:108B300000861821AF8300803C010800AC25005856
67694+:108B40003C010800AC24005C03E0000827BD0018CD
67695+:108B5000308300FF30C6FFFF30E400FF3C08800098
67696+:108B60008D0201B80440FFFE000354000144382583
67697+:108B70003C09600000E920253C031000AD050180A0
67698+:108B8000AD060184AD04018803E00008AD0301B81F
67699+:108B90008F8500583C0A6012354800108CAC0004E8
67700+:108BA0003C0D600E35A60010318B00062D690001CA
67701+:108BB000AD0900C48CA70004ACC731808CA20008AA
67702+:108BC00094A40002ACC231848CA3001C0460000396
67703+:108BD000A784009003E00008000000008CAF00189C
67704+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
67705+:108BF0008F8500588F87FF288F86FF308CAE00044A
67706+:108C00003C0F601235E80010ACEE00788CAD000827
67707+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
67708+:108C2000ACCB004894CA00543C0208008C4200447B
67709+:108C300025490001A4C9005494C400543083FFFFA7
67710+:108C400010620017000000003C0208008C42004047
67711+:108C5000A4C200528CA30018ACE300308CA2001414
67712+:108C6000ACE2002C8CB90018ACF900388CB80014B8
67713+:108C700024050001ACF800348D0600BC50C5001975
67714+:108C80008D0200B48D0200B8A4E2004894E40048CC
67715+:108C9000A4E4004A94E800EA03E000083102FFFF80
67716+:108CA0003C0208008C420024A4C00054A4C200521C
67717+:108CB0008CA30018ACE300308CA20014ACE2002CB2
67718+:108CC0008CB90018ACF900388CB8001424050001E8
67719+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
67720+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
67721+:108CF00094E800EA03E000083102FFFF8F86005885
67722+:108D00003C0480008CC900088CC80008000929C0F8
67723+:108D1000000839C0AC87002090C30007306200040F
67724+:108D20001040003EAF85009490CB0007316A0008E8
67725+:108D30001140003D8F87FF2C8CCD000C8CCE001491
67726+:108D400001AE602B11800036000000008CC2000CC8
67727+:108D5000ACE200708CCB00188F85FF288F88FF3025
67728+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
67729+:108D70008CC9000CAD0900608CC4001CACA400D0F0
67730+:108D800090E3007C0062C824A0F9007C90D8000722
67731+:108D9000330F000811E000040000000090ED007C9B
67732+:108DA00035AC0001A0EC007C90CF000731EE000153
67733+:108DB00011C000060000000090E3007C241800347D
67734+:108DC00034790002A0F9007CACB800DC90C2000746
67735+:108DD0003046000210C000040000000090E8007C53
67736+:108DE00035040004A0E4007C90ED007D3C0B600E97
67737+:108DF000356A001031AC003FA0EC007D8D4931D4C4
67738+:108E00003127000110E00002240E0001A0AE00098D
67739+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
67740+:108E20000A000DAF8CC200140A000DB0ACE0007057
67741+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
67742+:108E4000AFB00010AFBF0020AFB10014918F00157C
67743+:108E50003C13600E3673001031EB000FA38B009CA7
67744+:108E60008D8F00048D8B0008959F0012959900103E
67745+:108E70009584001A9598001E958E001C33EDFFFF17
67746+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
67747+:108E90003C010800AC2D00243C010800AC29004432
67748+:108EA0003C010800AC2A0040AE683178AE67317CE6
67749+:108EB00091850015959100163C12601236520010F3
67750+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
67751+:108ED00091830014959F0018240600010066C804C1
67752+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
67753+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
67754+:108F0000918A00159584000E3C07600A314900FFE4
67755+:108F1000AF8B00883084FFFFAE4900C835110010C8
67756+:108F20000E000D1034F004103C0208008C4200606A
67757+:108F30003C0308008C6300643C0608008CC60058A3
67758+:108F40003C0508008CA5005C8F8400808FBF00204A
67759+:108F5000AE23004CAE65319CAE030054AE4500DC40
67760+:108F6000AE6231A0AE6331A4AE663198AE22004845
67761+:108F70008FB3001CAE0200508FB10014AE4200E06F
67762+:108F8000AE4300E4AE4600D88FB000108FB2001898
67763+:108F90000A00057D27BD0028978500929783007CF5
67764+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
67765+:108FB000240400058F900058104000552409000239
67766+:108FC0000E0006958F850080AF8200942404000374
67767+:108FD0001040004F240900023C0680000E00008172
67768+:108FE000ACC2002024070001240820001040004DDE
67769+:108FF00024040005978E00928F8AFF2C24090050CC
67770+:1090000025C50001A7850092A14900003C0D08007C
67771+:109010008DAD0064240380008F84FF28000D66005E
67772+:10902000AD4C0018A5400006954B000A8F85FF3017
67773+:109030002402FF8001633024A546000A915F000AE4
67774+:109040000000482103E2C825A159000AA0A0000899
67775+:10905000A140004CA08000D5961800029783009094
67776+:109060003C020004A49800EA960F00022418FFBFF7
67777+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
67778+:109080008E0C0008ACAC0040A4A00050A4A000547A
67779+:109090008E0B000C240C0030AC8B00288E060010C8
67780+:1090A000AC860024A480003EA487004EA487005014
67781+:1090B000A483003CAD420074AC8800D8ACA800602A
67782+:1090C000A08700FC909F00D433F9007FA09900D4C2
67783+:1090D000909000D402187824A08F00D4914E007C88
67784+:1090E00035CD0001A14D007C938B009CAD480070F4
67785+:1090F000AC8C00DCA08B00D68F8800888F87008422
67786+:10910000AC8800C4AC8700C8A5400078A540007AB0
67787+:109110008FBF00148FB000100120102103E0000861
67788+:1091200027BD00188F8500940E0007258F860080CC
67789+:109130000A000E9F2409000227BDFFE0AFB0001017
67790+:109140008F900058AFB10014AFBF00188E09000413
67791+:109150000E00054A000921C08E0800048F84FF28F4
67792+:109160008F82FF30000839C03C068000ACC7002069
67793+:10917000948500EA904300131460001C30B1FFFF97
67794+:109180008F8CFF2C918B0008316A00401540000B3A
67795+:10919000000000008E0D0004022030218FBF001857
67796+:1091A0008FB100148FB00010240400220000382179
67797+:1091B000000D29C00A000D2F27BD00200E000098C9
67798+:1091C000000000008E0D0004022030218FBF001827
67799+:1091D0008FB100148FB00010240400220000382149
67800+:1091E000000D29C00A000D2F27BD00200E000090A1
67801+:1091F000000000008E0D0004022030218FBF0018F7
67802+:109200008FB100148FB00010240400220000382118
67803+:10921000000D29C00A000D2F27BD002027BDFFE04B
67804+:10922000AFB200183092FFFFAFB00010AFBF001C0C
67805+:10923000AFB100141240001E000080218F8600583C
67806+:109240008CC500002403000600053F02000514023F
67807+:1092500030E4000714830016304500FF2CA80006F8
67808+:1092600011000040000558803C0C0800258C58BCBB
67809+:10927000016C50218D490000012000080000000011
67810+:109280008F8E0098240D000111CD005024020002A1
67811+:10929000AF820098260900013130FFFF24C800206A
67812+:1092A0000212202B010030211480FFE5AF88005806
67813+:1092B000020010218FBF001C8FB200188FB1001464
67814+:1092C0008FB0001003E0000827BD00209387007EC8
67815+:1092D00054E00034000030210E000DE700000000D3
67816+:1092E0008F8600580A000EFF240200018F87009825
67817+:1092F0002405000210E50031240400130000282199
67818+:1093000000003021240700010E000D2F0000000096
67819+:109310000A000F008F8600588F83009824020002F5
67820+:109320001462FFF6240400120E000D9A00000000E3
67821+:109330008F85009400403021240400120E000D2F70
67822+:10934000000038210A000F008F8600588F83009894
67823+:109350002411000310710029241F0002107FFFCE8A
67824+:1093600026090001240400100000282100003021FB
67825+:109370000A000F1D240700018F91009824060002A7
67826+:109380001626FFF9240400100E000E410000000014
67827+:10939000144000238F9800588F8600580A000EFF53
67828+:1093A00024020003240400140E000D2F00002821C5
67829+:1093B0008F8600580A000EFF240200020E000EA93C
67830+:1093C000000000000A000F008F8600580E000D3FBD
67831+:1093D00000000000241900022404001400002821C9
67832+:1093E0000000302100003821AF9900980E000D2FA9
67833+:1093F000000000000A000F008F8600580E000D5775
67834+:10940000000000008F8500942419000200403021E4
67835+:1094100024040010000038210A000F56AF9900986C
67836+:109420000040382124040010970F0002000028217A
67837+:109430000E000D2F31E6FFFF8F8600580A000F0047
67838+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
67839+:109450008C8500182402000100A61824AC83001893
67840+:1094600003E00008A08200053084FFFF30A5FFFF65
67841+:109470001080000700001821308200011040000217
67842+:1094800000042042006518211480FFFB00052840DD
67843+:1094900003E000080060102110C000070000000079
67844+:1094A0008CA2000024C6FFFF24A50004AC820000AB
67845+:1094B00014C0FFFB2484000403E000080000000047
67846+:1094C00010A0000824A3FFFFAC86000000000000ED
67847+:1094D000000000002402FFFF2463FFFF1462FFFA74
67848+:1094E0002484000403E0000800000000000411C010
67849+:1094F00003E000082442024027BDFFE8AFB000109F
67850+:1095000000808021AFBF00140E000F9600A0202124
67851+:1095100000504821240AFF808FBF00148FB0001034
67852+:10952000012A30243127007F3C08800A3C042100B6
67853+:1095300000E8102100C428253C03800027BD001846
67854+:10954000AC650024AF820038AC400000AC6500245C
67855+:1095500003E00008AC4000403C0D08008DAD005811
67856+:1095600000056180240AFF8001A45821016C482174
67857+:10957000012A30243127007F3C08800C3C04210064
67858+:1095800000E8102100C428253C038000AC650028B9
67859+:10959000AF82003403E00008AC40002430A5FFFF98
67860+:1095A0003C0680008CC201B80440FFFE3C086015F8
67861+:1095B00000A838253C031000ACC40180ACC0018475
67862+:1095C000ACC7018803E00008ACC301B83C0D08003B
67863+:1095D0008DAD005800056180240AFF8001A4582148
67864+:1095E000016C4021010A4824000931403107007F05
67865+:1095F00000C728253C04200000A418253C02800058
67866+:10960000AC43083003E00008AF80003427BDFFE81A
67867+:10961000AFB0001000808021AFBF00140E000F9685
67868+:1096200000A0202100504821240BFF80012B502452
67869+:10963000000A39403128007F3C0620008FBF00140B
67870+:109640008FB0001000E8282534C2000100A21825C0
67871+:109650003C04800027BD0018AC83083003E00008FC
67872+:10966000AF8000383C0580088CA700603C0680086D
67873+:109670000087102B144000112C8340008CA8006040
67874+:109680002D0340001060000F240340008CC90060CF
67875+:109690000089282B14A00002008018218CC30060D0
67876+:1096A00000035A42000B30803C0A0800254A59202A
67877+:1096B00000CA202103E000088C8200001460FFF340
67878+:1096C0002403400000035A42000B30803C0A08008B
67879+:1096D000254A592000CA202103E000088C8200009E
67880+:1096E0003C05800890A60008938400AB24C20001CA
67881+:1096F000304200FF3043007F1064000C0002382726
67882+:10970000A0A200083C0480008C85017804A0FFFE24
67883+:109710008F8A00A0240900023C081000AC8A014096
67884+:10972000A089014403E00008AC8801780A00101BFE
67885+:1097300030E2008027BDFFD8AFB200188F9200A49E
67886+:10974000AFBF0020AFB3001CAFB00010AFB100142A
67887+:109750008F9300348E5900283C1000803C0EFFEFA0
67888+:10976000AE7900008E580024A260000A35CDFFFFBC
67889+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
67890+:10978000A271000C8E6F000C3C080040A271000B0F
67891+:1097900001F06025018D4824012A382400E8302595
67892+:1097A000AE66000C8E450004AE6000183C0400FF5D
67893+:1097B000AE6500148E43002C3482FFFFA6600008C3
67894+:1097C0000062F824AE7F00108E5900088F9000A030
67895+:1097D000964E0012AE7900208E51000C31D83FFF1A
67896+:1097E00000187980AE7100248E4D001401F06021C4
67897+:1097F00031CB0001AE6D00288E4A0018000C41C22A
67898+:10980000000B4B80AE6A002C8E46001C01093821EB
67899+:10981000A667001CAE660030964500028E4400200C
67900+:10982000A665001EAE64003492430033306200042B
67901+:1098300054400006924700003C0280083443010077
67902+:109840008C7F00D0AE7F0030924700008F860038BA
67903+:10985000A0C700309245003330A4000250800007BA
67904+:10986000925100018F880038240BFF80910A00304C
67905+:10987000014B4825A1090030925100018F9000381A
67906+:10988000240CFFBF2404FFDFA21100318F8D0038AC
67907+:109890003C1880083711008091AF003C31EE007F0A
67908+:1098A000A1AE003C8F890038912B003C016C502404
67909+:1098B000A12A003C8F9F00388E68001493E6003C7C
67910+:1098C0002D0700010007114000C4282400A218251C
67911+:1098D000A3E3003C8F87003896590012A4F90032A8
67912+:1098E0008E450004922E007C30B0000300107823D7
67913+:1098F00031ED000300AD102131CC000215800002D3
67914+:1099000024460034244600303C0280083443008062
67915+:10991000907F007C00BFC824333800041700000289
67916+:1099200024C2000400C010218F98003824190002BE
67917+:10993000ACE20034A3190000924F003F8F8E003834
67918+:109940003C0C8008358B0080A1CF00018F9100383E
67919+:10995000924D003F8E440004A62D0002956A005CE3
67920+:109960000E000FF43150FFFF00024B800209382532
67921+:109970003C08420000E82825AE2500048E4400384B
67922+:109980008F850038ACA400188E460034ACA6001CAD
67923+:10999000ACA0000CACA00010A4A00014A4A0001661
67924+:1099A000A4A00020A4A00022ACA000248E62001479
67925+:1099B00050400001240200018FBF00208FB3001C23
67926+:1099C0008FB200188FB100148FB00010ACA2000845
67927+:1099D0000A00101327BD002827BDFFC83C058008DA
67928+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
67929+:1099F000AFB60028AFB50024AFB40020AFB3001C51
67930+:109A0000AFB20018AFB10014AFB00010948300786B
67931+:109A10009482007A104300512405FFFF0080F0215A
67932+:109A20000A0011230080B821108B004D8FBF003435
67933+:109A30008F8600A03C1808008F18005C2411FF805E
67934+:109A40003C1680000306782101F18024AED0002C62
67935+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
67936+:109A6000018D5021000B4840012AA82196A4000036
67937+:109A70003C0808008D0800582405FF8030953FFF02
67938+:109A800001061821001539800067C8210325F82434
67939+:109A90003C02010003E290253338007F3C11800C2A
67940+:109AA000AED20028031190219250000D320F000415
67941+:109AB00011E0003702E0982196E3007A96E8007AF8
67942+:109AC00096E5007A2404800031077FFF24E300013B
67943+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
67944+:109AE00096E6007A3C1408008E94006030D67FFF22
67945+:109AF00012D400C1000000008E5800188F8400A00E
67946+:109B000002A028212713FFFF0E000FCEAE53002C1A
67947+:109B100097D5007897D4007A12950010000028217C
67948+:109B20003C098008352401003C0A8008914800085F
67949+:109B3000908700D53114007F30E400FF0284302B81
67950+:109B400014C0FFB9268B0001938E00AB268C000158
67951+:109B5000008E682115ACFFB78F8600A08FBF003440
67952+:109B60008FBE00308FB7002C8FB600288FB5002431
67953+:109B70008FB400208FB3001C8FB200188FB1001477
67954+:109B80008FB0001000A0102103E0000827BD0038AE
67955+:109B900000C020210E000F99028028218E4B00105A
67956+:109BA0008E4C00308F84003824090002016C502351
67957+:109BB000AE4A0010A089000096E3005C8E4400309D
67958+:109BC0008F9100380E000FF43070FFFF00024380C9
67959+:109BD000020838253C02420000E22825AE25000498
67960+:109BE0008E5F00048F8A00388E590000240B000815
67961+:109BF000AD5F001CAD590018AD40000CAD40001029
67962+:109C00009246000A240400052408C00030D000FF5A
67963+:109C1000A550001496580008A55800169251000A45
67964+:109C20003C188008322F00FFA54F0020964E0008F8
67965+:109C300037110100A54E0022AD400024924D000BCB
67966+:109C400031AC00FFA54C0002A14B00018E49003051
67967+:109C50008F830038240BFFBFAC690008A06400307C
67968+:109C60008F9000382403FFDF9607003200E8282495
67969+:109C700000B51025A6020032921F003233F9003FD2
67970+:109C800037260040A20600328F8C0038AD800034A9
67971+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
67972+:109CA00031CD007FA18D003C8F84003835EEFFFF61
67973+:109CB000908A003C014B4824A089003C8F850038E5
67974+:109CC00090A8003C01033824A0A7003C8E42003439
67975+:109CD0008F9100383C038008AE2200408E59002C42
67976+:109CE0008E5F0030033F3023AE26004492300048A0
67977+:109CF0003218007FA23800488F8800388E4D00301F
67978+:109D00008D0C004801AE582401965024014B482583
67979+:109D1000AD0900489244000AA104004C964700088F
67980+:109D20008F850038A4A7004E8E5000308E4400303E
67981+:109D30000E0003818C65006092F9007C0002F940FE
67982+:109D4000004028210002110003E2302133360002D6
67983+:109D500012C00003020680210005B0800216802197
67984+:109D6000926D007C31B30004126000020005708027
67985+:109D7000020E80218E4B00308F8800382405800031
67986+:109D8000316A0003000A4823312400030204182129
67987+:109D9000AD03003496E4007A96F0007A96F1007AEA
67988+:109DA00032027FFF2447000130FF7FFF0225C824D5
67989+:109DB000033F3025A6E6007A96F8007A3C120800A8
67990+:109DC0008E520060330F7FFF11F200180000000078
67991+:109DD0008F8400A00E000FCE02A028218F8400A047
67992+:109DE0000E000FDE028028210E001013000000007C
67993+:109DF0000A00111F0000000096F1007A022480245E
67994+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
67995+:109E1000000E69C2000D6027000C51C03169007F3F
67996+:109E2000012A20250A001119A2E4007A96E6007A98
67997+:109E300000C5C024A6F8007A92EF007A92F3007A67
67998+:109E400031F200FF001271C2000E6827000DB1C090
67999+:109E5000326C007F01962825A2E5007A0A0011D015
68000+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
68001+:109E7000AC640018AC65001C03E000088C620014A0
68002+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
68003+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
68004+:109EA000AFB30044AFB20040AFB1003CAFB0003838
68005+:109EB00034C80100910500D590C700083084FFFF29
68006+:109EC00030A500FF30E2007F0045182AAFA4001043
68007+:109ED000A7A00018A7A0002610600055AFA000148E
68008+:109EE00090CA00083149007F00A9302324D3FFFF26
68009+:109EF0000013802B8FB400100014902B02128824C2
68010+:109F0000522000888FB300143C03800894790052DB
68011+:109F1000947E00508FB60010033EC0230018BC0092
68012+:109F2000001714030016FC0002C2A82A16A00002A3
68013+:109F3000001F2C030040282100133C0000072403CD
68014+:109F400000A4102A5440000100A020212885000907
68015+:109F500014A000020080A021241400083C0C8008FA
68016+:109F60008D860048001459808D88004C3C03800089
68017+:109F70003169FFFF3C0A0010012A202534710400DA
68018+:109F8000AC660038AF9100A4AC68003CAC64003013
68019+:109F900000000000000000000000000000000000C1
68020+:109FA00000000000000000000000000000000000B1
68021+:109FB0008C6E000031CD002011A0FFFD0014782A26
68022+:109FC00001F01024104000390000A8213C16800840
68023+:109FD00092D700083C1280008E44010032F6007FC8
68024+:109FE0000E000F9902C028218E3900108E44010006
68025+:109FF0000000902133373FFF0E000FB102E028210F
68026+:10A00000923800003302003F2C500008520000102C
68027+:10A0100000008821000210803C030800246358E4FB
68028+:10A020000043F8218FFE000003C00008000000007C
68029+:10A0300090CF0008938C00AB31EE007F00AE682318
68030+:10A04000018D58210A0012172573FFFF0000882197
68031+:10A050003C1E80008FC401000E000FCE02E02821BC
68032+:10A060008FC401000E000FDE02C028211220000F55
68033+:10A070000013802B8F8B00A426A400010004AC00E9
68034+:10A08000027298230015AC032578004002B4B02A70
68035+:10A090000013802B241700010300882102D0102414
68036+:10A0A000AF9800A41440FFC9AFB700143C07800864
68037+:10A0B00094E200508FAE00103C05800002A288217F
68038+:10A0C0003C060020A4F10050ACA6003094F40050EF
68039+:10A0D00094EF005201D51823306CFFFF11F4001EDD
68040+:10A0E000AFAC00108CEF004C001561808CF500487F
68041+:10A0F00001EC28210000202100AC582B02A4C02133
68042+:10A10000030BB021ACE5004CACF600488FB4001056
68043+:10A110000014902B021288241620FF7C3C03800838
68044+:10A120008FB300148FBF005C8FBE00583A620001ED
68045+:10A130008FB700548FB600508FB5004C8FB40048D5
68046+:10A140008FB300448FB200408FB1003C8FB0003815
68047+:10A1500003E0000827BD006094FE00548CF2004428
68048+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
68049+:10A170008CE800448CAD003C010D50231940003B9D
68050+:10A18000000000008CF7004026E20001ACA200387D
68051+:10A190003C05005034A700103C038000AC67003041
68052+:10A1A00000000000000000000000000000000000AF
68053+:10A1B000000000000000000000000000000000009F
68054+:10A1C0008C7800003316002012C0FFFD3C1180087F
68055+:10A1D000962200543C1580003C068008304E000159
68056+:10A1E000000E18C0007578218DEC04003C070800B3
68057+:10A1F0008CE700443C040020ACCC00488DF40404FF
68058+:10A20000240B0001ACD4004C10EB0260AEA4003073
68059+:10A21000963900523C0508008CA5004000B99021F9
68060+:10A22000A6320052963F005427ED0001A62D00549F
68061+:10A230009626005430C4FFFF5487FF2F8FB40010C0
68062+:10A2400030A5FFFF0E0011F4A62000543C070800C3
68063+:10A250008CE70024963E00520047B82303D74823DA
68064+:10A26000A62900520A0012198FB400108CE2004097
68065+:10A270000A0012BE00000000922400012407000121
68066+:10A280003085007F14A7001C97AD00268E2B00148C
68067+:10A29000240CC000316A3FFF01AC48243C06080092
68068+:10A2A0008CC60060012A402531043FFF0086882BC0
68069+:10A2B00012200011A7A800263C0508008CA5005814
68070+:10A2C0008F9100A0000439802402FF8000B1182182
68071+:10A2D0000067F82103E2F02433F8007F3C1280008D
68072+:10A2E0003C19800EAE5E002C0319702191D0000D38
68073+:10A2F000360F0004A1CF000D0E001028241200011B
68074+:10A30000241100013C1E80008FC401000E000FCEFE
68075+:10A3100002E028218FC401000E000FDE02C02821B8
68076+:10A320001620FF558F8B00A40A0012860013802B85
68077+:10A330008F8600A490C80001310400201080019194
68078+:10A34000241000013C048008348B0080916A007C5A
68079+:10A350008F9E0034AFA0002C314900011120000F66
68080+:10A36000AFB000288CCD00148C8E006001AE602B45
68081+:10A370001580000201A038218C8700603C188008FD
68082+:10A38000370300808C70007000F0782B15E000021D
68083+:10A3900000E020218C640070AFA4002C3C028008F7
68084+:10A3A000344500808CD200148CBF0070025FC82B33
68085+:10A3B00017200002024020218CA400708FA7002CDF
68086+:10A3C0000087182310600003AFA3003024050002AB
68087+:10A3D000AFA500288FA400280264882B162000BA9D
68088+:10A3E000000018218CD000388FCE000C3C0F00806C
68089+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
68090+:10A40000AFCD000490CA003F3586FFFF01662024CF
68091+:10A410003C0900203C08FFEFA3CA000B0089382547
68092+:10A420003511FFFF00F118243C0500088F8700A4B8
68093+:10A430000065C825AFD9000C8CE20014AFC000182D
68094+:10A440008FA60030AFC200148CF800188FB0002C1B
68095+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
68096+:10A4600003326824AFCF00248CEC000C020670216C
68097+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
68098+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
68099+:10A49000014B48230126402311000011AFC80010D2
68100+:10A4A00090EB003D8FC900048FC80000000B5100E5
68101+:10A4B000012A28210000102100AA882B010218215E
68102+:10A4C0000071F821AFC50004AFDF000090F2003D3D
68103+:10A4D000A3D2000A8F9900A497380006A7D80008D5
68104+:10A4E0008F910038240800023C038008A228000055
68105+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
68106+:10A500000E000FF48F9200380002CB808F8500A4DC
68107+:10A51000021978253C18420001F87025AE4E00045F
68108+:10A520008F8400388CAD0038AC8D00188CAC0034B2
68109+:10A53000AC8C001CAC80000CAC800010A48000141B
68110+:10A54000A4800016A4800020A4800022AC800024F7
68111+:10A5500090A6003F8FA7002CA486000250E0019235
68112+:10A56000240700018FA200305040000290A2003D5D
68113+:10A5700090A2003E244A0001A08A00018F84003886
68114+:10A580008FA9002CAC8900083C128008364D008051
68115+:10A5900091AC007C3186000214C000022407003414
68116+:10A5A000240700308F8500A43C198008373F0080C5
68117+:10A5B00090B0000093F9007C240E0004A0900030BD
68118+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
68119+:10A5D0003304000301C46023A1B200318F8E003820
68120+:10A5E0008F8600A42402C00095CA003294C90012CC
68121+:10A5F0008FAB002C0142402431233FFF010388250B
68122+:10A60000A5D1003291D000323185000300EBF82152
68123+:10A610003218003F370F0040A1CF00328FA4002C2A
68124+:10A6200003E5382133280004108000028F850038AC
68125+:10A6300000E838213C0A8008ACA700343549010005
68126+:10A640008D2800D08FA3002C2419FFBFACA80038A0
68127+:10A6500090B1003C2C640001240FFFDF3227007F03
68128+:10A66000A0A7003C8F98003800049140931F003C45
68129+:10A6700003F98024A310003C8F8C0038918E003C9D
68130+:10A6800001CF682401B23025A186003C8F8900A447
68131+:10A690008F8800388D2B0020AD0B00408D220024C8
68132+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
68133+:10A6B0000E001013AD03004C8FB1002824070002D8
68134+:10A6C000122700118FA300280003282B00058023E8
68135+:10A6D0000270982400608021006090210A00126FAF
68136+:10A6E0000010882B962900128F8400A00000902172
68137+:10A6F0003125FFFFA7A900180E000FC22411000189
68138+:10A700000A00131D3C1E80003C0B80003C12800898
68139+:10A710008D640100924900088F92FF340E000F995A
68140+:10A720003125007F8F9900388FA700288FA4003033
68141+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
68142+:10A740008F91003800026B80020D80253C0842008A
68143+:10A750008F8D00A402085025AE2A00048DA5003874
68144+:10A760008F8A003800007821000F1100AD450018D5
68145+:10A770008DB800343C047FFF3488FFFFAD58001CC7
68146+:10A7800091A6003E8D4C001C8D4900180006190052
68147+:10A79000000677020183C821004E58250323882B29
68148+:10A7A000012B382100F1F821AD59001CAD5F0018D4
68149+:10A7B000AD40000CAD40001091B0003E8FA40030C1
68150+:10A7C00024090005A550001495A500042419C00013
68151+:10A7D00000884024A545001691B8003EA5580020E9
68152+:10A7E00095AF0004A54F0022AD40002491AE003F7C
68153+:10A7F000A54E000291A6003E91AC003D01861023BB
68154+:10A80000244B0001A14B00018F9100388FA3003031
68155+:10A810003C028008344B0100AE230008A22900301E
68156+:10A820008F8C00388F8700A4959F003294F000121F
68157+:10A830002407FFBF033FC02432053FFF03057825EF
68158+:10A84000A58F0032918E00322418FFDF31CD003FFA
68159+:10A8500035A60040A18600328F910038240DFFFFFD
68160+:10A86000240CFF80AE2000348D6A00D0AE2A003860
68161+:10A870009223003C3069007FA229003C8F90003871
68162+:10A880003C0380009219003C0327F824A21F003CDF
68163+:10A890008F8E003891C5003C00B87824A1CF003CD1
68164+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
68165+:10A8B000AD46004491420048004C5825A14B004849
68166+:10A8C0008F9000388F9900A48E09004801238824B6
68167+:10A8D00002283825AE070048933F003EA21F004CD7
68168+:10A8E0008F9800A48F8F003897050004A5E5004ECF
68169+:10A8F0000E0003818DC500609246007C8FAC003055
68170+:10A9000000026940000291000040282130CB000283
68171+:10A9100001B21021156000AA018230213C0E80088E
68172+:10A9200035C20080904C007C31830004106000032D
68173+:10A930008FB900300005788000CF3021241F00043B
68174+:10A940008F910038332D000303ED8023320800037C
68175+:10A9500000C85021AE2A00343C188000A7C500383A
68176+:10A960003C0680088F04010090DE00080E000FDE18
68177+:10A9700033C5007F0E001013000000000A00140D04
68178+:10A980008FA300288F9800348CC90038241F00033F
68179+:10A99000A7000008AF0900008CC50034A300000A1E
68180+:10A9A0008F9900A4AF0500043C080080932D003F60
68181+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
68182+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
68183+:10A9D00003D170243646FFFF01C61824AF03000CD4
68184+:10A9E0008F2C0014972900128F8400A0AF0C001048
68185+:10A9F0008F2F0014AF000018AF000020AF0F00141D
68186+:10AA0000AF0000248F270018312F3FFF000F59801F
68187+:10AA1000AF0700288F2500080164F821312D0001BF
68188+:10AA2000AF0500308F31000C8F920038001F51C2EB
68189+:10AA3000000D438001481021241E00023C068008BE
68190+:10AA4000A702001CA7000034AF11002CA25E00007A
68191+:10AA500034D20080964E005C8F9900383C0342004F
68192+:10AA600031CCFFFF01833825AF2700048F8B00A472
68193+:10AA7000240500012402C0008D640038240700343E
68194+:10AA8000AF2400188D690034AF29001CAF20000CE2
68195+:10AA9000AF200010A7200014A7200016A720002038
68196+:10AAA000A7200022AF200024A7300002A325000128
68197+:10AAB0008F8800388F9F00A4AD10000893ED000030
68198+:10AAC000A10D00308F8A00A48F98003891510001A9
68199+:10AAD000A31100318F8B0038957E003203C27024A1
68200+:10AAE00001CF6025A56C0032916300323064003FD5
68201+:10AAF000A16400329249007C3125000214A00002BA
68202+:10AB00008F840038240700303C198008AC8700345B
68203+:10AB1000373201008E5F00D0240AFFBF020090216F
68204+:10AB2000AC9F0038908D003C31A8007FA088003C8D
68205+:10AB30008F9E003893C2003C004A8824A3D1003C79
68206+:10AB40008F8300380010882B9066003C34CE0020A4
68207+:10AB5000A06E003C8F8400A48F9800388C8C00205D
68208+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
68209+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
68210+:10AB80003C1E80000A0012700000000094C80052B1
68211+:10AB90003C0A08008D4A002401488821A4D10052B3
68212+:10ABA0000A0012198FB40010A08700018F840038AA
68213+:10ABB000240B0001AC8B00080A0013BE3C12800875
68214+:10ABC000000520800A0014A200C4302127BDFFE048
68215+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
68216+:10ABE000AFB1001435B200808E4C001835A80100BA
68217+:10ABF000964B000695A70050910900FC000C5602E8
68218+:10AC0000016728233143007F312600FF240200031F
68219+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
68220+:10AC2000910600FC2412000530C200FF10520033D0
68221+:10AC300000000000160000098FBF001C8FB2001832
68222+:10AC40008FB100148FB00010240D0C003C0C80005C
68223+:10AC500027BD002003E00008AD8D00240E0011FB8D
68224+:10AC6000020020218FBF001C8FB200188FB100148A
68225+:10AC70008FB00010240D0C003C0C800027BD00207C
68226+:10AC800003E00008AD8D0024965800789651007AB4
68227+:10AC9000924E007D0238782631E8FFFF31C400C0B3
68228+:10ACA000148000092D11000116000037000000007B
68229+:10ACB0005620FFE28FBF001C0E0010D100000000E4
68230+:10ACC0000A00156A8FBF001C1620FFDA0000000082
68231+:10ACD0000E0010D1000000001440FFD88FBF001CF0
68232+:10ACE0001600002200000000925F007D33E2003F6A
68233+:10ACF000A242007D0A00156A8FBF001C950900EA78
68234+:10AD00008F86008000802821240400050E0007257E
68235+:10AD10003130FFFF978300923C0480002465FFFFE1
68236+:10AD2000A78500928C8A01B80540FFFE0000000054
68237+:10AD3000AC8001808FBF001CAC9001848FB20018E2
68238+:10AD40008FB100148FB000103C0760133C0B100053
68239+:10AD5000240D0C003C0C800027BD0020AC8701882E
68240+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
68241+:10AD7000020020215040FFB18FBF001C925F007D78
68242+:10AD80000A00159733E2003F0E0011FB020020215C
68243+:10AD90001440FFAA8FBF001C122000070000000013
68244+:10ADA0009259007D3330003F36020040A242007DC0
68245+:10ADB0000A00156A8FBF001C0E0010D100000000B1
68246+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
68247+:10ADD0000A0015C636020040000000000000001BFB
68248+:10ADE0000000000F0000000A00000008000000063C
68249+:10ADF0000000000500000005000000040000000441
68250+:10AE00000000000300000003000000030000000336
68251+:10AE10000000000300000002000000020000000229
68252+:10AE2000000000020000000200000002000000021A
68253+:10AE3000000000020000000200000002000000020A
68254+:10AE400000000002000000020000000200000002FA
68255+:10AE50000000000100000001000000018008010066
68256+:10AE6000800800808008000000000C000000308096
68257+:10AE7000080011D00800127C08001294080012A8E3
68258+:10AE8000080012BC080011D0080011D0080012F010
68259+:10AE90000800132C080013400800138808001A8CBF
68260+:10AEA00008001A8C08001AC408001AC408001AD82E
68261+:10AEB00008001AA808001D0008001CCC08001D5836
68262+:10AEC00008001D5808001DE008001D108008024001
68263+:10AED000080027340800256C0800275C080027F4C8
68264+:10AEE0000800293C0800298808002AAC080029B479
68265+:10AEF00008002A38080025DC08002EDC08002EA4F3
68266+:10AF000008002588080025880800258808002B20CF
68267+:10AF100008002B20080025880800258808002DD06F
68268+:10AF2000080025880800258808002588080025884D
68269+:10AF300008002E0C080025880800258808002588B0
68270+:10AF4000080025880800258808002588080025882D
68271+:10AF5000080025880800258808002588080025881D
68272+:10AF6000080025880800258808002588080029A8E9
68273+:10AF7000080025880800258808002E680800258814
68274+:10AF800008002588080025880800258808002588ED
68275+:10AF900008002588080025880800258808002588DD
68276+:10AFA00008002588080025880800258808002588CD
68277+:10AFB00008002588080025880800258808002588BD
68278+:10AFC00008002CF4080025880800258808002C6853
68279+:10AFD00008002BC408003CE408003CB808003C848E
68280+:10AFE00008003C5808003C3808003BEC8008010091
68281+:10AFF00080080080800800008008008008004C6401
68282+:10B0000008004C9C08004BE408004C6408004C64A9
68283+:10B01000080049B808004C64080050500A000C842D
68284+:10B0200000000000000000000000000D7278703683
68285+:10B030002E322E31620000000602010300000000E3
68286+:10B0400000000001000000000000000000000000FF
68287+:10B0500000000000000000000000000000000000F0
68288+:10B0600000000000000000000000000000000000E0
68289+:10B0700000000000000000000000000000000000D0
68290+:10B0800000000000000000000000000000000000C0
68291+:10B0900000000000000000000000000000000000B0
68292+:10B0A00000000000000000000000000000000000A0
68293+:10B0B0000000000000000000000000000000000090
68294+:10B0C0000000000000000000000000000000000080
68295+:10B0D0000000000000000000000000000000000070
68296+:10B0E0000000000000000000000000000000000060
68297+:10B0F0000000000000000000000000000000000050
68298+:10B10000000000000000000000000000000000003F
68299+:10B11000000000000000000000000000000000002F
68300+:10B12000000000000000000000000000000000001F
68301+:10B13000000000000000000000000000000000000F
68302+:10B1400000000000000000000000000000000000FF
68303+:10B1500000000000000000000000000000000000EF
68304+:10B1600000000000000000000000000000000000DF
68305+:10B1700000000000000000000000000000000000CF
68306+:10B1800000000000000000000000000000000000BF
68307+:10B1900000000000000000000000000000000000AF
68308+:10B1A000000000000000000000000000000000009F
68309+:10B1B000000000000000000000000000000000008F
68310+:10B1C000000000000000000000000000000000007F
68311+:10B1D000000000000000000000000000000000006F
68312+:10B1E000000000000000000000000000000000005F
68313+:10B1F000000000000000000000000000000000004F
68314+:10B20000000000000000000000000000000000003E
68315+:10B21000000000000000000000000000000000002E
68316+:10B22000000000000000000000000000000000001E
68317+:10B23000000000000000000000000000000000000E
68318+:10B2400000000000000000000000000000000000FE
68319+:10B2500000000000000000000000000000000000EE
68320+:10B2600000000000000000000000000000000000DE
68321+:10B2700000000000000000000000000000000000CE
68322+:10B2800000000000000000000000000000000000BE
68323+:10B2900000000000000000000000000000000000AE
68324+:10B2A000000000000000000000000000000000009E
68325+:10B2B000000000000000000000000000000000008E
68326+:10B2C000000000000000000000000000000000007E
68327+:10B2D000000000000000000000000000000000006E
68328+:10B2E000000000000000000000000000000000005E
68329+:10B2F000000000000000000000000000000000004E
68330+:10B30000000000000000000000000000000000003D
68331+:10B31000000000000000000000000000000000002D
68332+:10B32000000000000000000000000000000000001D
68333+:10B33000000000000000000000000000000000000D
68334+:10B3400000000000000000000000000000000000FD
68335+:10B3500000000000000000000000000000000000ED
68336+:10B3600000000000000000000000000000000000DD
68337+:10B3700000000000000000000000000000000000CD
68338+:10B3800000000000000000000000000000000000BD
68339+:10B3900000000000000000000000000000000000AD
68340+:10B3A000000000000000000000000000000000009D
68341+:10B3B000000000000000000000000000000000008D
68342+:10B3C000000000000000000000000000000000007D
68343+:10B3D000000000000000000000000000000000006D
68344+:10B3E000000000000000000000000000000000005D
68345+:10B3F000000000000000000000000000000000004D
68346+:10B40000000000000000000000000000000000003C
68347+:10B41000000000000000000000000000000000002C
68348+:10B42000000000000000000000000000000000001C
68349+:10B43000000000000000000000000000000000000C
68350+:10B4400000000000000000000000000000000000FC
68351+:10B4500000000000000000000000000000000000EC
68352+:10B4600000000000000000000000000000000000DC
68353+:10B4700000000000000000000000000000000000CC
68354+:10B4800000000000000000000000000000000000BC
68355+:10B4900000000000000000000000000000000000AC
68356+:10B4A000000000000000000000000000000000009C
68357+:10B4B000000000000000000000000000000000008C
68358+:10B4C000000000000000000000000000000000007C
68359+:10B4D000000000000000000000000000000000006C
68360+:10B4E000000000000000000000000000000000005C
68361+:10B4F000000000000000000000000000000000004C
68362+:10B50000000000000000000000000000000000003B
68363+:10B51000000000000000000000000000000000002B
68364+:10B52000000000000000000000000000000000001B
68365+:10B53000000000000000000000000000000000000B
68366+:10B5400000000000000000000000000000000000FB
68367+:10B5500000000000000000000000000000000000EB
68368+:10B5600000000000000000000000000000000000DB
68369+:10B5700000000000000000000000000000000000CB
68370+:10B5800000000000000000000000000000000000BB
68371+:10B5900000000000000000000000000000000000AB
68372+:10B5A000000000000000000000000000000000009B
68373+:10B5B000000000000000000000000000000000008B
68374+:10B5C000000000000000000000000000000000007B
68375+:10B5D000000000000000000000000000000000006B
68376+:10B5E000000000000000000000000000000000005B
68377+:10B5F000000000000000000000000000000000004B
68378+:10B60000000000000000000000000000000000003A
68379+:10B61000000000000000000000000000000000002A
68380+:10B62000000000000000000000000000000000001A
68381+:10B63000000000000000000000000000000000000A
68382+:10B6400000000000000000000000000000000000FA
68383+:10B6500000000000000000000000000000000000EA
68384+:10B6600000000000000000000000000000000000DA
68385+:10B6700000000000000000000000000000000000CA
68386+:10B6800000000000000000000000000000000000BA
68387+:10B6900000000000000000000000000000000000AA
68388+:10B6A000000000000000000000000000000000009A
68389+:10B6B000000000000000000000000000000000008A
68390+:10B6C000000000000000000000000000000000007A
68391+:10B6D000000000000000000000000000000000006A
68392+:10B6E000000000000000000000000000000000005A
68393+:10B6F000000000000000000000000000000000004A
68394+:10B700000000000000000000000000000000000039
68395+:10B710000000000000000000000000000000000029
68396+:10B720000000000000000000000000000000000019
68397+:10B730000000000000000000000000000000000009
68398+:10B7400000000000000000000000000000000000F9
68399+:10B7500000000000000000000000000000000000E9
68400+:10B7600000000000000000000000000000000000D9
68401+:10B7700000000000000000000000000000000000C9
68402+:10B7800000000000000000000000000000000000B9
68403+:10B7900000000000000000000000000000000000A9
68404+:10B7A0000000000000000000000000000000000099
68405+:10B7B0000000000000000000000000000000000089
68406+:10B7C0000000000000000000000000000000000079
68407+:10B7D0000000000000000000000000000000000069
68408+:10B7E0000000000000000000000000000000000059
68409+:10B7F0000000000000000000000000000000000049
68410+:10B800000000000000000000000000000000000038
68411+:10B810000000000000000000000000000000000028
68412+:10B820000000000000000000000000000000000018
68413+:10B830000000000000000000000000000000000008
68414+:10B8400000000000000000000000000000000000F8
68415+:10B8500000000000000000000000000000000000E8
68416+:10B8600000000000000000000000000000000000D8
68417+:10B8700000000000000000000000000000000000C8
68418+:10B8800000000000000000000000000000000000B8
68419+:10B8900000000000000000000000000000000000A8
68420+:10B8A0000000000000000000000000000000000098
68421+:10B8B0000000000000000000000000000000000088
68422+:10B8C0000000000000000000000000000000000078
68423+:10B8D0000000000000000000000000000000000068
68424+:10B8E0000000000000000000000000000000000058
68425+:10B8F0000000000000000000000000000000000048
68426+:10B900000000000000000000000000000000000037
68427+:10B910000000000000000000000000000000000027
68428+:10B920000000000000000000000000000000000017
68429+:10B930000000000000000000000000000000000007
68430+:10B9400000000000000000000000000000000000F7
68431+:10B9500000000000000000000000000000000000E7
68432+:10B9600000000000000000000000000000000000D7
68433+:10B9700000000000000000000000000000000000C7
68434+:10B9800000000000000000000000000000000000B7
68435+:10B9900000000000000000000000000000000000A7
68436+:10B9A0000000000000000000000000000000000097
68437+:10B9B0000000000000000000000000000000000087
68438+:10B9C0000000000000000000000000000000000077
68439+:10B9D0000000000000000000000000000000000067
68440+:10B9E0000000000000000000000000000000000057
68441+:10B9F0000000000000000000000000000000000047
68442+:10BA00000000000000000000000000000000000036
68443+:10BA10000000000000000000000000000000000026
68444+:10BA20000000000000000000000000000000000016
68445+:10BA30000000000000000000000000000000000006
68446+:10BA400000000000000000000000000000000000F6
68447+:10BA500000000000000000000000000000000000E6
68448+:10BA600000000000000000000000000000000000D6
68449+:10BA700000000000000000000000000000000000C6
68450+:10BA800000000000000000000000000000000000B6
68451+:10BA900000000000000000000000000000000000A6
68452+:10BAA0000000000000000000000000000000000096
68453+:10BAB0000000000000000000000000000000000086
68454+:10BAC0000000000000000000000000000000000076
68455+:10BAD0000000000000000000000000000000000066
68456+:10BAE0000000000000000000000000000000000056
68457+:10BAF0000000000000000000000000000000000046
68458+:10BB00000000000000000000000000000000000035
68459+:10BB10000000000000000000000000000000000025
68460+:10BB20000000000000000000000000000000000015
68461+:10BB30000000000000000000000000000000000005
68462+:10BB400000000000000000000000000000000000F5
68463+:10BB500000000000000000000000000000000000E5
68464+:10BB600000000000000000000000000000000000D5
68465+:10BB700000000000000000000000000000000000C5
68466+:10BB800000000000000000000000000000000000B5
68467+:10BB900000000000000000000000000000000000A5
68468+:10BBA0000000000000000000000000000000000095
68469+:10BBB0000000000000000000000000000000000085
68470+:10BBC0000000000000000000000000000000000075
68471+:10BBD0000000000000000000000000000000000065
68472+:10BBE0000000000000000000000000000000000055
68473+:10BBF0000000000000000000000000000000000045
68474+:10BC00000000000000000000000000000000000034
68475+:10BC10000000000000000000000000000000000024
68476+:10BC20000000000000000000000000000000000014
68477+:10BC30000000000000000000000000000000000004
68478+:10BC400000000000000000000000000000000000F4
68479+:10BC500000000000000000000000000000000000E4
68480+:10BC600000000000000000000000000000000000D4
68481+:10BC700000000000000000000000000000000000C4
68482+:10BC800000000000000000000000000000000000B4
68483+:10BC900000000000000000000000000000000000A4
68484+:10BCA0000000000000000000000000000000000094
68485+:10BCB0000000000000000000000000000000000084
68486+:10BCC0000000000000000000000000000000000074
68487+:10BCD0000000000000000000000000000000000064
68488+:10BCE0000000000000000000000000000000000054
68489+:10BCF0000000000000000000000000000000000044
68490+:10BD00000000000000000000000000000000000033
68491+:10BD10000000000000000000000000000000000023
68492+:10BD20000000000000000000000000000000000013
68493+:10BD30000000000000000000000000000000000003
68494+:10BD400000000000000000000000000000000000F3
68495+:10BD500000000000000000000000000000000000E3
68496+:10BD600000000000000000000000000000000000D3
68497+:10BD700000000000000000000000000000000000C3
68498+:10BD800000000000000000000000000000000000B3
68499+:10BD900000000000000000000000000000000000A3
68500+:10BDA0000000000000000000000000000000000093
68501+:10BDB0000000000000000000000000000000000083
68502+:10BDC0000000000000000000000000000000000073
68503+:10BDD0000000000000000000000000000000000063
68504+:10BDE0000000000000000000000000000000000053
68505+:10BDF0000000000000000000000000000000000043
68506+:10BE00000000000000000000000000000000000032
68507+:10BE10000000000000000000000000000000000022
68508+:10BE20000000000000000000000000000000000012
68509+:10BE30000000000000000000000000000000000002
68510+:10BE400000000000000000000000000000000000F2
68511+:10BE500000000000000000000000000000000000E2
68512+:10BE600000000000000000000000000000000000D2
68513+:10BE700000000000000000000000000000000000C2
68514+:10BE800000000000000000000000000000000000B2
68515+:10BE900000000000000000000000000000000000A2
68516+:10BEA0000000000000000000000000000000000092
68517+:10BEB0000000000000000000000000000000000082
68518+:10BEC0000000000000000000000000000000000072
68519+:10BED0000000000000000000000000000000000062
68520+:10BEE0000000000000000000000000000000000052
68521+:10BEF0000000000000000000000000000000000042
68522+:10BF00000000000000000000000000000000000031
68523+:10BF10000000000000000000000000000000000021
68524+:10BF20000000000000000000000000000000000011
68525+:10BF30000000000000000000000000000000000001
68526+:10BF400000000000000000000000000000000000F1
68527+:10BF500000000000000000000000000000000000E1
68528+:10BF600000000000000000000000000000000000D1
68529+:10BF700000000000000000000000000000000000C1
68530+:10BF800000000000000000000000000000000000B1
68531+:10BF900000000000000000000000000000000000A1
68532+:10BFA0000000000000000000000000000000000091
68533+:10BFB0000000000000000000000000000000000081
68534+:10BFC0000000000000000000000000000000000071
68535+:10BFD0000000000000000000000000000000000061
68536+:10BFE0000000000000000000000000000000000051
68537+:10BFF0000000000000000000000000000000000041
68538+:10C000000000000000000000000000000000000030
68539+:10C010000000000000000000000000000000000020
68540+:10C020000000000000000000000000000000000010
68541+:10C030000000000000000000000000000000000000
68542+:10C0400000000000000000000000000000000000F0
68543+:10C0500000000000000000000000000000000000E0
68544+:10C0600000000000000000000000000000000000D0
68545+:10C0700000000000000000000000000000000000C0
68546+:10C0800000000000000000000000000000000000B0
68547+:10C0900000000000000000000000000000000000A0
68548+:10C0A0000000000000000000000000000000000090
68549+:10C0B0000000000000000000000000000000000080
68550+:10C0C0000000000000000000000000000000000070
68551+:10C0D0000000000000000000000000000000000060
68552+:10C0E0000000000000000000000000000000000050
68553+:10C0F0000000000000000000000000000000000040
68554+:10C10000000000000000000000000000000000002F
68555+:10C11000000000000000000000000000000000001F
68556+:10C12000000000000000000000000000000000000F
68557+:10C1300000000000000000000000000000000000FF
68558+:10C1400000000000000000000000000000000000EF
68559+:10C1500000000000000000000000000000000000DF
68560+:10C1600000000000000000000000000000000000CF
68561+:10C1700000000000000000000000000000000000BF
68562+:10C1800000000000000000000000000000000000AF
68563+:10C19000000000000000000000000000000000009F
68564+:10C1A000000000000000000000000000000000008F
68565+:10C1B000000000000000000000000000000000007F
68566+:10C1C000000000000000000000000000000000006F
68567+:10C1D000000000000000000000000000000000005F
68568+:10C1E000000000000000000000000000000000004F
68569+:10C1F000000000000000000000000000000000003F
68570+:10C20000000000000000000000000000000000002E
68571+:10C21000000000000000000000000000000000001E
68572+:10C22000000000000000000000000000000000000E
68573+:10C2300000000000000000000000000000000000FE
68574+:10C2400000000000000000000000000000000000EE
68575+:10C2500000000000000000000000000000000000DE
68576+:10C2600000000000000000000000000000000000CE
68577+:10C2700000000000000000000000000000000000BE
68578+:10C2800000000000000000000000000000000000AE
68579+:10C29000000000000000000000000000000000009E
68580+:10C2A000000000000000000000000000000000008E
68581+:10C2B000000000000000000000000000000000007E
68582+:10C2C000000000000000000000000000000000006E
68583+:10C2D000000000000000000000000000000000005E
68584+:10C2E000000000000000000000000000000000004E
68585+:10C2F000000000000000000000000000000000003E
68586+:10C30000000000000000000000000000000000002D
68587+:10C31000000000000000000000000000000000001D
68588+:10C32000000000000000000000000000000000000D
68589+:10C3300000000000000000000000000000000000FD
68590+:10C3400000000000000000000000000000000000ED
68591+:10C3500000000000000000000000000000000000DD
68592+:10C3600000000000000000000000000000000000CD
68593+:10C3700000000000000000000000000000000000BD
68594+:10C3800000000000000000000000000000000000AD
68595+:10C39000000000000000000000000000000000009D
68596+:10C3A000000000000000000000000000000000008D
68597+:10C3B000000000000000000000000000000000007D
68598+:10C3C000000000000000000000000000000000006D
68599+:10C3D000000000000000000000000000000000005D
68600+:10C3E000000000000000000000000000000000004D
68601+:10C3F000000000000000000000000000000000003D
68602+:10C40000000000000000000000000000000000002C
68603+:10C41000000000000000000000000000000000001C
68604+:10C42000000000000000000000000000000000000C
68605+:10C4300000000000000000000000000000000000FC
68606+:10C4400000000000000000000000000000000000EC
68607+:10C4500000000000000000000000000000000000DC
68608+:10C4600000000000000000000000000000000000CC
68609+:10C4700000000000000000000000000000000000BC
68610+:10C4800000000000000000000000000000000000AC
68611+:10C49000000000000000000000000000000000009C
68612+:10C4A000000000000000000000000000000000008C
68613+:10C4B000000000000000000000000000000000007C
68614+:10C4C000000000000000000000000000000000006C
68615+:10C4D000000000000000000000000000000000005C
68616+:10C4E000000000000000000000000000000000004C
68617+:10C4F000000000000000000000000000000000003C
68618+:10C50000000000000000000000000000000000002B
68619+:10C51000000000000000000000000000000000001B
68620+:10C52000000000000000000000000000000000000B
68621+:10C5300000000000000000000000000000000000FB
68622+:10C5400000000000000000000000000000000000EB
68623+:10C5500000000000000000000000000000000000DB
68624+:10C5600000000000000000000000000000000000CB
68625+:10C5700000000000000000000000000000000000BB
68626+:10C5800000000000000000000000000000000000AB
68627+:10C59000000000000000000000000000000000009B
68628+:10C5A000000000000000000000000000000000008B
68629+:10C5B000000000000000000000000000000000007B
68630+:10C5C000000000000000000000000000000000006B
68631+:10C5D000000000000000000000000000000000005B
68632+:10C5E000000000000000000000000000000000004B
68633+:10C5F000000000000000000000000000000000003B
68634+:10C60000000000000000000000000000000000002A
68635+:10C61000000000000000000000000000000000001A
68636+:10C62000000000000000000000000000000000000A
68637+:10C6300000000000000000000000000000000000FA
68638+:10C6400000000000000000000000000000000000EA
68639+:10C6500000000000000000000000000000000000DA
68640+:10C6600000000000000000000000000000000000CA
68641+:10C6700000000000000000000000000000000000BA
68642+:10C6800000000000000000000000000000000000AA
68643+:10C69000000000000000000000000000000000009A
68644+:10C6A000000000000000000000000000000000008A
68645+:10C6B000000000000000000000000000000000007A
68646+:10C6C000000000000000000000000000000000006A
68647+:10C6D000000000000000000000000000000000005A
68648+:10C6E000000000000000000000000000000000004A
68649+:10C6F000000000000000000000000000000000003A
68650+:10C700000000000000000000000000000000000029
68651+:10C710000000000000000000000000000000000019
68652+:10C720000000000000000000000000000000000009
68653+:10C7300000000000000000000000000000000000F9
68654+:10C7400000000000000000000000000000000000E9
68655+:10C7500000000000000000000000000000000000D9
68656+:10C7600000000000000000000000000000000000C9
68657+:10C7700000000000000000000000000000000000B9
68658+:10C7800000000000000000000000000000000000A9
68659+:10C790000000000000000000000000000000000099
68660+:10C7A0000000000000000000000000000000000089
68661+:10C7B0000000000000000000000000000000000079
68662+:10C7C0000000000000000000000000000000000069
68663+:10C7D0000000000000000000000000000000000059
68664+:10C7E0000000000000000000000000000000000049
68665+:10C7F0000000000000000000000000000000000039
68666+:10C800000000000000000000000000000000000028
68667+:10C810000000000000000000000000000000000018
68668+:10C820000000000000000000000000000000000008
68669+:10C8300000000000000000000000000000000000F8
68670+:10C8400000000000000000000000000000000000E8
68671+:10C8500000000000000000000000000000000000D8
68672+:10C8600000000000000000000000000000000000C8
68673+:10C8700000000000000000000000000000000000B8
68674+:10C8800000000000000000000000000000000000A8
68675+:10C890000000000000000000000000000000000098
68676+:10C8A0000000000000000000000000000000000088
68677+:10C8B0000000000000000000000000000000000078
68678+:10C8C0000000000000000000000000000000000068
68679+:10C8D0000000000000000000000000000000000058
68680+:10C8E0000000000000000000000000000000000048
68681+:10C8F0000000000000000000000000000000000038
68682+:10C900000000000000000000000000000000000027
68683+:10C910000000000000000000000000000000000017
68684+:10C920000000000000000000000000000000000007
68685+:10C9300000000000000000000000000000000000F7
68686+:10C9400000000000000000000000000000000000E7
68687+:10C9500000000000000000000000000000000000D7
68688+:10C9600000000000000000000000000000000000C7
68689+:10C9700000000000000000000000000000000000B7
68690+:10C9800000000000000000000000000000000000A7
68691+:10C990000000000000000000000000000000000097
68692+:10C9A0000000000000000000000000000000000087
68693+:10C9B0000000000000000000000000000000000077
68694+:10C9C0000000000000000000000000000000000067
68695+:10C9D0000000000000000000000000000000000057
68696+:10C9E0000000000000000000000000000000000047
68697+:10C9F0000000000000000000000000000000000037
68698+:10CA00000000000000000000000000000000000026
68699+:10CA10000000000000000000000000000000000016
68700+:10CA20000000000000000000000000000000000006
68701+:10CA300000000000000000000000000000000000F6
68702+:10CA400000000000000000000000000000000000E6
68703+:10CA500000000000000000000000000000000000D6
68704+:10CA600000000000000000000000000000000000C6
68705+:10CA700000000000000000000000000000000000B6
68706+:10CA800000000000000000000000000000000000A6
68707+:10CA90000000000000000000000000000000000096
68708+:10CAA0000000000000000000000000000000000086
68709+:10CAB0000000000000000000000000000000000076
68710+:10CAC0000000000000000000000000000000000066
68711+:10CAD0000000000000000000000000000000000056
68712+:10CAE0000000000000000000000000000000000046
68713+:10CAF0000000000000000000000000000000000036
68714+:10CB00000000000000000000000000000000000025
68715+:10CB10000000000000000000000000000000000015
68716+:10CB20000000000000000000000000000000000005
68717+:10CB300000000000000000000000000000000000F5
68718+:10CB400000000000000000000000000000000000E5
68719+:10CB500000000000000000000000000000000000D5
68720+:10CB600000000000000000000000000000000000C5
68721+:10CB700000000000000000000000000000000000B5
68722+:10CB800000000000000000000000000000000000A5
68723+:10CB90000000000000000000000000000000000095
68724+:10CBA0000000000000000000000000000000000085
68725+:10CBB0000000000000000000000000000000000075
68726+:10CBC0000000000000000000000000000000000065
68727+:10CBD0000000000000000000000000000000000055
68728+:10CBE0000000000000000000000000000000000045
68729+:10CBF0000000000000000000000000000000000035
68730+:10CC00000000000000000000000000000000000024
68731+:10CC10000000000000000000000000000000000014
68732+:10CC20000000000000000000000000000000000004
68733+:10CC300000000000000000000000000000000000F4
68734+:10CC400000000000000000000000000000000000E4
68735+:10CC500000000000000000000000000000000000D4
68736+:10CC600000000000000000000000000000000000C4
68737+:10CC700000000000000000000000000000000000B4
68738+:10CC800000000000000000000000000000000000A4
68739+:10CC90000000000000000000000000000000000094
68740+:10CCA0000000000000000000000000000000000084
68741+:10CCB0000000000000000000000000000000000074
68742+:10CCC0000000000000000000000000000000000064
68743+:10CCD0000000000000000000000000000000000054
68744+:10CCE0000000000000000000000000000000000044
68745+:10CCF0000000000000000000000000000000000034
68746+:10CD00000000000000000000000000000000000023
68747+:10CD10000000000000000000000000000000000013
68748+:10CD20000000000000000000000000000000000003
68749+:10CD300000000000000000000000000000000000F3
68750+:10CD400000000000000000000000000000000000E3
68751+:10CD500000000000000000000000000000000000D3
68752+:10CD600000000000000000000000000000000000C3
68753+:10CD700000000000000000000000000000000000B3
68754+:10CD800000000000000000000000000000000000A3
68755+:10CD90000000000000000000000000000000000093
68756+:10CDA0000000000000000000000000000000000083
68757+:10CDB0000000000000000000000000000000000073
68758+:10CDC0000000000000000000000000000000000063
68759+:10CDD0000000000000000000000000000000000053
68760+:10CDE0000000000000000000000000000000000043
68761+:10CDF0000000000000000000000000000000000033
68762+:10CE00000000000000000000000000000000000022
68763+:10CE10000000000000000000000000000000000012
68764+:10CE20000000000000000000000000000000000002
68765+:10CE300000000000000000000000000000000000F2
68766+:10CE400000000000000000000000000000000000E2
68767+:10CE500000000000000000000000000000000000D2
68768+:10CE600000000000000000000000000000000000C2
68769+:10CE700000000000000000000000000000000000B2
68770+:10CE800000000000000000000000000000000000A2
68771+:10CE90000000000000000000000000000000000092
68772+:10CEA0000000000000000000000000000000000082
68773+:10CEB0000000000000000000000000000000000072
68774+:10CEC0000000000000000000000000000000000062
68775+:10CED0000000000000000000000000000000000052
68776+:10CEE0000000000000000000000000000000000042
68777+:10CEF0000000000000000000000000000000000032
68778+:10CF00000000000000000000000000000000000021
68779+:10CF10000000000000000000000000000000000011
68780+:10CF20000000000000000000000000000000000001
68781+:10CF300000000000000000000000000000000000F1
68782+:10CF400000000000000000000000000000000000E1
68783+:10CF500000000000000000000000000000000000D1
68784+:10CF600000000000000000000000000000000000C1
68785+:10CF700000000000000000000000000000000000B1
68786+:10CF800000000000000000000000000000000000A1
68787+:10CF90000000000000000000000000000000000091
68788+:10CFA0000000000000000000000000000000000081
68789+:10CFB0000000000000000000000000000000000071
68790+:10CFC0000000000000000000000000000000000061
68791+:10CFD0000000000000000000000000000000000051
68792+:10CFE0000000000000000000000000000000000041
68793+:10CFF0000000000000000000000000000000000031
68794+:10D000000000000000000000000000000000000020
68795+:10D010000000000000000000000000000000000010
68796+:10D020000000000000000000000000000000000000
68797+:10D0300000000000000000000000000000000000F0
68798+:10D0400000000000000000000000000000000000E0
68799+:10D0500000000000000000000000000000000000D0
68800+:10D0600000000000000000000000000000000000C0
68801+:10D0700000000000000000000000000000000000B0
68802+:10D0800000000000000000000000000000000000A0
68803+:10D090000000000000000000000000000000000090
68804+:10D0A0000000000000000000000000000000000080
68805+:10D0B0000000000000000000000000000000000070
68806+:10D0C0000000000000000000000000000000000060
68807+:10D0D0000000000000000000000000000000000050
68808+:10D0E0000000000000000000000000000000000040
68809+:10D0F0000000000000000000000000000000000030
68810+:10D10000000000000000000000000000000000001F
68811+:10D11000000000000000000000000000000000000F
68812+:10D1200000000000000000000000000000000000FF
68813+:10D1300000000000000000000000000000000000EF
68814+:10D1400000000000000000000000000000000000DF
68815+:10D1500000000000000000000000000000000000CF
68816+:10D1600000000000000000000000000000000000BF
68817+:10D1700000000000000000000000000000000000AF
68818+:10D18000000000000000000000000000000000009F
68819+:10D19000000000000000000000000000000000008F
68820+:10D1A000000000000000000000000000000000007F
68821+:10D1B000000000000000000000000000000000006F
68822+:10D1C000000000000000000000000000000000005F
68823+:10D1D000000000000000000000000000000000004F
68824+:10D1E000000000000000000000000000000000003F
68825+:10D1F000000000000000000000000000000000002F
68826+:10D20000000000000000000000000000000000001E
68827+:10D21000000000000000000000000000000000000E
68828+:10D2200000000000000000000000000000000000FE
68829+:10D2300000000000000000000000000000000000EE
68830+:10D2400000000000000000000000000000000000DE
68831+:10D2500000000000000000000000000000000000CE
68832+:10D2600000000000000000000000000000000000BE
68833+:10D2700000000000000000000000000000000000AE
68834+:10D28000000000000000000000000000000000009E
68835+:10D29000000000000000000000000000000000008E
68836+:10D2A000000000000000000000000000000000007E
68837+:10D2B000000000000000000000000000000000006E
68838+:10D2C000000000000000000000000000000000005E
68839+:10D2D000000000000000000000000000000000004E
68840+:10D2E000000000000000000000000000000000003E
68841+:10D2F000000000000000000000000000000000002E
68842+:10D30000000000000000000000000000000000001D
68843+:10D31000000000000000000000000000000000000D
68844+:10D3200000000000000000000000000000000000FD
68845+:10D3300000000000000000000000000000000000ED
68846+:10D3400000000000000000000000000000000000DD
68847+:10D3500000000000000000000000000000000000CD
68848+:10D3600000000000000000000000000000000000BD
68849+:10D3700000000000000000000000000000000000AD
68850+:10D38000000000000000000000000000000000009D
68851+:10D39000000000000000000000000000000000008D
68852+:10D3A000000000000000000000000000000000007D
68853+:10D3B000000000000000000000000000000000006D
68854+:10D3C000000000000000000000000000000000005D
68855+:10D3D000000000000000000000000000000000004D
68856+:10D3E000000000000000000000000000000000003D
68857+:10D3F000000000000000000000000000000000002D
68858+:10D40000000000000000000000000000000000001C
68859+:10D41000000000000000000000000000000000000C
68860+:10D4200000000000000000000000000000000000FC
68861+:10D4300000000000000000000000000000000000EC
68862+:10D4400000000000000000000000000000000000DC
68863+:10D4500000000000000000000000000000000000CC
68864+:10D4600000000000000000000000000000000000BC
68865+:10D4700000000000000000000000000000000000AC
68866+:10D48000000000000000000000000000000000009C
68867+:10D49000000000000000000000000000000000008C
68868+:10D4A000000000000000000000000000000000007C
68869+:10D4B000000000000000000000000000000000006C
68870+:10D4C000000000000000000000000000000000005C
68871+:10D4D000000000000000000000000000000000004C
68872+:10D4E000000000000000000000000000000000003C
68873+:10D4F000000000000000000000000000000000002C
68874+:10D50000000000000000000000000000000000001B
68875+:10D51000000000000000000000000000000000000B
68876+:10D5200000000000000000000000000000000000FB
68877+:10D5300000000000000000000000000000000000EB
68878+:10D5400000000000000000000000000000000000DB
68879+:10D5500000000000000000000000000000000000CB
68880+:10D5600000000000000000000000000000000000BB
68881+:10D5700000000000000000000000000000000000AB
68882+:10D58000000000000000000000000000000000009B
68883+:10D59000000000000000000000000000000000008B
68884+:10D5A000000000000000000000000000000000007B
68885+:10D5B000000000000000000000000000000000006B
68886+:10D5C000000000000000000000000000000000005B
68887+:10D5D000000000000000000000000000000000004B
68888+:10D5E000000000000000000000000000000000003B
68889+:10D5F000000000000000000000000000000000002B
68890+:10D60000000000000000000000000000000000001A
68891+:10D61000000000000000000000000000000000000A
68892+:10D6200000000000000000000000000000000000FA
68893+:10D6300000000000000000000000000000000000EA
68894+:10D6400000000000000000000000000000000000DA
68895+:10D6500000000000000000000000000000000000CA
68896+:10D6600000000000000000000000000000000000BA
68897+:10D6700000000000000000000000000000000000AA
68898+:10D68000000000000000000000000000000000009A
68899+:10D69000000000000000000000000000000000008A
68900+:10D6A000000000000000000000000000000000007A
68901+:10D6B000000000000000000000000000000000006A
68902+:10D6C000000000000000000000000000000000005A
68903+:10D6D000000000000000000000000000000000004A
68904+:10D6E000000000000000000000000000000000003A
68905+:10D6F000000000000000000000000000000000002A
68906+:10D700000000000000000000000000000000000019
68907+:10D710000000000000000000000000000000000009
68908+:10D7200000000000000000000000000000000000F9
68909+:10D7300000000000000000000000000000000000E9
68910+:10D7400000000000000000000000000000000000D9
68911+:10D7500000000000000000000000000000000000C9
68912+:10D7600000000000000000000000000000000000B9
68913+:10D7700000000000000000000000000000000000A9
68914+:10D780000000000000000000000000000000000099
68915+:10D790000000000000000000000000000000000089
68916+:10D7A0000000000000000000000000000000000079
68917+:10D7B0000000000000000000000000000000000069
68918+:10D7C0000000000000000000000000000000000059
68919+:10D7D0000000000000000000000000000000000049
68920+:10D7E0000000000000000000000000000000000039
68921+:10D7F0000000000000000000000000000000000029
68922+:10D800000000000000000000000000000000000018
68923+:10D810000000000000000000000000000000000008
68924+:10D8200000000000000000000000000000000000F8
68925+:10D8300000000000000000000000000000000000E8
68926+:10D8400000000000000000000000000000000000D8
68927+:10D8500000000000000000000000000000000000C8
68928+:10D8600000000000000000000000000000000000B8
68929+:10D8700000000000000000000000000000000000A8
68930+:10D880000000000000000000000000000000000098
68931+:10D890000000000000000000000000000000000088
68932+:10D8A0000000000000000000000000000000000078
68933+:10D8B0000000000000000000000000000000000068
68934+:10D8C0000000000000000000000000000000000058
68935+:10D8D0000000000000000000000000000000000048
68936+:10D8E0000000000000000000000000000000000038
68937+:10D8F0000000000000000000000000000000000028
68938+:10D900000000000000000000000000000000000017
68939+:10D910000000000000000000000000000000000007
68940+:10D9200000000000000000000000000000000000F7
68941+:10D9300000000000000000000000000000000000E7
68942+:10D9400000000000000000000000000000000000D7
68943+:10D9500000000000000000000000000000000000C7
68944+:10D9600000000000000000000000000000000000B7
68945+:10D9700000000000000000000000000000000000A7
68946+:10D980000000000000000000000000000000000097
68947+:10D990000000000000000000000000000000000087
68948+:10D9A0000000000000000000000000000000000077
68949+:10D9B0000000000000000000000000000000000067
68950+:10D9C0000000000000000000000000000000000057
68951+:10D9D0000000000000000000000000000000000047
68952+:10D9E0000000000000000000000000000000000037
68953+:10D9F0000000000000000000000000000000000027
68954+:10DA00000000000000000000000000000000000016
68955+:10DA10000000000000000000000000000000000006
68956+:10DA200000000000000000000000000000000000F6
68957+:10DA300000000000000000000000000000000000E6
68958+:10DA400000000000000000000000000000000000D6
68959+:10DA500000000000000000000000000000000000C6
68960+:10DA600000000000000000000000000000000000B6
68961+:10DA700000000000000000000000000000000000A6
68962+:10DA80000000000000000000000000000000000096
68963+:10DA90000000000000000000000000000000000086
68964+:10DAA0000000000000000000000000000000000076
68965+:10DAB0000000000000000000000000000000000066
68966+:10DAC0000000000000000000000000000000000056
68967+:10DAD0000000000000000000000000000000000046
68968+:10DAE0000000000000000000000000000000000036
68969+:10DAF0000000000000000000000000000000000026
68970+:10DB00000000000000000000000000000000000015
68971+:10DB10000000000000000000000000000000000005
68972+:10DB200000000000000000000000000000000000F5
68973+:10DB300000000000000000000000000000000000E5
68974+:10DB400000000000000000000000000000000000D5
68975+:10DB500000000000000000000000000000000000C5
68976+:10DB600000000000000000000000000000000000B5
68977+:10DB700000000000000000000000000000000000A5
68978+:10DB80000000000000000000000000000000000095
68979+:10DB90000000000000000000000000000000000085
68980+:10DBA0000000000000000000000000000000000075
68981+:10DBB0000000000000000000000000000000000065
68982+:10DBC0000000000000000000000000000000000055
68983+:10DBD0000000000000000000000000000000000045
68984+:10DBE0000000000000000000000000000000000035
68985+:10DBF0000000000000000000000000000000000025
68986+:10DC00000000000000000000000000000000000014
68987+:10DC10000000000000000000000000000000000004
68988+:10DC200000000000000000000000000000000000F4
68989+:10DC300000000000000000000000000000000000E4
68990+:10DC400000000000000000000000000000000000D4
68991+:10DC500000000000000000000000000000000000C4
68992+:10DC600000000000000000000000000000000000B4
68993+:10DC700000000000000000000000000000000000A4
68994+:10DC80000000000000000000000000000000000094
68995+:10DC90000000000000000000000000000000000084
68996+:10DCA0000000000000000000000000000000000074
68997+:10DCB0000000000000000000000000000000000064
68998+:10DCC0000000000000000000000000000000000054
68999+:10DCD0000000000000000000000000000000000044
69000+:10DCE0000000000000000000000000000000000034
69001+:10DCF0000000000000000000000000000000000024
69002+:10DD00000000000000000000000000000000000013
69003+:10DD10000000000000000000000000000000000003
69004+:10DD200000000000000000000000000000000000F3
69005+:10DD300000000000000000000000000000000000E3
69006+:10DD400000000000000000000000000000000000D3
69007+:10DD500000000000000000000000000000000000C3
69008+:10DD600000000000000000000000000000000000B3
69009+:10DD700000000000000000000000000000000000A3
69010+:10DD80000000000000000000000000000000000093
69011+:10DD90000000000000000000000000000000000083
69012+:10DDA0000000000000000000000000000000000073
69013+:10DDB0000000000000000000000000000000000063
69014+:10DDC0000000000000000000000000000000000053
69015+:10DDD0000000000000000000000000000000000043
69016+:10DDE0000000000000000000000000000000000033
69017+:10DDF0000000000000000000000000000000000023
69018+:10DE00000000000000000000000000000000000012
69019+:10DE10000000000000000000000000000000000002
69020+:10DE200000000000000000000000000000000000F2
69021+:10DE300000000000000000000000000000000000E2
69022+:10DE400000000000000000000000000000000000D2
69023+:10DE500000000000000000000000000000000000C2
69024+:10DE600000000000000000000000000000000000B2
69025+:10DE700000000000000000000000000000000000A2
69026+:10DE80000000000000000000000000000000000092
69027+:10DE90000000000000000000000000000000000082
69028+:10DEA0000000000000000000000000000000000072
69029+:10DEB0000000000000000000000000000000000062
69030+:10DEC0000000000000000000000000000000000052
69031+:10DED0000000000000000000000000000000000042
69032+:10DEE0000000000000000000000000000000000032
69033+:10DEF0000000000000000000000000000000000022
69034+:10DF00000000000000000000000000000000000011
69035+:10DF10000000000000000000000000000000000001
69036+:10DF200000000000000000000000000000000000F1
69037+:10DF300000000000000000000000000000000000E1
69038+:10DF400000000000000000000000000000000000D1
69039+:10DF500000000000000000000000000000000000C1
69040+:10DF600000000000000000000000000000000000B1
69041+:10DF700000000000000000000000000000000000A1
69042+:10DF80000000000000000000000000000000000091
69043+:10DF90000000000000000000000000000000000081
69044+:10DFA0000000000000000000000000000000000071
69045+:10DFB0000000000000000000000000000000000061
69046+:10DFC0000000000000000000000000000000000051
69047+:10DFD0000000000000000000000000000000000041
69048+:10DFE0000000000000000000000000000000000031
69049+:10DFF0000000000000000000000000000000000021
69050+:10E000000000000000000000000000000000000010
69051+:10E010000000000000000000000000000000000000
69052+:10E0200000000000000000000000000000000000F0
69053+:10E0300000000000000000000000000000000000E0
69054+:10E0400000000000000000000000000000000000D0
69055+:10E0500000000000000000000000000000000000C0
69056+:10E0600000000000000000000000000000000000B0
69057+:10E0700000000000000000000000000000000000A0
69058+:10E080000000000000000000000000000000000090
69059+:10E090000000000000000000000000000000000080
69060+:10E0A0000000000000000000000000000000000070
69061+:10E0B0000000000000000000000000000000000060
69062+:10E0C0000000000000000000000000000000000050
69063+:10E0D0000000000000000000000000000000000040
69064+:10E0E0000000000000000000000000000000000030
69065+:10E0F0000000000000000000000000000000000020
69066+:10E10000000000000000000000000000000000000F
69067+:10E1100000000000000000000000000000000000FF
69068+:10E1200000000000000000000000000000000000EF
69069+:10E1300000000000000000000000000000000000DF
69070+:10E1400000000000000000000000000000000000CF
69071+:10E1500000000000000000000000000000000000BF
69072+:10E1600000000000000000000000000000000000AF
69073+:10E17000000000000000000000000000000000009F
69074+:10E18000000000000000000000000000000000008F
69075+:10E19000000000000000000000000000000000007F
69076+:10E1A000000000000000000000000000000000006F
69077+:10E1B000000000000000000000000000000000005F
69078+:10E1C000000000000000000000000000000000004F
69079+:10E1D000000000000000000000000000000000003F
69080+:10E1E000000000000000000000000000000000002F
69081+:10E1F000000000000000000000000000000000809F
69082+:10E20000000000000000000000000000000000000E
69083+:10E2100000000000000000000000000000000000FE
69084+:10E220000000000A000000000000000000000000E4
69085+:10E2300010000003000000000000000D0000000DB1
69086+:10E240003C020801244295C03C030801246397FC6A
69087+:10E25000AC4000000043202B1480FFFD244200044A
69088+:10E260003C1D080037BD9FFC03A0F0213C100800B6
69089+:10E27000261032103C1C0801279C95C00E0012BECF
69090+:10E28000000000000000000D3C02800030A5FFFFF0
69091+:10E2900030C600FF344301803C0880008D0901B87E
69092+:10E2A0000520FFFE00000000AC6400002404000212
69093+:10E2B000A4650008A066000AA064000BAC67001803
69094+:10E2C0003C03100003E00008AD0301B83C0560000A
69095+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
69096+:10E2E0003C0310003C040200ACA44FC403E000084F
69097+:10E2F000ACA34FF89486000C00A050212488001491
69098+:10E3000000062B0200051080004448210109182B4B
69099+:10E310001060001100000000910300002C6400094F
69100+:10E320005080000991190001000360803C0D080134
69101+:10E3300025AD9258018D58218D67000000E000083E
69102+:10E340000000000091190001011940210109302B42
69103+:10E3500054C0FFF29103000003E000080000102108
69104+:10E360000A000CCC25080001910F0001240E000AC0
69105+:10E3700015EE00400128C8232F38000A1700003D81
69106+:10E38000250D00028D580000250F0006370E0100F4
69107+:10E39000AD4E0000910C000291AB000191A400026F
69108+:10E3A00091A60003000C2E00000B3C0000A71025D6
69109+:10E3B00000041A000043C8250326C025AD580004F8
69110+:10E3C000910E000691ED000191E7000291E5000336
69111+:10E3D000000E5E00000D6400016C30250007220075
69112+:10E3E00000C41025004518252508000A0A000CCC99
69113+:10E3F000AD430008910F000125040002240800022B
69114+:10E4000055E80001012020210A000CCC00804021A9
69115+:10E41000910C0001240B0003158B00160000000076
69116+:10E420008D580000910E000225080003370D0008EA
69117+:10E43000A14E00100A000CCCAD4D00009119000156
69118+:10E44000240F0004172F000B0000000091070002AA
69119+:10E45000910400038D43000000072A0000A410254A
69120+:10E460003466000425080004AD42000C0A000CCC00
69121+:10E47000AD46000003E000082402000127BDFFE8CC
69122+:10E48000AFBF0014AFB000100E00164E0080802108
69123+:10E490003C0480083485008090A600052403FFFE1C
69124+:10E4A0000200202100C310248FBF00148FB0001081
69125+:10E4B000A0A200050A00165827BD001827BDFFE8D6
69126+:10E4C000AFB00010AFBF00140E000FD40080802149
69127+:10E4D0003C06800834C5008090A40000240200504F
69128+:10E4E000308300FF106200073C09800002002021F9
69129+:10E4F0008FBF00148FB00010AD2001800A00108F74
69130+:10E5000027BD0018240801003C07800002002021DC
69131+:10E510008FBF00148FB00010ACE801800A00108F8C
69132+:10E5200027BD001827BDFF783C058008AFBE0080DE
69133+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
69134+:10E54000AFB60078AFB50074AFB40070AFB200687A
69135+:10E55000AFB0006034A600803C0580008CB201287A
69136+:10E5600090C400098CA701043C020001309100FF17
69137+:10E5700000E218240000B8210000F021106000071C
69138+:10E58000000098213C0908008D2931F02413000176
69139+:10E59000252800013C010800AC2831F0ACA0008423
69140+:10E5A00090CC0005000C5827316A0001154000721C
69141+:10E5B000AFA0005090CD00002406002031A400FF41
69142+:10E5C00010860018240E0050108E009300000000EA
69143+:10E5D0003C1008008E1000DC260F00013C010800F2
69144+:10E5E000AC2F00DC0E0016C7000000000040182110
69145+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
69146+:10E600008FB500748FB400708FB3006C8FB2006848
69147+:10E610008FB100648FB000600060102103E000083B
69148+:10E6200027BD00880000000D3C1F8000AFA0003017
69149+:10E6300097E501168FE201043C04002030B9FFFF8A
69150+:10E64000004438240007182B00033140AFA60030E7
69151+:10E650008FF5010437F80C003C1600400338802188
69152+:10E6600002B6A02434C40040128000479215000D69
69153+:10E6700032A800201500000234860080008030217E
69154+:10E6800014C0009FAFA600303C0D800835A6008066
69155+:10E6900090CC0008318B0040516000063C06800899
69156+:10E6A000240E0004122E00A8240F0012122F003294
69157+:10E6B0003C06800834C401003C0280009447011AE3
69158+:10E6C0009619000E909F00088E18000830E3FFFF97
69159+:10E6D00003F9B00432B40004AFB6005CAFA3005835
69160+:10E6E0008E1600041280002EAFB8005434C3008090
69161+:10E6F000906800083105004014A0002500000000CB
69162+:10E700008C70005002D090230640000500000000ED
69163+:10E710008C71003402D1A82306A201678EE20008A2
69164+:10E72000126000063C1280003C1508008EB531F4E2
69165+:10E7300026B600013C010800AC3631F4AE4000447E
69166+:10E74000240300018FBF00848FBE00808FB7007C40
69167+:10E750008FB600788FB500748FB400708FB3006CE3
69168+:10E760008FB200688FB100648FB00060006010212C
69169+:10E7700003E0000827BD00880E000D2800002021BE
69170+:10E780000A000D75004018210A000D9500C02021D7
69171+:10E790000E00171702C020211440FFE10000000006
69172+:10E7A0003C0B8008356400808C8A003402CA482300
69173+:10E7B0000520001D000000003C1E08008FDE310017
69174+:10E7C00027D700013C010800AC3731001260000679
69175+:10E7D000024020213C1408008E9431F42690000160
69176+:10E7E0003C010800AC3031F40E00164E3C1E80088F
69177+:10E7F00037CD008091B700250240202136EE00047D
69178+:10E800000E001658A1AE00250E000CAC02402021CF
69179+:10E810000A000DCA240300013C17080126F796C020
69180+:10E820000A000D843C1F80008C86003002C66023E5
69181+:10E830001980000C2419000C908F004F3C14080024
69182+:10E840008E94310032B500FC35ED0001268E0001BA
69183+:10E850003C010800AC2E3100A08D004FAFA0005845
69184+:10E860002419000CAFB900308C9800300316A02397
69185+:10E870001A80010B8FA300580074F82A17E0FFD309
69186+:10E88000000000001074002A8FA5005802D4B021A7
69187+:10E8900000B410233044FFFFAFA4005832A8000298
69188+:10E8A0001100002E32AB00103C15800836B00080FD
69189+:10E8B0009216000832D30040526000FB8EE200083E
69190+:10E8C0000E00164E02402021240A0018A20A000958
69191+:10E8D000921100052409FFFE024020210229902404
69192+:10E8E0000E001658A2120005240400390000282149
69193+:10E8F0000E0016F2240600180A000DCA24030001B7
69194+:10E9000092FE000C3C0A800835490080001EBB00C6
69195+:10E910008D27003836F10081024020213225F08118
69196+:10E920000E000C9B30C600FF0A000DC10000000065
69197+:10E930003AA7000130E300011460FFA402D4B02123
69198+:10E940000A000E1D00000000024020210E001734B6
69199+:10E95000020028210A000D75004018211160FF7087
69200+:10E960003C0F80083C0D800835EE00808DC40038D7
69201+:10E970008FA300548DA60004006660231D80FF68ED
69202+:10E98000000000000064C02307020001AFA400548F
69203+:10E990003C1F08008FFF31E433F9000113200015FC
69204+:10E9A0008FAC00583C07800094E3011A10600012FD
69205+:10E9B0003C0680080E00216A024020213C03080129
69206+:10E9C000906396F13064000214800145000000005D
69207+:10E9D000306C0004118000078FAC0058306600FBDB
69208+:10E9E0003C010801A02696F132B500FCAFA000580A
69209+:10E9F0008FAC00583C06800834D30080AFB40018B8
69210+:10EA0000AFB60010AFAC00143C088000950B01209D
69211+:10EA10008E6F0030966A005C8FA3005C8FBF003061
69212+:10EA20003169FFFF3144FFFF8FAE005401341021E4
69213+:10EA3000350540000064382B0045C82103E7C02598
69214+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
69215+:10EA5000AFA0002CAFAE0034926D000831B40008B6
69216+:10EA6000168000BB020020218EE200040040F8095D
69217+:10EA700027A400108FAF003031F300025660000170
69218+:10EA800032B500FE3C048008349F008093F90008F2
69219+:10EA900033380040530000138FA400248C850004F9
69220+:10EAA0008FA7005410A700D52404001432B0000131
69221+:10EAB0001200000C8FA400242414000C1234011A3C
69222+:10EAC0002A2D000D11A001022413000E240E000AAD
69223+:10EAD000522E0001241E00088FAF002425E40001FF
69224+:10EAE000AFA400248FAA00143C0B80083565008079
69225+:10EAF000008A48218CB10030ACA9003090A4004EAF
69226+:10EB00008CA700303408FFFF0088180400E3F821C8
69227+:10EB1000ACBF00348FA600308FB900548FB8005CB2
69228+:10EB200030C200081040000B033898218CAC002044
69229+:10EB3000119300D330C600FF92EE000C8FA7003473
69230+:10EB400002402021000E6B0035B400800E000C9BAB
69231+:10EB50003285F0803C028008345000808E0F0030F7
69232+:10EB600001F1302318C00097264800803C070800B8
69233+:10EB70008CE731E42404FF80010418243118007F5D
69234+:10EB80003C1F80003C19800430F10001AFE300908D
69235+:10EB900012200006031928213C030801906396F116
69236+:10EBA00030690008152000C6306A00F73C10800864
69237+:10EBB00036040080908C004F318B000115600042BC
69238+:10EBC000000000003C0608008CC6319830CE0010D2
69239+:10EBD00051C0004230F9000190AF006B55E0003F9A
69240+:10EBE00030F9000124180001A0B8006B3C1180002E
69241+:10EBF0009622007A24470064A48700123C0D800806
69242+:10EC000035A5008090B40008329000401600000442
69243+:10EC10003C03800832AE000115C0008B00000000EC
69244+:10EC2000346400808C86002010D3000A3463010015
69245+:10EC30008C67000002C7782319E000978FBF00544B
69246+:10EC4000AC93002024130001AC760000AFB3005059
69247+:10EC5000AC7F000417C0004E000000008FA90050D8
69248+:10EC60001520000B000000003C030801906396F1A2
69249+:10EC7000306A00011140002E8FAB0058306400FE56
69250+:10EC80003C010801A02496F10A000D75000018212E
69251+:10EC90000E000CAC024020210A000F1300000000FF
69252+:10ECA0000A000E200000A0210040F80924040017EB
69253+:10ECB0000A000DCA240300010040F80924040016CC
69254+:10ECC0000A000DCA240300019094004F240DFFFE9A
69255+:10ECD000028D2824A085004F30F900011320000682
69256+:10ECE0003C0480083C030801906396F1307F0010DB
69257+:10ECF00017E00051306800EF34900080240A0001D2
69258+:10ED0000024020210E00164EA60A00129203002592
69259+:10ED100024090001AFA90050346200010240202103
69260+:10ED20000E001658A20200250A000EF93C0D8008BC
69261+:10ED30001160FE83000018218FA5003030AC000464
69262+:10ED40001180FE2C8FBF00840A000DCB240300012C
69263+:10ED500027A500380E000CB6AFA000385440FF4382
69264+:10ED60008EE200048FB40038329001005200FF3F61
69265+:10ED70008EE200048FA3003C8E6E0058006E682364
69266+:10ED800005A3FF39AE6300580A000E948EE200041A
69267+:10ED90000E00164E024020213C038008346800809B
69268+:10EDA000024020210E001658A11E000903C0302188
69269+:10EDB000240400370E0016F2000028210A000F116B
69270+:10EDC0008FA900508FAB00185960FF8D3C0D800853
69271+:10EDD0000E00164E02402021920C00252405000151
69272+:10EDE000AFA5005035820004024020210E001658C5
69273+:10EDF000A20200250A000EF93C0D800812240059D9
69274+:10EE00002A2300151060004D240900162408000C68
69275+:10EE10005628FF2732B000013C0A8008914C001BA5
69276+:10EE20002406FFBD241E000E01865824A14B001BA2
69277+:10EE30000A000EA532B000013C010801A02896F19D
69278+:10EE40000A000EF93C0D80088CB500308EFE0008DB
69279+:10EE50002404001826B6000103C0F809ACB600303F
69280+:10EE60003C030801906396F13077000116E0FF81C2
69281+:10EE7000306A00018FB200300A000D753243000481
69282+:10EE80003C1080009605011A50A0FF2B34C60010DC
69283+:10EE90000A000EC892EE000C8C6200001456FF6D42
69284+:10EEA000000000008C7800048FB9005403388823D8
69285+:10EEB0000621FF638FBF00540A000F0E0000000000
69286+:10EEC0003C010801A02A96F10A000F3030F9000138
69287+:10EED0001633FF028FAF00240A000EB0241E00106C
69288+:10EEE0000E00164E024020213C0B80083568008041
69289+:10EEF00091090025240A0001AFAA0050353300040F
69290+:10EF0000024020210E001658A11300253C050801DF
69291+:10EF100090A596F130A200FD3C010801A02296F1D7
69292+:10EF20000A000E6D004018212411000E53D1FEEA94
69293+:10EF3000241E00100A000EAF241E00165629FEDC07
69294+:10EF400032B000013C0A8008914C001B2406FFBD32
69295+:10EF5000241E001001865824A14B001B0A000EA598
69296+:10EF600032B000010A000EA4241E00123C038000EF
69297+:10EF70008C6201B80440FFFE24040800AC6401B8B0
69298+:10EF800003E000080000000030A5FFFF30C6FFFFCF
69299+:10EF90003C0780008CE201B80440FFFE34EA0180A7
69300+:10EFA000AD440000ACE400203C0480089483004899
69301+:10EFB0003068FFFF11000016AF88000824AB001274
69302+:10EFC000010B482B512000133C04800034EF01005A
69303+:10EFD00095EE00208F890000240D001A31CCFFFF30
69304+:10EFE00031274000A14D000B10E000362583FFFEC5
69305+:10EFF0000103C02B170000348F9900048F88000490
69306+:10F00000A5430014350700010A001003AF87000470
69307+:10F010003C04800024030003348201808F890000B7
69308+:10F020008F870004A043000B3C088000350C018052
69309+:10F03000A585000EA585001A8F85000C30EB800099
69310+:10F04000A5890010AD850028A58600081160000F75
69311+:10F050008F85001435190100972A00163158FFFCDE
69312+:10F06000270F000401E870218DCD400031A6FFFF7D
69313+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
69314+:10F0800000E83824AF8700048F8500142403BFFFF5
69315+:10F090003C04800000E3582434830180A46B0026E4
69316+:10F0A000AC69002C10A0000300054C02A465001000
69317+:10F0B000A46900263C071000AC8701B803E00008F3
69318+:10F0C000000000008F990004240AFFFE032A382460
69319+:10F0D0000A001003AF87000427BDFFE88FA20028B5
69320+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
69321+:10F0F000AF820014AF8000040E000FDBAF80000071
69322+:10F100008FBF001027BD001803E00008AF80001477
69323+:10F110003C06800034C4007034C701008C8A0000B3
69324+:10F1200090E500128F84000027BDFFF030A300FFA0
69325+:10F13000000318823082400010400037246500032D
69326+:10F140000005C8800326C0218F0E4000246F0004F4
69327+:10F15000000F6880AFAE000001A660218D8B4000DB
69328+:10F16000AFAB000494E900163128FFFC01063821FA
69329+:10F170008CE64000AFA600088FA9000800003021EF
69330+:10F18000000028213C07080024E701000A0010675E
69331+:10F19000240800089059000024A500012CAC000CA4
69332+:10F1A0000079C0210018788001E770218DCD000022
69333+:10F1B0001180000600CD302603A5102114A8FFF50C
69334+:10F1C00000051A005520FFF4905900003C0480000F
69335+:10F1D000348700703C0508008CA531048CE30000E6
69336+:10F1E0002CA2002010400009006A38230005488046
69337+:10F1F0003C0B0800256B3108012B402124AA00019B
69338+:10F20000AD0700003C010800AC2A310400C0102109
69339+:10F2100003E0000827BD0010308220001040000BE2
69340+:10F2200000055880016648218D24400024680004B0
69341+:10F2300000083880AFA4000000E618218C6540006B
69342+:10F24000AFA000080A001057AFA500040000000D91
69343+:10F250000A0010588FA9000827BDFFE03C07800076
69344+:10F2600034E60100AFBF001CAFB20018AFB100140C
69345+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
69346+:10F280002483000430E2400010400010AF830028C7
69347+:10F290003C09002000E940241100000D30EC800002
69348+:10F2A0008F8A0004240BBFFF00EB38243543100085
69349+:10F2B000AF87000030F220001640000B3C1900041C
69350+:10F2C000241FFFBF0A0010B7007F102430EC80001D
69351+:10F2D000158000423C0E002030F220001240FFF862
69352+:10F2E0008F8300043C19000400F9C0241300FFF5CB
69353+:10F2F000241FFFBF34620040AF82000430E20100EF
69354+:10F300001040001130F010008F83002C10600006B8
69355+:10F310003C0F80003C05002000E52024148000C044
69356+:10F320003C0800043C0F800035EE010095CD001E26
69357+:10F3300095CC001C31AAFFFF000C5C00014B482556
69358+:10F34000AF89000C30F010001200000824110001F9
69359+:10F3500030F100201620008B3C18100000F890249B
69360+:10F36000164000823C040C002411000130E801002A
69361+:10F370001500000B3C0900018F85000430A94000F6
69362+:10F38000152000073C0900013C0C1F0100EC58242B
69363+:10F390003C0A1000116A01183C1080003C09000171
69364+:10F3A00000E9302410C000173C0B10003C18080086
69365+:10F3B0008F1800243307000214E0014024030001E9
69366+:10F3C0008FBF001C8FB200188FB100148FB00010D7
69367+:10F3D0000060102103E0000827BD002000EE682433
69368+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
69369+:10F3F00036307FFF00F0382435E380000A0010A685
69370+:10F40000AF87000000EB102450400065AF8000245F
69371+:10F410008F8C002C3C0D0F0000ED18241580008807
69372+:10F42000AF83001030E8010011000086938F0010B8
69373+:10F430003C0A0200106A00833C1280003650010032
69374+:10F44000920500139789002A3626000230AF00FF8C
69375+:10F4500025EE0004000E19C03C0480008C9801B811
69376+:10F460000700FFFE34880180AD0300003C198008CE
69377+:10F47000AC830020973100483225FFFF10A0015CCB
69378+:10F48000AF8500082523001200A3F82B53E0015993
69379+:10F490008F850004348D010095AC00202402001AF1
69380+:10F4A00030E44000318BFFFFA102000B108001927D
69381+:10F4B0002563FFFE00A3502B154001908F8F0004A1
69382+:10F4C000A50300148F88000435050001AF850004F2
69383+:10F4D0003C08800035190180A729000EA729001AD1
69384+:10F4E0008F89000C30B18000A7270010AF290028B9
69385+:10F4F000A72600081220000E3C04800035020100FF
69386+:10F50000944C0016318BFFFC256400040088182100
69387+:10F510008C7F400033E6FFFF14C000053C048000F0
69388+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
69389+:10F53000240EBFFF00AE402434850180A4A800261D
69390+:10F54000ACA7002C3C071000AC8701B800001821C4
69391+:10F550008FBF001C8FB200188FB100148FB0001045
69392+:10F560000060102103E0000827BD00203C020BFFD3
69393+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
69394+:10F58000241100013C0608008CC6002C24C5000193
69395+:10F590003C010800AC25002C0A0010D42411000501
69396+:10F5A0008F85002410A0002FAF80001090A30000D2
69397+:10F5B000146000792419000310A0002A30E601002D
69398+:10F5C00010C000CC8F860010241F000210DF00C97D
69399+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
69400+:10F5E00014E0000201641824000018213C0D0800FA
69401+:10F5F00025AD0038006D1021904C00048F85002847
69402+:10F6000025830004000321C030A5FFFF3626000239
69403+:10F610000E000FDB000000000A00114D0000182151
69404+:10F6200000E8302414C0FF403C0F80000E00103D65
69405+:10F63000000000008F8700000A0010CAAF82000C93
69406+:10F64000938F00103C18080127189640000F90C0B7
69407+:10F6500002588021AF9000248F85002414A0FFD38E
69408+:10F66000AF8F00103C0480008C86400030C5010044
69409+:10F6700010A000BC322300043C0C08008D8C002438
69410+:10F6800024120004106000C23190000D3C04800080
69411+:10F690008C8D40003402FFFF11A201003231FFFBCC
69412+:10F6A0008C884000310A01005540000124110010EF
69413+:10F6B00030EE080011C000BE2419FFFB8F9800280F
69414+:10F6C0002F0F03EF51E000010219802430E90100FF
69415+:10F6D00011200014320800018F87002C14E000FB79
69416+:10F6E0008F8C000C3C05800034AB0100917F00132F
69417+:10F6F00033E300FF246A00042403FFFE0203802496
69418+:10F70000000A21C012000002023230253226FFFF1B
69419+:10F710000E000FDB9785002A1200FF290000182138
69420+:10F72000320800011100000D32180004240E0001FF
69421+:10F73000120E0002023230253226FFFF9785002A82
69422+:10F740000E000FDB00002021240FFFFE020F80249B
69423+:10F750001200FF1B00001821321800045300FF188C
69424+:10F760002403000102323025241200045612000145
69425+:10F770003226FFFF9785002A0E000FDB24040100CC
69426+:10F780002419FFFB021988241220FF0D0000182104
69427+:10F790000A0010E9240300011079009C00003021C8
69428+:10F7A00090AD00012402000211A200BE30EA004028
69429+:10F7B00090B90001241800011338007F30E900409F
69430+:10F7C0008CA600049785002A00C020210E000FDBC4
69431+:10F7D0003626000200004021010018218FBF001CC6
69432+:10F7E0008FB200188FB100148FB00010006010218C
69433+:10F7F00003E0000827BD0020360F010095EE000C45
69434+:10F8000031CD020015A0FEE63C0900013C1880083D
69435+:10F81000971200489789002A362600023248FFFFD7
69436+:10F82000AF8800083C0380008C7101B80620FFFE01
69437+:10F83000346A0180AD4000001100008E3C0F800052
69438+:10F84000253F0012011FC82B1320008B240E00033C
69439+:10F85000346C0100958B00202402001A30E4400033
69440+:10F860003163FFFFA142000B108000A72463FFFE5D
69441+:10F870000103682B15A000A52408FFFE34A5000194
69442+:10F88000A5430014AF8500043C0480002412BFFF90
69443+:10F8900000B2802434850180A4A9000EA4A9001A16
69444+:10F8A000A4A60008A4B00026A4A700103C071000DE
69445+:10F8B000AC8701B80A00114D000018213C038000FC
69446+:10F8C00034640100949F000E3C1908008F3900D861
69447+:10F8D0002404008033E5FFFF273100013C010800CC
69448+:10F8E000AC3100D80E000FDB240600030A00114DD6
69449+:10F8F00000001821240A000210CA00598F85002830
69450+:10F900003C0308008C6300D0240E0001106E005EE2
69451+:10F910002CCF000C24D2FFFC2E5000041600002136
69452+:10F9200000002021241800021078001B2CD9000CA4
69453+:10F9300024DFFFF82FE900041520FF330000202109
69454+:10F9400030EB020051600004000621C054C00022C8
69455+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
69456+:10F96000362600023C0908008D29002431300001B0
69457+:10F970005200FEF7000018219785002A3626000263
69458+:10F980000E000FDB000020210A00114D000018219D
69459+:10F990000A00119C241200021320FFE624DFFFF866
69460+:10F9A0000000202130A5FFFF0A00117D362600024D
69461+:10F9B0000A0011AC021980245120FF828CA6000499
69462+:10F9C0003C05080190A5964110A0FF7E2408000187
69463+:10F9D0000A0011F0010018210E000FDB3226000191
69464+:10F9E0008F8600108F8500280A00124F000621C064
69465+:10F9F0008F8500043C18800024120003371001801A
69466+:10FA0000A212000B0A00112E3C08800090A30001F6
69467+:10FA1000241100011071FF70240800012409000264
69468+:10FA20005069000430E60040240800010A0011F08B
69469+:10FA30000100182150C0FFFD240800013C0C80008B
69470+:10FA4000358B01009563001094A40002307FFFFF06
69471+:10FA5000509FFF62010018210A001284240800014F
69472+:10FA60002CA803EF1100FE56240300010A001239EE
69473+:10FA700000000000240E000335EA0180A14E000BB7
69474+:10FA80000A00121C3C04800011E0FFA2000621C005
69475+:10FA900030A5FFFF0A00117D362600020A0011A5DD
69476+:10FAA000241100201140FFC63C1280003650010096
69477+:10FAB000960F001094AE000231E80FFF15C8FFC08A
69478+:10FAC000000000000A0011E690B900013C060800A1
69479+:10FAD0008CC6003824C4FFFF14C00002018418241F
69480+:10FAE000000018213C0D080025AD0038006D1021E4
69481+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
69482+:10FB00000A00112C01EE28242408FFFE0A00121A14
69483+:10FB100000A8282427BDFFC8AFB00010AFBF003435
69484+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
69485+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
69486+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
69487+:10FB500001CF682435AC380C240B0003AE0C5000E8
69488+:10FB6000ACCB00083C010800AC2000200E001819A6
69489+:10FB7000000000003C0A0010354980513C06601628
69490+:10FB8000AE09537C8CC700003C0860148D0500A0B2
69491+:10FB90003C03FFFF00E320243C02535300051FC237
69492+:10FBA0001482000634C57C000003A08002869821E0
69493+:10FBB0008E7200043C116000025128218CBF007C31
69494+:10FBC0008CA200783C1E600037C420203C05080150
69495+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
69496+:10FBE0002406000A3C190001273996403C01080010
69497+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
69498+:10FC00002418FFF03C15570902F8B02412D502F56C
69499+:10FC100024040001AF80002C3C1480003697018042
69500+:10FC20003C1E080127DE9644369301008E900000AA
69501+:10FC30003205000310A0FFFD3207000110E000882C
69502+:10FC4000320600028E7100283C048000AE91002034
69503+:10FC50008E6500048E66000000A0382100C040219F
69504+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
69505+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
69506+:10FC80009675000E3C1208008E52002030AC4000E9
69507+:10FC900032AFFFFF264E000125ED00043C010800B5
69508+:10FCA000AC2E0020118000E8AF8D00283C18002009
69509+:10FCB00000B8B02412C000E530B980002408BFFFAE
69510+:10FCC00000A8382434C81000AF87000030E62000B8
69511+:10FCD00010C000E92409FFBF3C03000400E328240E
69512+:10FCE00010A00002010910243502004030EA010092
69513+:10FCF00011400010AF8200048F8B002C11600007B0
69514+:10FD00003C0D002000ED6024118000043C0F000435
69515+:10FD100000EF702411C00239000000009668001E38
69516+:10FD20009678001C3115FFFF0018B40002B690252C
69517+:10FD3000AF92000C30F910001320001324150001BD
69518+:10FD400030FF002017E0000A3C04100000E41024FB
69519+:10FD50001040000D3C0A0C003C090BFF00EA18247F
69520+:10FD60003525FFFF00A3302B10C0000830ED010047
69521+:10FD70003C0C08008D8C002C24150005258B0001FF
69522+:10FD80003C010800AC2B002C30ED010015A0000B4D
69523+:10FD90003C0500018F85000430AE400055C00007CF
69524+:10FDA0003C0500013C161F0100F690243C0F10009A
69525+:10FDB000124F01CE000000003C05000100E5302498
69526+:10FDC00010C000AF3C0C10003C1F08008FFF002447
69527+:10FDD00033E90002152000712403000100601021A6
69528+:10FDE000104000083C0680003C08800035180100E7
69529+:10FDF0008F0F00243C056020ACAF00140000000011
69530+:10FE00003C0680003C194000ACD9013800000000DD
69531+:10FE10005220001332060002262B0140262C0080BF
69532+:10FE2000240EFF80016E2024018E6824000D1940ED
69533+:10FE3000318A007F0004A9403172007F3C16200007
69534+:10FE400036C20002006A482502B2382500E2882541
69535+:10FE50000122F825ACDF0830ACD1083032060002B0
69536+:10FE600010C0FF723C188000370501408CA80000CC
69537+:10FE700024100040AF08002090AF000831E300706C
69538+:10FE8000107000D428790041532000082405006038
69539+:10FE9000241100201071000E3C0A40003C09800033
69540+:10FEA000AD2A01780A001304000000001465FFFB6E
69541+:10FEB0003C0A40000E001FFA000000003C0A40000F
69542+:10FEC0003C098000AD2A01780A00130400000000FC
69543+:10FED00090A90009241F00048CA70000312800FF0E
69544+:10FEE000111F01B22503FFFA2C7200061240001404
69545+:10FEF0003C0680008CA9000494A4000A310500FF90
69546+:10FF000000095E022D6A00083086FFFF15400002DE
69547+:10FF10002567000424070003240C000910AC01FA33
69548+:10FF200028AD000A11A001DE2410000A240E0008EA
69549+:10FF300010AE0028000731C000C038213C06800008
69550+:10FF40008CD501B806A0FFFE34D20180AE47000078
69551+:10FF500034CB0140916E0008240300023C0A4000AB
69552+:10FF600031C400FF00046A0001A86025A64C000807
69553+:10FF7000A243000B9562000A3C0810003C09800077
69554+:10FF8000A64200108D670004AE470024ACC801B83B
69555+:10FF9000AD2A01780A001304000000003C0A80002A
69556+:10FFA000354401009483000E3C0208008C4200D8C6
69557+:10FFB000240400803065FFFF245500013C01080047
69558+:10FFC000AC3500D80E000FDB240600030A001370C6
69559+:10FFD000000018210009320230D900FF2418000166
69560+:10FFE0001738FFD5000731C08F910020262200016D
69561+:10FFF000AF8200200A0013C800C0382100CB2024A3
69562+:020000021000EC
69563+:10000000AF85000010800008AF860004240D87FF34
69564+:1000100000CD6024158000083C0E006000AE302446
69565+:1000200010C00005000000000E000D42000000009E
69566+:100030000A001371000000000E0016050000000009
69567+:100040000A0013710000000030B980005320FF1F28
69568+:10005000AF8500003C02002000A2F82453E0FF1B03
69569+:10006000AF8500003C07FFFF34E47FFF00A4382485
69570+:100070000A00132B34C880000A001334010910242D
69571+:1000800000EC58245160005AAF8000248F8D002C62
69572+:100090003C0E0F0000EE182415A00075AF83001071
69573+:1000A00030EF010011E00073939800103C12020041
69574+:1000B000107200703C06800034D9010093280013B0
69575+:1000C0009789002A36A60002311800FF271600047F
69576+:1000D000001619C03C0480008C8501B804A0FFFE06
69577+:1000E00034880180AD0300003C158008AC830020FB
69578+:1000F00096BF004833E5FFFF10A001BCAF850008A4
69579+:100100002523001200A3102B504001B98F85000455
69580+:10011000348D010095AC0020240B001A30E440001F
69581+:10012000318AFFFFA10B000B108001BA2543FFFEAF
69582+:1001300000A3702B15C001B88F9600048F8F0004A8
69583+:10014000A503001435E50001AF8500043C088000DC
69584+:1001500035150180A6A9000EA6A9001A8F89000CEA
69585+:1001600030BF8000A6A70010AEA90028A6A60008F0
69586+:1001700013E0000F3C0F8000350C0100958B00163A
69587+:10018000316AFFFC25440004008818218C6240007D
69588+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
69589+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
69590+:1001B0002416BFFF00B6902435E50180A4B20026C6
69591+:1001C000ACA7002C3C071000ADE701B80A00137083
69592+:1001D000000018210E00165D000000003C0A4000DF
69593+:1001E0003C098000AD2A01780A00130400000000D9
69594+:1001F0008F85002410A00027AF80001090A300007E
69595+:10020000106000742409000310690101000030210E
69596+:1002100090AE0001240D000211CD014230EF0040EC
69597+:1002200090A90001241F0001113F000930E20040A5
69598+:100230008CA600049785002A00C020210E000FDB49
69599+:1002400036A60002000040210A00137001001821A8
69600+:100250005040FFF88CA600043C07080190E7964147
69601+:1002600010E0FFF4240800010A00137001001821B7
69602+:10027000939800103C1F080127FF96400018C8C043
69603+:10028000033F4021AF8800248F85002414A0FFDBAA
69604+:10029000AF9800103C0480008C86400030C50100FF
69605+:1002A00010A0008732AB00043C0C08008D8C0024A9
69606+:1002B00024160004156000033192000D241600027C
69607+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
69608+:1002D00032B5FFFB8C984000330F010055E0000160
69609+:1002E0002415001030E80800110000382409FFFB35
69610+:1002F0008F9F00282FF903EF53200001024990241B
69611+:1003000030E2010010400014325F00018F87002CA2
69612+:1003100014E0010E8F8C000C3C0480003486010038
69613+:1003200090C5001330AA00FF25430004000321C03C
69614+:100330002419FFFE025990241240000202B6302513
69615+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
69616+:1003500000001821325F000113E0000D3247000455
69617+:10036000240900011249000202B6302532A6FFFF1F
69618+:100370009785002A0E000FDB000020212402FFFEDB
69619+:10038000024290241240FE950000182132470004DA
69620+:1003900050E0FE922403000102B63025241600042A
69621+:1003A0005656000132A6FFFF9785002A0E000FDB8C
69622+:1003B000240401002403FFFB0243A82412A0FE87AB
69623+:1003C000000018210A001370240300010A0014B968
69624+:1003D0000249902410A0FFAF30E5010010A00017E3
69625+:1003E0008F8600102403000210C300148F84000CB9
69626+:1003F0003C0608008CC6003824CAFFFF14C0000267
69627+:10040000008A1024000010213C0E080025CE003880
69628+:10041000004E682191AC00048F850028258B0004D4
69629+:10042000000B21C030A5FFFF36A600020E000FDB37
69630+:10043000000000000A00137000001821240F0002C1
69631+:1004400010CF0088241600013C0308008C6300D004
69632+:100450001076008D8F85002824D9FFFC2F280004FA
69633+:100460001500006300002021241F0002107F005DA2
69634+:100470002CC9000C24C3FFF82C6200041440FFE9CF
69635+:100480000000202130EA020051400004000621C093
69636+:1004900054C0000530A5FFFF000621C030A5FFFFB6
69637+:1004A0000A00150436A600020E000FDB32A600017A
69638+:1004B0008F8600108F8500280A001520000621C0B5
69639+:1004C0003C0A08008D4A0024315200015240FE438C
69640+:1004D000000018219785002A36A600020E000FDBC7
69641+:1004E000000020210A001370000018219668000CFB
69642+:1004F000311802005700FE313C0500013C1F800806
69643+:1005000097F900489789002A36A600023328FFFF92
69644+:10051000AF8800083C0380008C7501B806A0FFFE80
69645+:100520003C04800034820180AC400000110000B621
69646+:1005300024180003252A0012010A182B106000B2AB
69647+:1005400000000000966F00203C0E8000240D001A71
69648+:1005500031ECFFFF35CA018030EB4000A14D000BAC
69649+:10056000116000B02583FFFE0103902B164000AE02
69650+:100570002416FFFE34A50001A5430014AF85000436
69651+:100580002419BFFF00B94024A6E9000EA6E9001A0D
69652+:10059000A6E60008A6E80026A6E700103C07100023
69653+:1005A000AE8701B80A001370000018213C048000D7
69654+:1005B0008C8201B80440FFFE349601802415001C93
69655+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
69656+:1005D0003C0A40003C098000AD2A01780A0013045F
69657+:1005E000000000005120FFA424C3FFF800002021D8
69658+:1005F00030A5FFFF0A00150436A600020E00103DCC
69659+:10060000000000008F8700000A001346AF82000C34
69660+:1006100090A30001241500011075FF0B24080001B0
69661+:10062000240600021066000430E2004024080001A5
69662+:100630000A001370010018215040FFFD240800013A
69663+:100640003C0C8000358B0100956A001094A40002D8
69664+:100650003143FFFF5083FDE1010018210A00158599
69665+:10066000240800018F8500282CB203EF1240FDDB27
69666+:10067000240300013C0308008C6300D02416000111
69667+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
69668+:10069000000621C030A5FFFF0A00150436A600029F
69669+:1006A00010B00037240F000B14AFFE23000731C039
69670+:1006B000312600FF00065600000A4E0305220047BF
69671+:1006C00030C6007F0006F8C03C16080126D69640CA
69672+:1006D00003F68021A2000001A20000003C0F600090
69673+:1006E0008DF918202405000100C588040011302769
69674+:1006F0000326C024000731C000C03821ADF81820FF
69675+:100700000A0013C8A60000028F850020000731C030
69676+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
69677+:100720002415002011E0FECC3C1980003728010080
69678+:100730009518001094B6000233120FFF16D2FEC6B1
69679+:10074000000000000A00148290A900013C0B080080
69680+:100750008D6B0038256DFFFF15600002018D1024A0
69681+:10076000000010213C080800250800380048C0217E
69682+:10077000930F000425EE00040A0014C5000E21C0EA
69683+:1007800000065202241F00FF115FFDEB000731C07D
69684+:10079000000A20C03C0E080125CE9640008EA821FC
69685+:1007A000009E602100095C02240D00013C076000EE
69686+:1007B000A2AD0000AD860000A2AB00018CF21820B3
69687+:1007C00024030001014310040242B025ACF61820B6
69688+:1007D00000C038210A0013C8A6A900020A0015AA01
69689+:1007E000AF8000200A0012FFAF84002C8F85000428
69690+:1007F0003C1980002408000337380180A308000B4F
69691+:100800000A00144D3C088000A2F8000B0A00155A9B
69692+:100810002419BFFF8F9600042412FFFE0A00144B18
69693+:1008200002D228242416FFFE0A00155800B62824F8
69694+:100830003C038000346401008C85000030A2003E3F
69695+:100840001440000800000000AC6000488C870000E5
69696+:1008500030E607C010C0000500000000AC60004C8E
69697+:10086000AC60005003E0000824020001AC600054BA
69698+:10087000AC6000408C880000310438001080FFF923
69699+:10088000000000002402000103E00008AC60004406
69700+:100890003C0380008C6201B80440FFFE3467018095
69701+:1008A000ACE4000024080001ACE00004A4E500086A
69702+:1008B00024050002A0E8000A34640140A0E5000B12
69703+:1008C0009483000A14C00008A4E30010ACE00024E4
69704+:1008D0003C07800034E901803C041000AD20002872
69705+:1008E00003E00008ACE401B88C8600043C0410006E
69706+:1008F000ACE600243C07800034E90180AD200028EC
69707+:1009000003E00008ACE401B83C0680008CC201B8EA
69708+:100910000440FFFE34C7018024090002ACE400005B
69709+:10092000ACE40004A4E50008A0E9000A34C50140D5
69710+:10093000A0E9000B94A8000A3C041000A4E80010F1
69711+:10094000ACE000248CA30004ACE3002803E0000822
69712+:10095000ACC401B83C039000346200010082202541
69713+:100960003C038000AC6400208C65002004A0FFFEE6
69714+:100970000000000003E00008000000003C028000CE
69715+:10098000344300010083202503E00008AC4400202C
69716+:1009900027BDFFE03C098000AFBF0018AFB10014D5
69717+:1009A000AFB00010352801408D10000091040009FF
69718+:1009B0009107000891050008308400FF30E600FF31
69719+:1009C00000061A002C820081008330251040002A86
69720+:1009D00030A50080000460803C0D080125AD92B078
69721+:1009E000018D58218D6A00000140000800000000C0
69722+:1009F0003C038000346201409445000A14A0001EAC
69723+:100A00008F91FCC09227000530E6000414C0001A44
69724+:100A1000000000000E00164E02002021922A000560
69725+:100A200002002021354900040E001658A2290005B5
69726+:100A30009228000531040004148000020000000028
69727+:100A40000000000D922D0000240B002031AC00FFAF
69728+:100A5000158B00093C0580008CAE01B805C0FFFE77
69729+:100A600034B10180AE3000003C0F100024100005AE
69730+:100A7000A230000BACAF01B80000000D8FBF001812
69731+:100A80008FB100148FB0001003E0000827BD0020D4
69732+:100A90000200202100C028218FBF00188FB1001450
69733+:100AA0008FB00010240600010A00161D27BD00208B
69734+:100AB0000000000D0200202100C028218FBF001877
69735+:100AC0008FB100148FB00010000030210A00161DF5
69736+:100AD00027BD002014A0FFE8000000000200202134
69737+:100AE0008FBF00188FB100148FB0001000C02821F4
69738+:100AF0000A00163B27BD00203C0780008CEE01B8A1
69739+:100B000005C0FFFE34F00180241F0002A21F000B6D
69740+:100B100034F80140A60600089719000A3C0F10009F
69741+:100B2000A61900108F110004A6110012ACEF01B835
69742+:100B30000A0016998FBF001827BDFFE8AFBF00104D
69743+:100B40000E000FD4000000003C0280008FBF001098
69744+:100B500000002021AC4001800A00108F27BD001842
69745+:100B60003084FFFF30A5FFFF108000070000182130
69746+:100B7000308200011040000200042042006518216C
69747+:100B80001480FFFB0005284003E0000800601021EE
69748+:100B900010C00007000000008CA2000024C6FFFF68
69749+:100BA00024A50004AC82000014C0FFFB24840004D0
69750+:100BB00003E000080000000010A0000824A3FFFFCD
69751+:100BC000AC86000000000000000000002402FFFFCF
69752+:100BD0002463FFFF1462FFFA2484000403E000088A
69753+:100BE000000000003C03800027BDFFF83462018054
69754+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
69755+:100C00003C0B80008D6401B80480FFFE00000000F2
69756+:100C10008FA900008D6801288FAA00008FA700000F
69757+:100C20008FA400002405000124020002A085000A10
69758+:100C30008FA30000359940003C051000A062000B16
69759+:100C40008FB800008FAC00008FA600008FAF0000AF
69760+:100C500027BD0008AD280000AD400004AD80002491
69761+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
69762+:100C700003E00008AD6501B83C06800827BDFFE829
69763+:100C800034C50080AFBF001090A7000924020012F5
69764+:100C900030E300FF1062000B008030218CA8005070
69765+:100CA00000882023048000088FBF00108CAA003425
69766+:100CB000240400390000282100CA4823052000052B
69767+:100CC000240600128FBF00102402000103E0000878
69768+:100CD00027BD00180E0016F2000000008FBF0010A4
69769+:100CE0002402000103E0000827BD001827BDFFC84B
69770+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
69771+:100D000000A0802190A5000D30A6001010C000109A
69772+:100D1000008090213C0280088C4400048E0300086F
69773+:100D20001064000C30A7000530A6000510C0009329
69774+:100D3000240400018FBF00348FB200308FB1002C2B
69775+:100D40008FB000280080102103E0000827BD003884
69776+:100D500030A7000510E0000F30AB001210C00006F5
69777+:100D6000240400013C0980088E0800088D25000439
69778+:100D70005105009C240400388FBF00348FB200302E
69779+:100D80008FB1002C8FB000280080102103E00008F4
69780+:100D900027BD0038240A0012156AFFE6240400016A
69781+:100DA0000200202127A500100E000CB6AFA00010F5
69782+:100DB0001440007C3C19800837240080909800087B
69783+:100DC000331100081220000A8FA7001030FF010025
69784+:100DD00013E000A48FA300148C8600580066102333
69785+:100DE000044000043C0A8008AC8300588FA7001020
69786+:100DF0003C0A800835480080910900083124000829
69787+:100E00001480000224080003000040213C1F8008D9
69788+:100E100093F1001193F9001237E600808CCC005456
69789+:100E2000333800FF03087821322D00FF000F708057
69790+:100E300001AE282100AC582B1160006F00000000AB
69791+:100E400094CA005C8CC900543144FFFF0125102373
69792+:100E50000082182B14600068000000008CCB005446
69793+:100E60000165182330EC00041180006C000830800C
69794+:100E70008FA8001C0068102B1040006230ED0004A9
69795+:100E8000006610232C46008010C00002004088211C
69796+:100E9000241100800E00164E024020213C0D8008D7
69797+:100EA00035A6008024070001ACC7000C90C80008DC
69798+:100EB0000011484035A70100310C007FA0CC00088C
69799+:100EC0008E05000424AB0001ACCB0030A4D1005C43
69800+:100ED0008CCA003C9602000E01422021ACC40020C6
69801+:100EE0008CC3003C0069F821ACDF001C8E190004A3
69802+:100EF000ACF900008E180008ACF800048FB10010A7
69803+:100F0000322F000855E0004793A60020A0C0004EF5
69804+:100F100090D8004E2411FFDFA0F8000890CF000801
69805+:100F200001F17024A0CE00088E0500083C0B80085B
69806+:100F300035690080AD2500388D6A00148D2200309F
69807+:100F40002419005001422021AD24003491230000D7
69808+:100F5000307F00FF13F90036264F01000E001658AF
69809+:100F60000240202124040038000028210E0016F23F
69810+:100F70002406000A0A001757240400010E000D2859
69811+:100F8000000020218FBF00348FB200308FB1002CC1
69812+:100F90008FB00028004020210080102103E00008CD
69813+:100FA00027BD00388E0E00083C0F800835F0008009
69814+:100FB000AE0E005402402021AE0000300E00164E4E
69815+:100FC00000000000920D00250240202135AC0020D9
69816+:100FD0000E001658A20C00250E000CAC0240202179
69817+:100FE000240400382405008D0E0016F22406001299
69818+:100FF0000A0017572404000194C5005C0A001792E8
69819+:1010000030A3FFFF2407021811A0FF9E00E6102363
69820+:101010008FAE001C0A00179A01C610230A0017970A
69821+:101020002C620218A0E600080A0017C48E0500080A
69822+:101030002406FF8001E6C0243C118000AE38002861
69823+:101040008E0D000831E7007F3C0E800C00EE602121
69824+:10105000AD8D00E08E080008AF8C00380A0017D074
69825+:10106000AD8800E4AC800058908500082403FFF7A9
69826+:1010700000A33824A08700080A0017758FA7001066
69827+:101080003C05080024A560A83C04080024846FF4F3
69828+:101090003C020800244260B0240300063C01080121
69829+:1010A000AC2596C03C010801AC2496C43C01080163
69830+:1010B000AC2296C83C010801A02396CC03E00008AE
69831+:1010C0000000000003E00008240200013C02800050
69832+:1010D000308800FF344701803C0680008CC301B893
69833+:1010E0000460FFFE000000008CC501282418FF806A
69834+:1010F0003C0D800A24AF010001F8702431EC007F20
69835+:10110000ACCE0024018D2021ACE50000948B00EAD8
69836+:101110003509600024080002316AFFFFACEA0004D0
69837+:1011200024020001A4E90008A0E8000BACE00024C0
69838+:101130003C071000ACC701B8AF84003803E00008DA
69839+:10114000AF85006C938800488F8900608F820038DB
69840+:1011500030C600FF0109382330E900FF01221821C1
69841+:1011600030A500FF2468008810C000020124382147
69842+:101170000080382130E400031480000330AA00030B
69843+:101180001140000D312B000310A0000900001021B8
69844+:1011900090ED0000244E000131C200FF0045602B9D
69845+:1011A000A10D000024E700011580FFF925080001CA
69846+:1011B00003E00008000000001560FFF300000000DD
69847+:1011C00010A0FFFB000010218CF80000245900043F
69848+:1011D000332200FF0045782BAD18000024E70004FF
69849+:1011E00015E0FFF92508000403E0000800000000F6
69850+:1011F00093850048938800588F8700600004320070
69851+:101200003103007F00E5102B30C47F001040000F39
69852+:10121000006428258F8400383C0980008C8A00EC0B
69853+:10122000AD2A00A43C03800000A35825AC6B00A0AD
69854+:101230008C6C00A00580FFFE000000008C6D00ACEF
69855+:10124000AC8D00EC03E000088C6200A80A00188254
69856+:101250008F840038938800593C0280000080502120
69857+:10126000310300FEA383005930ABFFFF30CC00FFF9
69858+:1012700030E7FFFF344801803C0980008D2401B82D
69859+:101280000480FFFE8F8D006C24180016AD0D000049
69860+:101290008D2201248F8D0038AD0200048D5900206D
69861+:1012A000A5070008240201C4A119000AA118000B17
69862+:1012B000952F01208D4E00088D4700049783005C18
69863+:1012C0008D59002401CF302100C7282100A32023FD
69864+:1012D0002418FFFFA504000CA50B000EA5020010AA
69865+:1012E000A50C0012AD190018AD18002495AF00E848
69866+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
69867+:101300008DAC0084AD0C002CAD2B01B88D460020B7
69868+:1013100000C7282403E00008AD4500208F8800386E
69869+:101320000080582130E7FFFF910900D63C02800081
69870+:1013300030A5FFFF312400FF00041A00006750258C
69871+:1013400030C600FF344701803C0980008D2C01B875
69872+:101350000580FFFE8F82006C240F0017ACE20000B6
69873+:101360008D390124ACF900048D780020A4EA00082E
69874+:10137000241901C4A0F8000AA0EF000B9523012056
69875+:101380008D6E00088D6D00049784005C01C35021B0
69876+:10139000014D602101841023A4E2000CA4E5000E9D
69877+:1013A000A4F90010A4E60012ACE000148D7800242B
69878+:1013B000240DFFFFACF800188D0F007CACEF001C73
69879+:1013C0008D0E00783C0F1000ACEE0020ACED002438
69880+:1013D000950A00BE240DFFF73146FFFFACE600285A
69881+:1013E000950C00809504008231837FFF0003CA00C2
69882+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
69883+:10140000950E00828D6A002000AE3021014D282407
69884+:10141000A506008203E00008AD6500203C028000C4
69885+:10142000344501803C0480008C8301B80460FFFED9
69886+:101430008F8A0044240600199549001C3128FFFFBB
69887+:10144000000839C0ACA70000A0A6000B3C051000A6
69888+:1014500003E00008AC8501B88F87004C0080402174
69889+:1014600030C400FF3C0680008CC201B80440FFFE7F
69890+:101470008F89006C9383006834996000ACA90000E8
69891+:10148000A0A300058CE20010240F00022403FFF744
69892+:10149000A4A20006A4B900088D180020A0B8000A74
69893+:1014A000A0AF000B8CEE0000ACAE00108CED000481
69894+:1014B000ACAD00148CEC001CACAC00248CEB002018
69895+:1014C000ACAB00288CEA002C3C071000ACAA002C26
69896+:1014D0008D090024ACA90018ACC701B88D05002007
69897+:1014E00000A3202403E00008AD0400208F8600380C
69898+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
69899+:1015000090C300D430A500FF3062002010400008D6
69900+:10151000008088218CCB00D02409FFDF256A0001E0
69901+:10152000ACCA00D090C800D401093824A0C700D4A8
69902+:1015300014A000403C0C80008F840038908700D4B9
69903+:101540002418FFBF2406FFEF30E3007FA08300D400
69904+:10155000979F005C8F8200608F8D003803E2C82364
69905+:10156000A799005CA5A000BC91AF00D401F870243D
69906+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
69907+:10158000A5400082AD4000EC914500D400A658244F
69908+:10159000A14B00D48F9000348F8400609786005C4C
69909+:1015A0000204282110C0000FAF850034A38000582A
69910+:1015B0003C0780008E2C000894ED01208E2B000447
69911+:1015C000018D5021014B8021020620233086FFFF30
69912+:1015D00030C8000F3909000131310001162000091F
69913+:1015E000A3880058938600488FBF00188FB100145D
69914+:1015F0008FB0001027BD0020AF85006403E0000815
69915+:10160000AF86006000C870238FBF00189386004823
69916+:101610008FB100148FB0001034EF0C00010F28219F
69917+:1016200027BD0020ACEE0084AF85006403E0000815
69918+:10163000AF86006035900180020028210E00190F4E
69919+:10164000240600828F840038908600D430C5004084
69920+:1016500050A0FFBAA38000688F85004C3C06800034
69921+:101660008CCD01B805A0FFFE8F89006C2408608234
69922+:1016700024070002AE090000A6080008A207000B1C
69923+:101680008CA300083C0E1000AE0300108CA2000CCE
69924+:10169000AE0200148CBF0014AE1F00188CB90018E5
69925+:1016A000AE1900248CB80024AE1800288CAF002896
69926+:1016B000AE0F002CACCE01B80A001948A380006818
69927+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
69928+:1016D0008F880060AFBF00189389003C954200BC22
69929+:1016E00030D100FF0109182B0080802130AC00FFB1
69930+:1016F0003047FFFF0000582114600003310600FF4F
69931+:1017000001203021010958239783005C0068202BB9
69932+:101710001480002700000000106800562419000102
69933+:101720001199006334E708803165FFFF0E0018C08F
69934+:10173000020020218F83006C3C07800034E601808A
69935+:101740003C0580008CAB01B80560FFFE240A001840
69936+:101750008F840038ACC30000A0CA000B948900BE7F
69937+:101760003C081000A4C90010ACC00030ACA801B8FF
69938+:101770009482008024430001A4830080949F008011
69939+:101780003C0608008CC6318833EC7FFF1186005E72
69940+:101790000000000002002021022028218FBF001835
69941+:1017A0008FB100148FB000100A00193427BD00203B
69942+:1017B000914400D42403FF8000838825A15100D4E4
69943+:1017C0009784005C3088FFFF51000023938C003C1D
69944+:1017D0008F8500382402EFFF008B782394AE00BC85
69945+:1017E0000168502B31E900FF01C26824A4AD00BCA0
69946+:1017F00051400039010058213C1F800037E60100AC
69947+:101800008CD800043C190001031940245500000144
69948+:1018100034E740008E0A00202403FFFB241100015E
69949+:1018200001432024AE0400201191002D34E78000F4
69950+:1018300002002021012030210E0018C03165FFFF79
69951+:101840009787005C8F890060A780005C0127802358
69952+:10185000AF900060938C003C8F8B00388FBF0018D6
69953+:101860008FB100148FB0001027BD002003E00008E6
69954+:10187000A16C00D73C0D800035AA01008D48000402
69955+:101880003C0900010109282454A0000134E740006C
69956+:101890008E0F00202418FFFB34E7800001F870242D
69957+:1018A00024190001AE0E00201599FF9F34E708802F
69958+:1018B000020020210E00188E3165FFFF020020215A
69959+:1018C000022028218FBF00188FB100148FB00010A4
69960+:1018D0000A00193427BD00200A0019F7000048212A
69961+:1018E00002002021012030210E00188E3165FFFFFB
69962+:1018F0009787005C8F890060A780005C01278023A8
69963+:101900000A001A0EAF900060948C0080241F8000A3
69964+:10191000019F3024A4860080908B0080908F0080EF
69965+:10192000316700FF0007C9C20019C027001871C045
69966+:1019300031ED007F01AE2825A08500800A0019DF67
69967+:1019400002002021938500682403000127BDFFE8E1
69968+:1019500000A330042CA20020AFB00010AFBF0014D1
69969+:1019600000C01821104000132410FFFE3C0708009F
69970+:101970008CE7319000E610243C088000350501809A
69971+:1019800014400005240600848F890038240A0004CE
69972+:101990002410FFFFA12A00FC0E00190F0000000018
69973+:1019A000020010218FBF00148FB0001003E0000868
69974+:1019B00027BD00183C0608008CC631940A001A574F
69975+:1019C00000C310248F87004427BDFFE0AFB200188A
69976+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
69977+:1019E00090E6000D00A088210080902130C5007F86
69978+:1019F000A0E5000D8F8500388E2300188CA200D042
69979+:101A00001062002E240A000E0E001A4AA38A0068F3
69980+:101A10002409FFFF104900222404FFFF5200002088
69981+:101A2000000020218E2600003C0C001000CC582421
69982+:101A3000156000393C0E000800CE682455A0003F18
69983+:101A4000024020213C18000200D880241200001F10
69984+:101A50003C0A00048F8700448CE200148CE30010E1
69985+:101A60008CE500140043F82303E5C82B1320000580
69986+:101A7000024020218E24002C8CF1001010910031A6
69987+:101A80000240202124020012A38200680E001A4A9C
69988+:101A90002412FFFF105200022404FFFF0000202147
69989+:101AA0008FBF001C8FB200188FB100148FB00010D0
69990+:101AB0000080102103E0000827BD002090A800D47A
69991+:101AC000350400200A001A80A0A400D400CA4824CB
69992+:101AD0001520000B8F8B00448F8D00448DAC0010BF
69993+:101AE0001580000B024020218E2E002C51C0FFECEF
69994+:101AF00000002021024020210A001A9B2402001726
69995+:101B00008D66001050C0FFE6000020210240202119
69996+:101B10000A001A9B24020011024020212402001511
69997+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
69998+:101B30002404FFFF0A001A8A8E2600000A001AC138
69999+:101B4000240200143C08000400C8382450E0FFD4EC
70000+:101B500000002021024020210A001A9B24020013C9
70001+:101B60008F85003827BDFFD8AFB3001CAFB2001877
70002+:101B7000AFB10014AFB00010AFBF002090A700D4E9
70003+:101B80008F90004C2412FFFF34E2004092060000C8
70004+:101B9000A0A200D48E0300100080982110720006CD
70005+:101BA00030D1003F2408000D0E001A4AA3880068B7
70006+:101BB000105200252404FFFF8F8A00388E09001878
70007+:101BC0008D4400D01124000702602021240C000E57
70008+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
70009+:101BE0002404FFFF24040020122400048F8D0038F9
70010+:101BF00091AF00D435EE0020A1AE00D48F85005403
70011+:101C000010A00019000000001224004A8F9800382C
70012+:101C10008F92FCC0971000809651000A5230004805
70013+:101C20008F9300403C1F08008FFF318C03E5C82BC9
70014+:101C30001720001E02602021000028210E0019A993
70015+:101C400024060001000020218FBF00208FB3001C5C
70016+:101C50008FB200188FB100148FB0001000801021D7
70017+:101C600003E0000827BD00285224002A8E05001436
70018+:101C70008F840038948A008025490001A48900805F
70019+:101C8000948800803C0208008C42318831077FFF35
70020+:101C900010E2000E00000000026020210E00193446
70021+:101CA000240500010A001B0B000020212402002D46
70022+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
70023+:101CC0002404FFFF0A001B0C8FBF002094990080A2
70024+:101CD000241F800024050001033FC024A498008035
70025+:101CE00090920080908E0080325100FF001181C2DE
70026+:101CF00000107827000F69C031CC007F018D582576
70027+:101D0000A08B00800E001934026020210A001B0BFA
70028+:101D1000000020212406FFFF54A6FFD68F84003840
70029+:101D2000026020210E001934240500010A001B0B5B
70030+:101D300000002021026020210A001B252402000A45
70031+:101D40002404FFFD0A001B0BAF9300608F8800384E
70032+:101D500027BDFFE8AFB00010AFBF0014910A00D458
70033+:101D60008F87004C00808021354900408CE60010B0
70034+:101D7000A10900D43C0208008C4231B030C53FFFBD
70035+:101D800000A2182B106000078F850050240DFF80E3
70036+:101D900090AE000D01AE6024318B00FF156000088D
70037+:101DA0000006C382020020212403000D8FBF00140F
70038+:101DB0008FB0001027BD00180A001A4AA3830068DC
70039+:101DC00033060003240F000254CFFFF70200202146
70040+:101DD00094A2001C8F85003824190023A4A200E8D7
70041+:101DE0008CE8000000081E02307F003F13F9003528
70042+:101DF0003C0A00838CE800188CA600D0110600086D
70043+:101E0000000000002405000E0E001A4AA385006899
70044+:101E10002407FFFF104700182404FFFF8F850038B8
70045+:101E200090A900D435240020A0A400D48F8C0044B5
70046+:101E3000918E000D31CD007FA18D000D8F83005458
70047+:101E40001060001C020020218F8400508C9800102C
70048+:101E50000303782B11E0000D241900180200202143
70049+:101E6000A39900680E001A4A2410FFFF10500002C8
70050+:101E70002404FFFF000020218FBF00148FB000104A
70051+:101E80000080102103E0000827BD00188C86001098
70052+:101E90008F9F00440200202100C31023AFE20010F6
70053+:101EA000240500010E0019A9240600010A001B9751
70054+:101EB000000020210E001934240500010A001B97A0
70055+:101EC00000002021010A5824156AFFD98F8C004494
70056+:101ED000A0A600FC0A001B84A386005A30A500FFC0
70057+:101EE0002406000124A9000100C9102B1040000C99
70058+:101EF00000004021240A000100A61823308B0001B5
70059+:101F000024C60001006A3804000420421160000267
70060+:101F100000C9182B010740251460FFF800A61823FC
70061+:101F200003E000080100102127BDFFD8AFB0001862
70062+:101F30008F90004CAFB1001CAFBF00202403FFFF07
70063+:101F40002411002FAFA30010920600002405000802
70064+:101F500026100001006620260E001BB0308400FF12
70065+:101F600000021E003C021EDC34466F410A001BD8F2
70066+:101F70000000102110A00009008018212445000154
70067+:101F800030A2FFFF2C4500080461FFFA0003204047
70068+:101F90000086202614A0FFF9008018210E001BB037
70069+:101FA000240500208FA300102629FFFF313100FFF8
70070+:101FB00000034202240700FF1627FFE20102182651
70071+:101FC00000035027AFAA0014AFAA00100000302170
70072+:101FD00027A8001027A7001400E6782391ED00033E
70073+:101FE00024CE000100C8602131C600FF2CCB0004C4
70074+:101FF0001560FFF9A18D00008FA200108FBF002097
70075+:102000008FB1001C8FB0001803E0000827BD002826
70076+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
70077+:10202000AFB50024AFB40020AFB20018AFB10014B8
70078+:102030003C0C80008D880128240FFF803C06800A1C
70079+:1020400025100100250B0080020F68243205007F57
70080+:10205000016F7024AD8E009000A62821AD8D002464
70081+:1020600090A600FC3169007F3C0A8004012A1821F7
70082+:10207000A386005A9067007C00809821AF830030CF
70083+:1020800030E20002AF88006CAF85003800A0182154
70084+:10209000144000022404003424040030A3840048C7
70085+:1020A0008C7200DC30D100FF24040004AF92006089
70086+:1020B00012240004A38000688E7400041680001EA1
70087+:1020C0003C0880009386005930C7000110E0000FE3
70088+:1020D0008F9300608CB000848CA800842404FF805F
70089+:1020E000020410240002F940310A007F03EA482567
70090+:1020F0003C0C2000012C902530CD00FE3C038000DC
70091+:10210000AC720830A38D00598F9300608FBF0028F8
70092+:102110008FB50024ACB300DC8FB400208FB3001C5B
70093+:102120008FB200188FB100148FB00010240200018C
70094+:1021300003E0000827BD00308E7F000895020120D3
70095+:102140008E67001003E2C8213326FFFF30D8000F4E
70096+:1021500033150001AF87003416A00058A39800582B
70097+:1021600035090C000309382100D81823AD03008479
70098+:10217000AF8700648E6A00043148FFFF1100007EC3
70099+:10218000A78A005C90AC00D42407FF8000EC3024C8
70100+:1021900030CB00FF1560004B9786005C938E005A91
70101+:1021A000240D000230D5FFFF11CD02A20000A021B6
70102+:1021B0008F85006002A5802B160000BC9388004824
70103+:1021C0003C11800096240120310400FF1485008812
70104+:1021D0008F8400648F9800343312000356400085CA
70105+:1021E00030A500FF8F900064310C00FF24060034FE
70106+:1021F00011860095AF90004C9204000414800118E1
70107+:102200008F8E0038A380003C8E0D00048DC800D84E
70108+:102210003C0600FF34CCFFFF01AC30240106182B34
70109+:1022200014600120AF8600548F8700609798005C8F
70110+:10223000AF8700400307402310C000C7A788005C99
70111+:102240008F91003030C3000300035823922A007C92
70112+:102250003171000302261021000A20823092000111
70113+:102260000012488000492821311FFFFF03E5C82BD9
70114+:10227000132001208F8800388F8500348F880064F8
70115+:102280001105025A3C0E3F018E0600003C0C250051
70116+:1022900000CE682411AC01638F84004C30E500FF50
70117+:1022A0000E00184A000030218F8800388F870060A8
70118+:1022B0008F8500340A001DB78F8600540A001C5613
70119+:1022C000AF87006490A400D400E48024320200FFB1
70120+:1022D000104000169386005990A6008890AE00D753
70121+:1022E00024A8008830D4003F2686FFE02CD10020AF
70122+:1022F000A38E003C1220000CAF88004C240B000180
70123+:1023000000CB20043095001916A0012B3C0680005C
70124+:1023100034CF0002008FC0241700022E3099002015
70125+:1023200017200234000000009386005930CB0001D2
70126+:102330001160000F9788005C8CBF00848CA900841A
70127+:10234000240AFF8003EA6024000C19403132007F28
70128+:10235000007238253C0D200000EDC82530D800FE65
70129+:102360003C0F8000ADF90830A39800599788005CB5
70130+:102370001500FF84000000008E630020306200041E
70131+:102380001040FF51938600592404FFFB0064802411
70132+:102390003C038000AE700020346601808C7301B86D
70133+:1023A0000660FFFE8F98006C347501003C1400013C
70134+:1023B000ACD800008C6B012424076085ACCB0004F2
70135+:1023C0008EAE000401D488245220000124076083CB
70136+:1023D00024190002A4C700083C0F1000A0D9000B6C
70137+:1023E0003C068000ACCF01B80A001C2B9386005934
70138+:1023F00030A500FF0E00184A240600018F88006CEB
70139+:102400003C05800034A90900250201889388004812
70140+:10241000304A0007304B00783C0340802407FF809F
70141+:102420000163C825014980210047F824310C00FFD1
70142+:1024300024060034ACBF0800AF90004CACB90810C3
70143+:102440005586FF6E920400048F8400388E11003090
70144+:10245000908E00D431CD001015A000108F83006045
70145+:102460002C6F000515E000E400000000909800D4F7
70146+:102470002465FFFC331200101640000830A400FF52
70147+:102480008F9F00648F99003413F90004388700018E
70148+:1024900030E20001144001C8000000000E001BC320
70149+:1024A000000000000A001DF8000000008F84006496
70150+:1024B00030C500FF0E00184A24060001939800481A
70151+:1024C000240B0034130B00A08F8500388F8600602A
70152+:1024D0009783005C306EFFFF00CE8823AF910060D1
70153+:1024E000A780005C1280FF90028018212414FFFD59
70154+:1024F0005474FFA28E6300208E6A00042403FFBF81
70155+:102500002408FFEF0155F823AE7F000490AC00D4FF
70156+:102510003189007FA0A900D48E7200208F8F0038EF
70157+:10252000A780005C364D0002AE6D0020A5E000BC27
70158+:1025300091E500D400A3C824A1F900D48F950038F8
70159+:10254000AEA000EC92B800D403085824A2AB00D48B
70160+:102550000A001CD78F8500388F910034AF8000604F
70161+:1025600002275821AF8B0034000020212403FFFFF5
70162+:10257000108301B48F8500388E0C00103C0D0800CC
70163+:102580008DAD31B09208000031843FFF008D802B6B
70164+:1025900012000023310D003F3C1908008F3931A88B
70165+:1025A0008F9F006C000479802408FF80033F202166
70166+:1025B000008FC821938500590328F8243C06008029
70167+:1025C0003C0F800034D80001001F91403331007F60
70168+:1025D0008F8600380251502535EE0940332B0078A4
70169+:1025E000333000073C0310003C02800C017890253A
70170+:1025F000020E48210143C0250222382134AE0001D9
70171+:10260000ADFF0804AF890050ADF20814AF87004455
70172+:10261000ADFF0028ACD90084ADF80830A38E005976
70173+:102620009383005A24070003106700272407000142
70174+:102630001467FFAC8F8500382411002311B1008589
70175+:1026400000000000240E000B026020210E001A4A38
70176+:10265000A38E00680040A0210A001D328F8500383B
70177+:1026600002602021240B000C0E001A4AA38B006884
70178+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
70179+:10268000A380003C8E0D00048DC800D83C0600FFDE
70180+:1026900034CCFFFF01AC30240106182B1060FEE2A1
70181+:1026A000AF86005402602021241200190E001A4A3D
70182+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
70183+:1026C0000A001C838F86005425A3FFE02C74002091
70184+:1026D0001280FFDD240E000B000328803C1108014E
70185+:1026E000263194B400B148218D2D000001A00008CE
70186+:1026F000000000008F85003400A710219385003C66
70187+:10270000AF82003402251821A383003C951F00BC32
70188+:102710000226282137F91000A51900BC5240FF926B
70189+:10272000AF850060246A0004A38A003C950900BCC0
70190+:1027300024A40004AF84006035322000A51200BC40
70191+:102740000A001D54000020218F8600602CC800055F
70192+:102750001500FF609783005C3065FFFF00C5C8234C
70193+:102760002F2F000511E00003306400FF24CDFFFC93
70194+:1027700031A400FF8F8900648F920034113200046D
70195+:10278000389F000133EC0001158001380000000083
70196+:102790008F840038908700D434E60010A08600D4DF
70197+:1027A0008F8500388F8600609783005CACA000ECBA
70198+:1027B0000A001D2F306EFFFF8CB500848CB400849E
70199+:1027C0003C04100002A7302400068940328E007FAE
70200+:1027D000022E8025020410253C08800024050001FB
70201+:1027E00002602021240600010E0019A9AD02083064
70202+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
70203+:102800000260202124090005A38900680E001A4AED
70204+:102810002411FFFF1451FE782404FFFF0A001D5508
70205+:102820002403FFFF8F8F004C8F8800388DF8000045
70206+:10283000AD1800888DE70010AD0700988F87006005
70207+:102840000A001DB78F8600542406FFFF118600057D
70208+:10285000000000000E001B4C026020210A001D8FAA
70209+:102860000040A0210E001AD1026020210A001D8F15
70210+:102870000040A0218F90004C3C0208008C4231B0F7
70211+:102880008E110010322C3FFF0182282B10A0000C6B
70212+:10289000240BFF808F85005090A3000D01637024EE
70213+:1028A00031CA00FF1140000702602021001143825D
70214+:1028B000310600032418000110D8010600000000B2
70215+:1028C000026020212403000D0E001A4AA383006831
70216+:1028D000004020218F8500380A001D320080A02191
70217+:1028E0008F90004C3C0A08008D4A31B08F85005013
70218+:1028F0008E0400100000A0218CB1001430823FFF34
70219+:10290000004A602B8CB200205180FFEE0260202133
70220+:1029100090B8000D240BFF800178702431C300FFB4
70221+:102920005060FFE80260202100044382310600036A
70222+:1029300014C0FFE40260202194BF001C8F9900386E
70223+:102940008E060028A73F00E88CAF0010022F20233E
70224+:1029500014C4013A026020218F83005400C368210F
70225+:10296000022D382B14E00136240200188F8A00440F
70226+:102970008F820030024390218D4B00100163702341
70227+:10298000AD4E0010AD5200208C4C00740192282BEB
70228+:1029900014A0015F026020218F8400508E08002463
70229+:1029A0008C86002411060007026020212419001CD7
70230+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
70231+:1029C0002404FFFF8F8400448C87002424FF00012F
70232+:1029D000AC9F00241251012F8F8D00308DB10074F7
70233+:1029E0001232012C3C0B00808E0E000001CB5024D3
70234+:1029F00015400075000000008E0300142411FFFF35
70235+:102A0000107100073C0808003C0608008CC6319095
70236+:102A100000C8C0241300015202602021A380006876
70237+:102A20008E0300003C19000100792024108000135F
70238+:102A30003C1F0080007FA02416800009020028218E
70239+:102A4000026020212411001A0E001A4AA391006886
70240+:102A50002407FFFF1047FF9F2404FFFF02002821E7
70241+:102A6000026020210E001A6A240600012410FFFFD4
70242+:102A70001050FF982404FFFF241400018F8D0044A0
70243+:102A8000026020210280302195A900342405000134
70244+:102A9000253200010E0019A9A5B200340000202142
70245+:102AA0008F8500380A001D320080A0218F90004CD5
70246+:102AB0003C1408008E9431B08E07001030E53FFFC3
70247+:102AC00000B4C82B132000618F8600502412FF80B1
70248+:102AD00090C9000D0249682431A400FF5080005CB9
70249+:102AE000026020218F8C00541180000700078B8228
70250+:102AF0008F8500388F82FCC094BF0080944A000A02
70251+:102B0000515F00F78F8600403227000314E0006415
70252+:102B100000000000920E000211C000D8000000006A
70253+:102B20008E0B0024156000D902602021920400035E
70254+:102B300024190002308500FF14B90005308900FF18
70255+:102B40008F940054128000EA240D002C308900FF7D
70256+:102B5000392C00102D8400012D3200010244302553
70257+:102B6000020028210E001A6A026020212410FFFFB3
70258+:102B7000105000BF8F8500388F830054106000D341
70259+:102B8000240500013C0A08008D4A318C0143F82BD2
70260+:102B900017E000B22402002D02602021000028214D
70261+:102BA0000E0019A9240600018F85003800001821A5
70262+:102BB0000A001D320060A0210E0018750000000000
70263+:102BC0000A001DF800000000AC8000200A001E78FA
70264+:102BD0008E03001400002821026020210E0019A994
70265+:102BE000240600010A001CC38F8500380A001DB7A7
70266+:102BF0008F8800388CAA00848CAC00843C031000C1
70267+:102C00000147F824001F91403189007F024968255F
70268+:102C100001A32825ACC50830910700012405000157
70269+:102C2000026020210E0019A930E600010A001CC331
70270+:102C30008F850038938F00482403FFFD0A001D3460
70271+:102C4000AF8F00600A001D342403FFFF02602021C3
70272+:102C50002410000D0E001A4AA390006800401821AD
70273+:102C60008F8500380A001D320060A0210E00187503
70274+:102C7000000000009783005C8F86006000402021E8
70275+:102C80003070FFFF00D010232C4A00051140FE11C8
70276+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
70277+:102CA00090CF000D31E300085460FFA192040003AF
70278+:102CB00002602021240200100E001A4AA38200683C
70279+:102CC0002403FFFF5443FF9A920400030A001F12DB
70280+:102CD0008F85003890A4000D308F000811E000951A
70281+:102CE0008F990054572000A6026020218E1F000CEF
70282+:102CF0008CB4002057F40005026020218E0D0008DE
70283+:102D00008CA7002411A7003A026020212402002091
70284+:102D1000A38200680E001A4A2412FFFF1052FEED33
70285+:102D20002404FFFF8F9F00442402FFF73C14800E11
70286+:102D300093EA000D2419FF803C03800001423824EF
70287+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
70288+:102D50008F8C006C97F200788F870044012C302113
70289+:102D6000324D7FFF000D204000C4782131E5007F07
70290+:102D700000B4C02101F94024AC68002CA711000068
70291+:102D80008CEB0028256E0001ACEE00288CEA002CAC
70292+:102D90008E02002C01426021ACEC002C8E09002C2C
70293+:102DA000ACE900308E120014ACF2003494ED003A1D
70294+:102DB00025A40001A4E4003A97E600783C1108003D
70295+:102DC0008E3131B024C3000130707FFF1211005CDE
70296+:102DD000006030218F8F0030026020212405000127
70297+:102DE0000E001934A5E600780A001EA1000020217B
70298+:102DF0008E0900142412FFFF1132006B8F8A0038F5
70299+:102E00008E0200188D4C00D0144C00650260202109
70300+:102E10008E0B00248CAE0028116E005B2402002172
70301+:102E20000E001A4AA38200681452FFBE2404FFFF5A
70302+:102E30008F8500380A001D320080A0212402001F67
70303+:102E40000E001A4AA38200682409FFFF1049FEA160
70304+:102E50002404FFFF0A001E548F83005402602021C7
70305+:102E60000E001A4AA38200681450FF508F85003864
70306+:102E70002403FFFF0A001D320060A0218CD800242B
70307+:102E80008E0800241118FF29026020210A001F2744
70308+:102E90002402000F8E0900003C05008001259024CB
70309+:102EA0001640FF492402001A026020210E001A4A2F
70310+:102EB000A3820068240CFFFF144CFECF2404FFFF04
70311+:102EC0008F8500380A001D320080A0210E001934C1
70312+:102ED000026020218F8500380A001EE500001821BD
70313+:102EE0002403FFFD0060A0210A001D32AF860060B0
70314+:102EF000026020210E001A4AA38D00682403FFFF00
70315+:102F00001043FF588F8500380A001ECC920400033E
70316+:102F10002418001D0E001A4AA39800682403FFFF1E
70317+:102F20001443FE9D2404FFFF8F8500380A001D32E4
70318+:102F30000080A021026020210A001F3D24020024FD
70319+:102F4000240880000068C024330BFFFF000B73C20D
70320+:102F500031D000FF001088270A001F6E001133C017
70321+:102F6000240F001B0E001A4AA38F00681451FEACF8
70322+:102F70002404FFFF8F8500380A001D320080A02145
70323+:102F80000A001F3D240200278E0600288CA3002C77
70324+:102F900010C30008026020210A001F812402001FC4
70325+:102FA0000A001F812402000E026020210A001F81F6
70326+:102FB000240200258E04002C1080000D8F8F00301D
70327+:102FC0008DE800740104C02B5700000C0260202122
70328+:102FD0008CB900140086A0210334282B10A0FF52C6
70329+:102FE0008F9F0044026020210A001F8124020022DA
70330+:102FF000026020210A001F81240200230A001F8191
70331+:103000002402002627BDFFD8AFB3001CAFB10014C7
70332+:10301000AFBF0020AFB20018AFB000103C0280007C
70333+:103020008C5201408C4B01483C048000000B8C0208
70334+:10303000322300FF317300FF8C8501B804A0FFFE2E
70335+:1030400034900180AE1200008C8701442464FFF0AC
70336+:10305000240600022C830013AE070004A61100080A
70337+:10306000A206000BAE1300241060004F8FBF00209B
70338+:10307000000448803C0A0801254A9534012A402171
70339+:103080008D04000000800008000000003C030800E0
70340+:103090008C6331A831693FFF00099980007280215B
70341+:1030A000021370212405FF80264D0100264C00806C
70342+:1030B0003C02800031B1007F3198007F31CA007F2F
70343+:1030C0003C1F800A3C1980043C0F800C01C5202461
70344+:1030D00001A5302401853824014F1821AC46002475
70345+:1030E000023F402103194821AC470090AC4400281E
70346+:1030F000AF830044AF880038AF8900300E0019005C
70347+:10310000016080213C0380008C6B01B80560FFFEEC
70348+:103110008F8700448F8600383465018090E8000D69
70349+:10312000ACB20000A4B0000600082600000416039C
70350+:1031300000029027001227C21080008124C200885C
70351+:10314000241F6082A4BF0008A0A000052402000282
70352+:10315000A0A2000B8F8B0030000424003C08270045
70353+:1031600000889025ACB20010ACA00014ACA00024E4
70354+:10317000ACA00028ACA0002C8D6900382413FF807F
70355+:10318000ACA9001890E3000D02638024320500FF13
70356+:1031900010A000058FBF002090ED000D31AC007F26
70357+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
70358+:1031B0008FB100148FB000103C0A10003C0E80004C
70359+:1031C00027BD002803E00008ADCA01B8265F010052
70360+:1031D0002405FF8033F8007F3C06800003E5782457
70361+:1031E0003C19800A03192021ACCF0024908E00D412
70362+:1031F00000AE682431AC00FF11800024AF84003899
70363+:10320000248E008895CD00123C0C08008D8C31A8CE
70364+:1032100031AB3FFF01924821000B5180012A402130
70365+:1032200001052024ACC400283107007F3C06800C37
70366+:1032300000E620219083000D00A31024304500FFFC
70367+:1032400010A0FFD8AF8400449098000D330F0010F9
70368+:1032500015E0FFD58FBF00200E0019000000000010
70369+:103260003C0380008C7901B80720FFFE00000000BD
70370+:10327000AE1200008C7F0144AE1F0004A6110008AE
70371+:1032800024110002A211000BAE1300243C1308010C
70372+:10329000927396F0327000015200FFC38FBF00207E
70373+:1032A0000E002146024020210A0020638FBF00202B
70374+:1032B0003C1260008E452C083C03F0033462FFFF93
70375+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
70376+:1032D00003199825AE532C080A0020638FBF0020E5
70377+:1032E000264D010031AF007F3C10800A240EFF8084
70378+:1032F00001F0282101AE60243C0B8000AD6C00245D
70379+:103300001660FFA8AF85003824110003A0B100FCAF
70380+:103310000A0020638FBF002026480100310A007F89
70381+:103320003C0B800A2409FF80014B30210109202435
70382+:103330003C078000ACE400240A002062AF8600381D
70383+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
70384+:10335000241F608290D900D42418FF800319782498
70385+:1033600031EA00FF1140FF7700000000240700044D
70386+:10337000A0C700FC8F870044241160842406000D40
70387+:10338000A4B10008A0A600050A00204D24020002F6
70388+:103390003C040001248496DC24030014240200FE73
70389+:1033A0003C010800AC2431EC3C010800AC2331E8BE
70390+:1033B0003C010801A42296F83C040801248496F8F4
70391+:1033C0000000182100643021A0C300042463000120
70392+:1033D0002C6500FF54A0FFFC006430213C0708006E
70393+:1033E00024E7010003E00008AF87007800A058211F
70394+:1033F000008048210000102114A00012000050217C
70395+:103400000A002142000000003C010801A42096F8B7
70396+:103410003C05080194A596F88F8200783C0C0801C1
70397+:10342000258C96F800E2182100AC2021014B302BAE
70398+:10343000A089000400001021A460000810C0003919
70399+:10344000010048218F8600780009384000E94021BA
70400+:103450000008388000E6282190A8000B90B9000AE7
70401+:103460000008204000881021000218800066C0215A
70402+:10347000A319000A8F85007800E5782191EE000AF3
70403+:1034800091E6000B000E684001AE6021000C208028
70404+:1034900000851021A046000B3C030801906396F2C2
70405+:1034A000106000222462FFFF8F8300383C01080176
70406+:1034B000A02296F2906C00FF118000040000000032
70407+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
70408+:1034D000973996F8272300013078FFFF2F0F00FF60
70409+:1034E00011E0FFC9254A00013C010801A42396F818
70410+:1034F0003C05080194A596F88F8200783C0C0801E1
70411+:10350000258C96F800E2182100AC2021014B302BCD
70412+:10351000A089000400001021A460000814C0FFC9A5
70413+:103520000100482103E000080000000003E000085B
70414+:103530002402000227BDFFE0248501002407FF804C
70415+:10354000AFB00010AFBF0018AFB1001400A718242F
70416+:103550003C10800030A4007F3C06800A00862821B1
70417+:103560008E110024AE03002490A200FF1440000836
70418+:10357000AF850038A0A000098FBF0018AE1100244D
70419+:103580008FB100148FB0001003E0000827BD0020A9
70420+:1035900090A900FD90A800FF312400FF0E0020F448
70421+:1035A000310500FF8F8500388FBF0018A0A00009EB
70422+:1035B000AE1100248FB100148FB0001003E000089A
70423+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
70424+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
70425+:1035E0003C0980009533011635320C00952F011AE5
70426+:1035F0003271FFFF023280218E08000431EEFFFF9E
70427+:10360000248B0100010E6821240CFF8025A5FFFFFB
70428+:10361000016C50243166007F3C07800AAD2A0024EB
70429+:1036200000C73021AF850074AF8800703C010801ED
70430+:10363000A02096F190C300090200D02100809821BB
70431+:10364000306300FF2862000510400048AF86003854
70432+:10365000286400021480008E24140001240D00054B
70433+:103660003C010801A02D96D590CC00FD3C0108013D
70434+:10367000A02096D63C010801A02096D790CB000A46
70435+:10368000240AFF80318500FF014B4824312700FFC9
70436+:1036900010E0000C000058213C12800836510080D8
70437+:1036A0008E2F00308CD0005C01F0702305C0018E9D
70438+:1036B0008F87007090D4000A3284007FA0C4000A73
70439+:1036C0008F8600383C118008363000808E0F003025
70440+:1036D0008F87007000EF702319C000EE000000001B
70441+:1036E00090D4000924120002328400FF1092024795
70442+:1036F000000000008CC2005800E2F82327F9FFFF09
70443+:103700001B2001300000000090C5000924080004BF
70444+:1037100030A300FF10680057240A00013C01080193
70445+:10372000A02A96D590C900FF252700013C01080179
70446+:10373000A02796D43C030801906396D52406000583
70447+:103740001066006A2C780005130000C40000902168
70448+:103750000003F8803C0408012484958003E4C82118
70449+:103760008F25000000A0000800000000241800FFC2
70450+:103770001078005C0000000090CC000A90CA00099C
70451+:103780003C080801910896F13187008000EA48253D
70452+:103790003C010801A02996DC90C500FD3C140801FD
70453+:1037A000929496F2311100013C010801A02596DDAA
70454+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
70455+:1037C0003C010801A03296DF8CD900543C0108016D
70456+:1037D000AC3996E08CD000583C010801AC3096E43E
70457+:1037E0008CC3005C3C010801AC3496EC3C01080140
70458+:1037F000AC2396E8162000088FBF002C8FB4002859
70459+:103800008FB300248FB200208FB1001C8FB000183E
70460+:1038100003E0000827BD00303C1180009624010E13
70461+:103820000E000FD43094FFFF3C0B08018D6B96F413
70462+:103830000260382102802821AE2B01803C13080150
70463+:103840008E7396D401602021240600830E00102F71
70464+:10385000AFB300108FBF002C8FB400288FB30024AB
70465+:103860008FB200208FB1001C8FB0001803E0000859
70466+:1038700027BD00303C1808008F1831FC270F0001CD
70467+:103880003C010800AC2F31FC0A0021D700000000E9
70468+:103890001474FFB900000000A0C000FF3C05080040
70469+:1038A0008CA531E43C0308008C6331E03C02080045
70470+:1038B0008C4232048F99003834A80001241F000282
70471+:1038C0003C010801AC2396F43C010801A02896F0C5
70472+:1038D0003C010801A02296F3A33F00090A002190B1
70473+:1038E0008F8600380E002146000000000A0021D714
70474+:1038F0008F8600383C1F080193FF96D424190001DD
70475+:1039000013F902298F8700703C100801921096D895
70476+:103910003C06080190C696D610C000050200A02102
70477+:103920003C040801908496D9109001E48F870078B8
70478+:10393000001088408F9F0078023048210009C8801D
70479+:10394000033F702195D80008270F0001A5CF00087C
70480+:103950003C040801908496D93C05080190A596D6B0
70481+:103960000E0020F4000000008F8700780230202134
70482+:103970000004308000C720218C8500048F820074F1
70483+:1039800000A2402305020006AC8200048C8A0000DD
70484+:103990008F830070014310235C400001AC83000062
70485+:1039A0008F86003890CB00FF2D6C00025580002DD3
70486+:1039B000241400010230F821001F40800107282153
70487+:1039C00090B9000B8CAE00040019C0400319782197
70488+:1039D000000F1880006710218C4D000001AE882375
70489+:1039E0002630FFFF5E00001F241400018C440004F9
70490+:1039F0008CAA0000008A482319200019240E000414
70491+:103A00003C010801A02E96D590AD000B8CAB0004B4
70492+:103A1000000D8840022D80210010108000471021E9
70493+:103A20008C44000401646023058202009443000872
70494+:103A300090DF00FE90B9000B33E500FF54B900049D
70495+:103A40000107A021A0D400FE8F8700780107A021E4
70496+:103A50009284000B0E0020F4240500018F860038AC
70497+:103A600024140001125400962E500001160000424A
70498+:103A70003C08FFFF241900021659FF3F0000000018
70499+:103A8000A0C000FF8F860038A0D200090A0021D70D
70500+:103A90008F86003890C700092404000230E300FF3D
70501+:103AA0001064016F24090004106901528F880074AA
70502+:103AB0008CCE0054010E682325B10001062001754B
70503+:103AC000241800043C010801A03896D53C010801E7
70504+:103AD000A02096D490D400FD90D200FF2E4F00027B
70505+:103AE00015E0FF14328400FF000438408F8900780D
70506+:103AF00090DF00FF00E41021000220800089C8212F
70507+:103B00002FE500029324000B14A0FF0A24070002F3
70508+:103B100000041840006480210010588001692821A9
70509+:103B20008CAC0004010C50230540FF020000000093
70510+:103B30003C030801906396D614600005246F0001D1
70511+:103B40003C010801A02496D93C010801A02796D782
70512+:103B50003C010801A02F96D690CE00FF24E700017B
70513+:103B600031CD00FF01A7882B1220FFE990A4000BA4
70514+:103B70000A0021C6000000003C0508018CA596D46F
70515+:103B80003C12000400A8F82413F2000624020005E9
70516+:103B90003C090801912996D5152000022402000352
70517+:103BA000240200053C010801A02296F190C700FF05
70518+:103BB00014E0012024020002A0C200090A0021D75B
70519+:103BC0008F86003890CC00FF1180FEDA240A0001B5
70520+:103BD0008F8C00748F890078240F00030180682186
70521+:103BE0001160001E240E0002000540400105A021C6
70522+:103BF00000142080008990218E51000401918023BF
70523+:103C00000600FECC000000003C020801904296D65F
70524+:103C100014400005245800013C010801A02A96D751
70525+:103C20003C010801A02596D93C010801A03896D690
70526+:103C300090DF00FF010510210002C88033E500FF7E
70527+:103C4000254A00010329202100AA402B1500FEB9B6
70528+:103C50009085000B1560FFE50005404000054040E1
70529+:103C600001051821000310803C010801A02A96D408
70530+:103C70003C010801A02596D8004918218C64000455
70531+:103C800000E4F82327F9FFFF1F20FFE900000000F0
70532+:103C90008C63000000E358230560013A01A38823E8
70533+:103CA00010E301170184C0231B00FEA200000000E6
70534+:103CB0003C010801A02E96D50A002305240B000123
70535+:103CC000240E0004A0CE00093C0D08008DAD31F893
70536+:103CD0008F86003825A200013C010800AC2231F893
70537+:103CE0000A0021D7000000008CD9005C00F9C02335
70538+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
70539+:103D00008F8400748CC3005C008340232502000173
70540+:103D10001C40FF60000000008CC9005C248700018B
70541+:103D200000E9282B10A0FE943C0D80008DAB01040F
70542+:103D30003C0C0001016C50241140FE8F2402001045
70543+:103D40003C010801A02296F10A0021D700000000E2
70544+:103D50008F9100748F86003826220001ACC2005C6F
70545+:103D60000A002292241400018F8700382404FF8067
70546+:103D70000000882190E9000A241400010124302564
70547+:103D8000A0E6000A3C05080190A596D63C0408016F
70548+:103D9000908496D90E0020F4000000008F86003831
70549+:103DA0008F85007890C800FD310700FF0007404074
70550+:103DB0000107F821001FC0800305C8219323000BD1
70551+:103DC000A0C300FD8F8500788F8600380305602131
70552+:103DD000918F000B000F704001CF6821000D808093
70553+:103DE000020510218C4B0000ACCB00548D840004E4
70554+:103DF0008F83007400645023194000022482000164
70555+:103E00002462000101074821ACC2005C0009308037
70556+:103E100000C5402100E02021240500010E0020F40F
70557+:103E20009110000B8F86003890C500FF10A0FF0C8A
70558+:103E3000001070408F85007801D06821000D10803F
70559+:103E4000004558218D6400008F8C0074018450233C
70560+:103E50002547000104E0FF02263100013C03080170
70561+:103E6000906396D62E2F0002247800013C010801B1
70562+:103E7000A03896D63C010801A03496D711E0FEF890
70563+:103E8000020038210A002365000740408F84003873
70564+:103E90008F8300748C85005800A340230502FE9A8E
70565+:103EA000AC8300580A00223B000000003C070801D8
70566+:103EB00090E796F2240200FF10E200BE8F860038E1
70567+:103EC0003C110801963196FA3C030801246396F8E8
70568+:103ED000262500013230FFFF30ABFFFF02036021D7
70569+:103EE0002D6A00FF1540008D918700043C010801F8
70570+:103EF000A42096FA8F88003800074840012728211F
70571+:103F0000911800FF000530802405000127140001EE
70572+:103F1000A11400FF3C120801925296F28F8800789B
70573+:103F20008F8E0070264F000100C820213C0108013F
70574+:103F3000A02F96F2AC8E00008F8D0074A48500082F
70575+:103F4000AC8D00043C030801906396D414600077A4
70576+:103F5000000090213C010801A02596D4A087000B09
70577+:103F60008F8C007800CC5021A147000A8F82003846
70578+:103F7000A04700FD8F840038A08700FE8F860038A0
70579+:103F80008F9F0070ACDF00548F990074ACD900583B
70580+:103F90008F8D00780127C02100185880016DA02165
70581+:103FA000928F000A000F704001CF18210003888013
70582+:103FB000022D8021A207000B8F8600780166602108
70583+:103FC000918A000B000A1040004A2021000428803A
70584+:103FD00000A64021A107000A3C07800834E90080C0
70585+:103FE0008D2200308F860038ACC2005C0A0022921D
70586+:103FF0002414000190CA00FF1540FEAD8F880074A4
70587+:10400000A0C400090A0021D78F860038A0C000FD97
70588+:104010008F98003824060001A30000FE3C0108012F
70589+:10402000A02696D53C010801A02096D40A0021C6FE
70590+:104030000000000090CB00FF3C040801908496F340
70591+:10404000316C00FF0184502B1540000F2402000347
70592+:1040500024020004A0C200090A0021D78F8600387C
70593+:1040600090C3000A2410FF8002035824316C00FF23
70594+:104070001180FDC1000000003C010801A02096D580
70595+:104080000A0021C600000000A0C200090A0021D7D2
70596+:104090008F86003890D4000A2412FF8002544824EE
70597+:1040A000312800FF1500FFF4240200083C0108013C
70598+:1040B000A02296F10A0021D70000000000108840DD
70599+:1040C0008F8B0070023018210003688001A7202127
70600+:1040D000AC8B00008F8A0074240C0001A48C0008B3
70601+:1040E000AC8A00043C05080190A596D62402000184
70602+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
70603+:104100000184A0231A80FD8B000000003C010801FF
70604+:10411000A02E96D50A002305240B00013C010801BE
70605+:10412000A42596FA0A0023B78F880038240B0001D3
70606+:10413000106B00228F9800388F85003890BF00FFE9
70607+:1041400033F900FF1079002B000000003C1F08012C
70608+:1041500093FF96D8001FC840033FC0210018A080DD
70609+:104160000288782191EE000AA08E000A8F8D0078D7
70610+:104170003C030801906396D800CD88210A0023DD16
70611+:10418000A223000B263000010600003101A4902379
70612+:104190000640002B240200033C010801A02F96D505
70613+:1041A0000A002305240B00018F8900380A00223BF6
70614+:1041B000AD2700540A00229124120001931400FD3F
70615+:1041C000A094000B8F8800388F8F0078910E00FE2E
70616+:1041D00000CF6821A1AE000A8F910038A22700FD10
70617+:1041E0008F8300708F900038AE0300540A0023DEE6
70618+:1041F0008F8D007890B000FEA090000A8F8B003861
70619+:104200008F8C0078916A00FD00CC1021A04A000B31
70620+:104210008F840038A08700FE8F8600748F85003859
70621+:10422000ACA600580A0023DE8F8D007894B80008F1
70622+:10423000ACA40004030378210A002285A4AF00087F
70623+:104240003C010801A02296D50A0021C6000000000A
70624+:1042500090CF0009240D000431EE00FF11CDFD8543
70625+:10426000240200013C010801A02296D50A0021C6C3
70626+:1042700000000000080033440800334408003420E4
70627+:10428000080033F4080033D8080033280800332826
70628+:10429000080033280800334C8008010080080080A3
70629+:1042A000800800005F865437E4AC62CC50103A4579
70630+:1042B00036621985BF14C0E81BC27A1E84F4B55655
70631+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
70632+:1042D00008005AB808005A5C08005A5C08005A5C8A
70633+:1042E00008005A5C08005A7408005A5C08005A5CBE
70634+:1042F00008005AC008005A5C080059D408005A5CEB
70635+:1043000008005A5C08005AC008005A5C08005A5C51
70636+:1043100008005A5C08005A5C08005A5C08005A5CA5
70637+:1043200008005A5C08005A5C08005A5C08005A5C95
70638+:1043300008005A9408005A5C08005A9408005A5C15
70639+:1043400008005A5C08005A5C08005A9808005A9401
70640+:1043500008005A5C08005A5C08005A5C08005A5C65
70641+:1043600008005A5C08005A5C08005A5C08005A5C55
70642+:1043700008005A5C08005A5C08005A5C08005A5C45
70643+:1043800008005A5C08005A5C08005A5C08005A5C35
70644+:1043900008005A5C08005A5C08005A5C08005A5C25
70645+:1043A00008005A9808005A9808005A5C08005A9861
70646+:1043B00008005A5C08005A5C08005A5C08005A5C05
70647+:1043C00008005A5C08005A5C08005A5C08005A5CF5
70648+:1043D00008005A5C08005A5C08005A5C08005A5CE5
70649+:1043E00008005A5C08005A5C08005A5C08005A5CD5
70650+:1043F00008005A5C08005A5C08005A5C08005A5CC5
70651+:1044000008005A5C08005A5C08005A5C08005A5CB4
70652+:1044100008005A5C08005A5C08005A5C08005A5CA4
70653+:1044200008005A5C08005A5C08005A5C08005A5C94
70654+:1044300008005A5C08005A5C08005A5C08005A5C84
70655+:1044400008005A5C08005A5C08005A5C08005A5C74
70656+:1044500008005A5C08005A5C08005A5C08005A5C64
70657+:1044600008005A5C08005A5C08005A5C08005A5C54
70658+:1044700008005A5C08005A5C08005A5C08005A5C44
70659+:1044800008005A5C08005A5C08005A5C08005A5C34
70660+:1044900008005A5C08005A5C08005A5C08005A5C24
70661+:1044A00008005A5C08005A5C08005A5C08005A5C14
70662+:1044B00008005A5C08005A5C08005A5C08005A5C04
70663+:1044C00008005A5C08005A5C08005A5C08005ADC74
70664+:1044D0000800782C08007A900800783808007628C0
70665+:1044E00008007838080078C4080078380800762872
70666+:1044F0000800762808007628080076280800762824
70667+:104500000800762808007628080076280800762813
70668+:1045100008007628080078580800784808007628AF
70669+:1045200008007628080076280800762808007628F3
70670+:1045300008007628080076280800762808007628E3
70671+:1045400008007628080076280800762808007848B1
70672+:10455000080082FC08008188080082C40800818865
70673+:104560000800829408008070080081880800818813
70674+:1045700008008188080081880800818808008188F7
70675+:1045800008008188080081880800818808008188E7
70676+:104590000800818808008188080081B008008D34F7
70677+:1045A00008008E9008008E70080088D808008D4C96
70678+:1045B0000A00012400000000000000000000000DBF
70679+:1045C000747061362E322E31620000000602010145
70680+:1045D00000000000000000000000000000000000DB
70681+:1045E00000000000000000000000000000000000CB
70682+:1045F00000000000000000000000000000000000BB
70683+:1046000000000000000000000000000000000000AA
70684+:10461000000000000000000000000000000000009A
70685+:10462000000000000000000000000000000000008A
70686+:10463000000000000000000000000000000000007A
70687+:104640000000000010000003000000000000000D4A
70688+:104650000000000D3C020800244217203C03080023
70689+:1046600024632A10AC4000000043202B1480FFFD7F
70690+:10467000244200043C1D080037BD2FFC03A0F0219C
70691+:104680003C100800261004903C1C0800279C1720B2
70692+:104690000E000262000000000000000D2402FF80F6
70693+:1046A00027BDFFE000821024AFB00010AF42002011
70694+:1046B000AFBF0018AFB10014936500043084007FD1
70695+:1046C000034418213C0200080062182130A5002094
70696+:1046D000036080213C080111277B000814A0000220
70697+:1046E0002466005C2466005892020004974301048B
70698+:1046F000920400043047000F3063FFFF3084004015
70699+:10470000006728231080000900004821920200055C
70700+:1047100030420004104000050000000010A000031B
70701+:104720000000000024A5FFFC2409000492020005FB
70702+:1047300030420004104000120000000010A00010E1
70703+:10474000000000009602000200A72021010440257D
70704+:104750002442FFFEA7421016920300042402FF80A9
70705+:1047600000431024304200FF104000033C020400CC
70706+:104770000A000174010240258CC20000AF421018EB
70707+:104780008F4201780440FFFE2402000AA742014044
70708+:1047900096020002240400093042000700021023A0
70709+:1047A00030420007A7420142960200022442FFFE67
70710+:1047B000A7420144A740014697420104A74201488D
70711+:1047C0008F420108304200205040000124040001C3
70712+:1047D00092020004304200101440000234830010A2
70713+:1047E00000801821A743014A0000000000000000DB
70714+:1047F0000000000000000000AF48100000000000B2
70715+:104800000000000000000000000000008F421000C7
70716+:104810000441FFFE3102FFFF1040000700000000CE
70717+:1048200092020004304200401440000300000000E7
70718+:104830008F421018ACC20000960200063042FFFF03
70719+:10484000244200020002104300021040036288214B
70720+:10485000962200001120000D3044FFFF00A7102118
70721+:104860008F8300388F45101C0002108200021080D8
70722+:1048700000431021AC45000030A6FFFF0E00058D5F
70723+:1048800000052C0200402021A62200009203000413
70724+:104890002402FF8000431024304200FF1040001F1C
70725+:1048A0000000000092020005304200021040001B90
70726+:1048B000000000009742100C2442FFFEA742101691
70727+:1048C000000000003C02040034420030AF421000FF
70728+:1048D00000000000000000000000000000000000D8
70729+:1048E0008F4210000441FFFE000000009742100CB0
70730+:1048F0008F45101C3042FFFF24420030000210821E
70731+:1049000000021080005B1021AC45000030A6FFFFC4
70732+:104910000E00058D00052C02A62200009604000260
70733+:10492000248400080E0001E93084FFFF974401044D
70734+:104930000E0001F73084FFFF8FBF00188FB1001405
70735+:104940008FB000103C02100027BD002003E00008DB
70736+:10495000AF4201783084FFFF308200078F8500244A
70737+:1049600010400002248300073064FFF800A41021E7
70738+:1049700030421FFF03421821247B4000AF850028EE
70739+:10498000AF82002403E00008AF4200843084FFFFC0
70740+:104990003082000F8F85002C8F860034104000027B
70741+:1049A0002483000F3064FFF000A410210046182B70
70742+:1049B000AF8500300046202314600002AF82002C37
70743+:1049C000AF84002C8F82002C340480000342182115
70744+:1049D00000641821AF83003803E00008AF42008074
70745+:1049E0008F820014104000088F8200048F82FFDC49
70746+:1049F000144000058F8200043C02FFBF3442FFFFD9
70747+:104A0000008220248F82000430430006240200022A
70748+:104A10001062000F3C0201012C62000350400005AF
70749+:104A2000240200041060000F3C0200010A00023062
70750+:104A30000000000010620005240200061462000C51
70751+:104A40003C0201110A000229008210253C020011DB
70752+:104A500000821025AF421000240200010A0002303B
70753+:104A6000AF82000C00821025AF421000AF80000C16
70754+:104A700000000000000000000000000003E000084B
70755+:104A8000000000008F82000C1040000400000000B5
70756+:104A90008F4210000441FFFE0000000003E0000808
70757+:104AA000000000008F8200102443F800000231C291
70758+:104AB00024C2FFF02C6303011060000300021042C7
70759+:104AC0000A000257AC8200008F85001800C5102B29
70760+:104AD0001440000B0000182100C5102324470001DA
70761+:104AE0008F82001C00A210212442FFFF0046102BE1
70762+:104AF000544000042402FFFF0A000257AC87000064
70763+:104B00002402FFFF0A000260AC8200008C820000D9
70764+:104B10000002194000621821000318800062182169
70765+:104B2000000318803C0208002442175C0062182130
70766+:104B300003E000080060102127BDFFD8AFBF0020B0
70767+:104B4000AFB1001CAFB000183C0460088C8250006C
70768+:104B50002403FF7F3C066000004310243442380CDD
70769+:104B6000AC8250008CC24C1C3C1A80000002160221
70770+:104B70003042000F10400007AF82001C8CC34C1C59
70771+:104B80003C02001F3442FC0000621824000319C2DA
70772+:104B9000AF8300188F420008275B400034420001B9
70773+:104BA000AF420008AF8000243C02601CAF40008090
70774+:104BB000AF4000848C4500088CC308083402800094
70775+:104BC000034220212402FFF0006218243C020080EE
70776+:104BD0003C010800AC2204203C025709AF84003895
70777+:104BE00014620004AF850034240200010A0002921E
70778+:104BF000AF820014AF8000148F42000038420001E1
70779+:104C0000304200011440FFFC8F8200141040001657
70780+:104C10000000000097420104104000058F8300004F
70781+:104C2000146000072462FFFF0A0002A72C62000A3A
70782+:104C30002C620010504000048F83000024620001A9
70783+:104C4000AF8200008F8300002C62000A1440000332
70784+:104C50002C6200070A0002AEAF80FFDC10400002A9
70785+:104C600024020001AF82FFDC8F4301088F44010062
70786+:104C700030622000AF83000410400008AF840010B1
70787+:104C80003C0208008C42042C244200013C01080034
70788+:104C9000AC22042C0A00058A3C0240003065020068
70789+:104CA00014A0000324020F001482026024020D00ED
70790+:104CB00097420104104002C83C02400030624000AC
70791+:104CC000144000AD8F8200388C4400088F42017878
70792+:104CD0000440FFFE24020800AF42017824020008CD
70793+:104CE000A7420140A7400142974201048F8400047B
70794+:104CF0003051FFFF30820001104000070220802168
70795+:104D00002623FFFE240200023070FFFFA742014667
70796+:104D10000A0002DBA7430148A74001463C02080005
70797+:104D20008C42043C1440000D8F8300103082002020
70798+:104D30001440000224030009240300010060202124
70799+:104D40008F830010240209005062000134840004A3
70800+:104D5000A744014A0A0002F60000000024020F00E6
70801+:104D60001462000530820020144000062403000D68
70802+:104D70000A0002F524030005144000022403000980
70803+:104D800024030001A743014A3C0208008C4204208E
70804+:104D90003C0400480E00020C004420250E000235A1
70805+:104DA000000000008F82000C1040003E0000000058
70806+:104DB0008F4210003C0300200043102410400039B3
70807+:104DC0008F820004304200021040003600000000D4
70808+:104DD000974210141440003300000000974210085E
70809+:104DE0008F8800383042FFFF2442000600021882FC
70810+:104DF0000003388000E83021304300018CC40000FB
70811+:104E000010600004304200030000000D0A00033768
70812+:104E100000E81021544000103084FFFF3C05FFFFE4
70813+:104E200000852024008518260003182B0004102B71
70814+:104E300000431024104000050000000000000000A6
70815+:104E40000000000D00000000240002228CC20000BF
70816+:104E50000A000336004520253883FFFF0003182B86
70817+:104E60000004102B00431024104000050000000037
70818+:104E7000000000000000000D000000002400022BD4
70819+:104E80008CC200003444FFFF00E81021AC44000055
70820+:104E90003C0208008C420430244200013C0108001E
70821+:104EA000AC2204308F6200008F840038AF8200088B
70822+:104EB0008C8300003402FFFF1462000F00001021F9
70823+:104EC0003C0508008CA504543C0408008C84045064
70824+:104ED00000B0282100B0302B008220210086202144
70825+:104EE0003C010800AC2504543C010800AC240450EB
70826+:104EF0000A000580240400088C8200003042010072
70827+:104F00001040000F000010213C0508008CA5044C47
70828+:104F10003C0408008C84044800B0282100B0302BE9
70829+:104F200000822021008620213C010800AC25044C91
70830+:104F30003C010800AC2404480A0005802404000851
70831+:104F40003C0508008CA504443C0408008C84044003
70832+:104F500000B0282100B0302B0082202100862021C3
70833+:104F60003C010800AC2504443C010800AC2404408A
70834+:104F70000A000580240400088F6200088F62000088
70835+:104F800000021602304300F02402003010620005D7
70836+:104F900024020040106200E08F8200200A00058891
70837+:104FA0002442000114A000050000000000000000E1
70838+:104FB0000000000D00000000240002568F4201781E
70839+:104FC0000440FFFE000000000E00023D27A4001078
70840+:104FD0001440000500408021000000000000000D8A
70841+:104FE000000000002400025D8E0200001040000559
70842+:104FF00000000000000000000000000D00000000A4
70843+:10500000240002608F62000C0443000324020001AC
70844+:105010000A00042EAE000000AE0200008F820038AD
70845+:105020008C480008A20000078F65000C8F64000404
70846+:1050300030A3FFFF0004240200852023308200FFFC
70847+:105040000043102124420005000230832CC200815D
70848+:10505000A605000A14400005A20400040000000098
70849+:105060000000000D00000000240002788F85003849
70850+:105070000E0005AB260400148F6200048F43010864
70851+:10508000A60200083C02100000621824106000080C
70852+:105090000000000097420104920300072442FFEC45
70853+:1050A000346300023045FFFF0A0003C3A203000778
70854+:1050B000974201042442FFF03045FFFF96060008A6
70855+:1050C0002CC200135440000592030007920200070F
70856+:1050D00034420001A20200079203000724020001EB
70857+:1050E00010620005240200031062000B8F8200385A
70858+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
70859+:105100008C43000C0064182400651825AC43000C87
70860+:105110000A0003E030C6FFFF3C04FFFF8C43001091
70861+:105120000064182400651825AC43001030C6FFFF4A
70862+:1051300024C2000200021083A20200058F830038FF
70863+:10514000304200FF00021080004328218CA800009C
70864+:105150008CA2000024030004000217021443001272
70865+:1051600000000000974201043C03FFFF01031824E4
70866+:105170003042FFFF004610232442FFFE006240251C
70867+:10518000ACA8000092030005306200FF000210800E
70868+:1051900000501021904200143042000F00431021B3
70869+:1051A0000A000415A20200068CA400049742010420
70870+:1051B0009603000A3088FFFF3042FFFF00461023AD
70871+:1051C0002442FFD60002140001024025ACA80004CE
70872+:1051D000920200079204000524630028000318834C
70873+:1051E0000064182134420004A2030006A202000752
70874+:1051F0008F8200042403FFFB34420002004310248A
70875+:10520000AF820004920300068F87003800031880E5
70876+:10521000007010218C4400203C02FFF63442FFFF56
70877+:105220000082402400671821AE04000CAC68000C1A
70878+:10523000920500063C03FF7F8E02000C00052880CB
70879+:1052400000B020213463FFFF01033024948800263E
70880+:1052500000A7282100431024AE02000CAC860020D9
70881+:10526000AC880024ACA8001024020010A742014022
70882+:1052700024020002A7400142A7400144A742014680
70883+:10528000974201043C0400082442FFFEA742014863
70884+:10529000240200010E00020CA742014A9603000AF4
70885+:1052A0009202000400431021244200023042000711
70886+:1052B00000021023304200070E000235AE0200103B
70887+:1052C0008F6200003C0308008C6304442404001037
70888+:1052D000AF820008974201043042FFFF2442FFFEE4
70889+:1052E00000403821000237C33C0208008C420440D1
70890+:1052F000006718210067282B004610210045102167
70891+:105300003C010800AC2304443C010800AC220440EA
70892+:105310000A0005150000000014A0000500000000B0
70893+:10532000000000000000000D000000002400030A3F
70894+:105330008F4201780440FFFE000000000E00023D95
70895+:1053400027A4001414400005004080210000000044
70896+:105350000000000D00000000240003118E02000078
70897+:105360005440000692020007000000000000000DFB
70898+:10537000000000002400031C9202000730420004D9
70899+:10538000104000058F8200042403FFFB344200021A
70900+:1053900000431024AF8200048F620004044300081D
70901+:1053A00092020007920200068E03000CAE0000007D
70902+:1053B0000002108000501021AC4300209202000730
70903+:1053C00030420004544000099602000A920200058F
70904+:1053D0003C03000100021080005010218C46001890
70905+:1053E00000C33021AC4600189602000A9206000461
70906+:1053F000277100080220202100C2302124C60005A8
70907+:10540000260500140E0005AB00063082920400064B
70908+:105410008F6500043C027FFF000420800091202162
70909+:105420008C8300043442FFFF00A228240065182169
70910+:10543000AC8300049202000792040005920300046A
70911+:10544000304200041040001496070008308400FF2A
70912+:1054500000042080009120218C86000497420104E2
70913+:105460009605000A306300FF3042FFFF0043102121
70914+:105470000045102130E3FFFF004310232442FFD8F2
70915+:1054800030C6FFFF0002140000C23025AC860004C5
70916+:105490000A0004C992030007308500FF0005288038
70917+:1054A00000B128218CA4000097420104306300FF62
70918+:1054B0003042FFFF00431021004710233C03FFFF51
70919+:1054C000008320243042FFFF00822025ACA400008E
70920+:1054D0009203000724020001106200060000000091
70921+:1054E0002402000310620011000000000A0004EC16
70922+:1054F0008E03001097420104920300049605000AEF
70923+:105500008E24000C00431021004510212442FFF29C
70924+:105510003C03FFFF008320243042FFFF0082202550
70925+:10552000AE24000C0A0004EC8E0300109742010424
70926+:10553000920300049605000A8E24001000431021F7
70927+:10554000004510212442FFEE3C03FFFF008320248E
70928+:105550003042FFFF00822025AE2400108E03001091
70929+:105560002402000AA7420140A74301429603000A11
70930+:10557000920200043C04004000431021A742014471
70931+:10558000A740014697420104A742014824020001B6
70932+:105590000E00020CA742014A0E0002350000000076
70933+:1055A0008F6200009203000400002021AF820008F7
70934+:1055B000974201049606000A3042FFFF006218215C
70935+:1055C000006028213C0308008C6304443C0208006E
70936+:1055D0008C42044000651821004410210065382BDE
70937+:1055E000004710213C010800AC2304443C010800A2
70938+:1055F000AC22044092040004008620212484000A86
70939+:105600003084FFFF0E0001E9000000009744010410
70940+:105610003084FFFF0E0001F7000000003C02100084
70941+:10562000AF4201780A0005878F820020148200278C
70942+:105630003062000697420104104000673C024000BF
70943+:105640003062400010400005000000000000000033
70944+:105650000000000D00000000240004208F420178AB
70945+:105660000440FFFE24020800AF4201782402000833
70946+:10567000A7420140A74001428F82000497430104E2
70947+:1056800030420001104000073070FFFF2603FFFE8C
70948+:1056900024020002A7420146A74301480A00053F31
70949+:1056A0002402000DA74001462402000DA742014A32
70950+:1056B0008F62000024040008AF8200080E0001E998
70951+:1056C000000000000A0005190200202110400042DD
70952+:1056D0003C02400093620000304300F024020010BE
70953+:1056E0001062000524020070106200358F820020D5
70954+:1056F0000A000588244200018F62000097430104DC
70955+:105700003050FFFF3071FFFF8F4201780440FFFEF1
70956+:105710003202000700021023304200072403000A6F
70957+:105720002604FFFEA7430140A7420142A7440144CB
70958+:10573000A7400146A75101488F420108304200208E
70959+:10574000144000022403000924030001A743014A76
70960+:105750000E00020C3C0400400E0002350000000068
70961+:105760003C0708008CE70444021110212442FFFE8C
70962+:105770003C0608008CC604400040182100E3382194
70963+:10578000000010218F65000000E3402B00C2302193
70964+:105790002604000800C830213084FFFFAF850008D0
70965+:1057A0003C010800AC2704443C010800AC2604403E
70966+:1057B0000E0001E9000000000A0005190220202166
70967+:1057C0000E00013B000000008F82002024420001F7
70968+:1057D000AF8200203C024000AF4201380A00029232
70969+:1057E000000000003084FFFF30C6FFFF00052C00E2
70970+:1057F00000A628253882FFFF004510210045282BF0
70971+:105800000045102100021C023042FFFF004310211E
70972+:1058100000021C023042FFFF004310213842FFFF0C
70973+:1058200003E000083042FFFF3084FFFF30A5FFFF98
70974+:1058300000001821108000070000000030820001E5
70975+:105840001040000200042042006518210A0005A152
70976+:105850000005284003E000080060102110C0000689
70977+:1058600024C6FFFF8CA2000024A50004AC82000027
70978+:105870000A0005AB2484000403E0000800000000D7
70979+:1058800010A0000824A3FFFFAC8600000000000069
70980+:10589000000000002402FFFF2463FFFF1462FFFAF0
70981+:1058A0002484000403E00008000000000000000160
70982+:1058B0000A00002A00000000000000000000000DA7
70983+:1058C000747870362E322E3162000000060201001C
70984+:1058D00000000000000001360000EA600000000047
70985+:1058E00000000000000000000000000000000000B8
70986+:1058F00000000000000000000000000000000000A8
70987+:105900000000000000000000000000000000000097
70988+:105910000000001600000000000000000000000071
70989+:105920000000000000000000000000000000000077
70990+:105930000000000000000000000000000000000067
70991+:1059400000000000000000000000138800000000BC
70992+:10595000000005DC00000000000000001000000353
70993+:10596000000000000000000D0000000D3C020800D7
70994+:1059700024423D683C0308002463401CAC40000006
70995+:105980000043202B1480FFFD244200043C1D08002E
70996+:1059900037BD7FFC03A0F0213C100800261000A8B2
70997+:1059A0003C1C0800279C3D680E00044E00000000CF
70998+:1059B0000000000D27BDFFB4AFA10000AFA200049E
70999+:1059C000AFA30008AFA4000CAFA50010AFA6001451
71000+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
71001+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
71002+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
71003+:105A0000AFBF00480E000591000000008FBF0048A6
71004+:105A10008FBC00448FB900408FB8003C8FAF003876
71005+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
71006+:105A30008FAA00248FA900208FA8001C8FA7001810
71007+:105A40008FA600148FA500108FA4000C8FA3000850
71008+:105A50008FA200048FA1000027BD004C3C1B6004F6
71009+:105A60008F7A5030377B502803400008AF7A00000F
71010+:105A70008F86003C3C0390003C0280000086282575
71011+:105A800000A32025AC4400203C0380008C6700204C
71012+:105A900004E0FFFE0000000003E00008000000003A
71013+:105AA0000A000070240400018F85003C3C04800043
71014+:105AB0003483000100A3102503E00008AC8200201D
71015+:105AC00003E00008000010213084FFFF30A5FFFF35
71016+:105AD00010800007000018213082000110400002F1
71017+:105AE00000042042006518211480FFFB00052840B7
71018+:105AF00003E000080060102110C000070000000053
71019+:105B00008CA2000024C6FFFF24A50004AC82000084
71020+:105B100014C0FFFB2484000403E000080000000020
71021+:105B200010A0000824A3FFFFAC86000000000000C6
71022+:105B3000000000002402FFFF2463FFFF1462FFFA4D
71023+:105B40002484000403E000080000000090AA003153
71024+:105B50008FAB00108CAC00403C0300FF8D6800044C
71025+:105B6000AD6C00208CAD004400E060213462FFFF8A
71026+:105B7000AD6D00248CA700483C09FF000109C0243A
71027+:105B8000AD6700288CAE004C0182C824031978252B
71028+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
71029+:105BA000AD6D001C94A900323128FFFFAD680010D4
71030+:105BB00090A70030A5600002A1600004A16700006A
71031+:105BC00090A30032306200FF0002198210600005CD
71032+:105BD000240500011065000E0000000003E000082D
71033+:105BE000A16A00018CD80028354A0080AD780018E1
71034+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
71035+:105C00008CC4002CA16A000103E00008AD64000C04
71036+:105C10008CCD001CAD6D00188CC90014AD6900144A
71037+:105C20008CC80024AD6800088CC70020AD67000C4C
71038+:105C30008CC200148C8300700043C82B1320000713
71039+:105C4000000000008CC20014144CFFE400000000AF
71040+:105C5000354A008003E00008A16A00018C820070D0
71041+:105C60000A0000E6000000009089003027BDFFF820
71042+:105C70008FA8001CA3A900008FA300003C0DFF808B
71043+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
71044+:105C9000A100000400C05821A7A000028D06000446
71045+:105CA00000A048210167C8218FA500000080502175
71046+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
71047+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
71048+:105CD00000EDC02400C27824000C1DC003236825F9
71049+:105CE00001F87025AD0D0000AD0E00048D240024D8
71050+:105CF000AFAD0000AD0400088D2C00202404FFFF90
71051+:105D0000AD0C000C9547003230E6FFFFAD060010E9
71052+:105D10009145004830A200FF000219C25060000106
71053+:105D20008D240034AD0400148D4700388FAA00186C
71054+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
71055+:105D4000AD00002CAD00001803E00008AD000020FD
71056+:105D500027BDFFE0AFB20018AFB10014AFB0001024
71057+:105D6000AFBF001C9098003000C088213C0D00FFA0
71058+:105D7000330F007FA0CF0000908E003135ACFFFFC5
71059+:105D80003C0AFF00A0CE000194A6001EA220000441
71060+:105D90008CAB00148E29000400A08021016C282403
71061+:105DA000012A40240080902101052025A62600021A
71062+:105DB000AE24000426050020262400080E000092D0
71063+:105DC00024060002924700302605002826240014ED
71064+:105DD00000071E000003160324060004044000030D
71065+:105DE0002403FFFF965900323323FFFF0E00009279
71066+:105DF000AE230010262400248FBF001C8FB2001891
71067+:105E00008FB100148FB00010240500030000302172
71068+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
71069+:105E2000AFB00018AFBF002090A9003024020001DD
71070+:105E300000E050213123003F00A040218FB00040FE
71071+:105E40000080882100C04821106200148FA700380C
71072+:105E5000240B000500A0202100C02821106B001396
71073+:105E6000020030210E000128000000009225007C75
71074+:105E700030A400021080000326030030AE00003082
71075+:105E8000260300348FBF00208FB1001C8FB0001894
71076+:105E90000060102103E0000827BD00280E0000A7C5
71077+:105EA000AFB000100A00016F000000008FA3003C9B
71078+:105EB000010020210120282101403021AFA3001042
71079+:105EC0000E0000EEAFB000140A00016F00000000E9
71080+:105ED0003C06800034C20E008C4400108F850044C4
71081+:105EE000ACA400208C43001803E00008ACA30024FD
71082+:105EF0003C06800034C20E008C4400148F850044A0
71083+:105F0000ACA400208C43001C03E00008ACA30024D8
71084+:105F10009382000C1040001B2483000F2404FFF028
71085+:105F20000064382410E00019978B00109784000E4D
71086+:105F30009389000D3C0A601C0A0001AC01644023F7
71087+:105F400001037021006428231126000231C2FFFFE3
71088+:105F500030A2FFFF0047302B50C0000E00E4482164
71089+:105F60008D4D000C31A3FFFF00036400000C2C03D7
71090+:105F700004A1FFF30000302130637FFF0A0001A479
71091+:105F80002406000103E00008000000009784000ED2
71092+:105F900000E448213123FFFF3168FFFF0068382B00
71093+:105FA00054E0FFF8A783000E938A000D114000050E
71094+:105FB000240F0001006BC023A380000D03E0000844
71095+:105FC000A798000E006BC023A38F000D03E000080C
71096+:105FD000A798000E03E000080000000027BDFFE8BE
71097+:105FE000AFB000103C10800036030140308BFFFF43
71098+:105FF00093AA002BAFBF0014A46B000436040E005C
71099+:106000009488001630C600FF8FA90030A4680006EF
71100+:10601000AC650008A0660012A46A001AAC670020F4
71101+:106020008FA5002CA4690018012020210E000198E2
71102+:10603000AC6500143C021000AE0201788FBF001462
71103+:106040008FB0001003E0000827BD00188F85000006
71104+:106050002484000727BDFFF83084FFF83C06800049
71105+:1060600094CB008A316AFFFFAFAA00008FA900001D
71106+:10607000012540232507FFFF30E31FFF0064102B9D
71107+:106080001440FFF700056882000D288034CC4000E2
71108+:1060900000AC102103E0000827BD00088F8200003B
71109+:1060A0002486000730C5FFF800A2182130641FFFC6
71110+:1060B00003E00008AF8400008F87003C8F84004419
71111+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
71112+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
71113+:1060E000AFB20030AFB000283C0B80008C8600249B
71114+:1060F000AD6700808C8A002035670E00356901008D
71115+:10610000ACEA00108C8800248D2500040000B82122
71116+:10611000ACE800188CE3001000A688230000A02142
71117+:10612000ACE300148CE20018ACE2001C122000FE6C
71118+:1061300000E0B021936C0008118000F40000000022
71119+:10614000976F001031EEFFFF022E682B15A000EFB5
71120+:1061500000000000977200103250FFFFAED0000028
71121+:106160003C0380008C740000329300081260FFFD35
71122+:106170000000000096D800088EC700043305FFFF1A
71123+:1061800030B5000112A000E4000000000000000D86
71124+:1061900030BFA0402419004013F9011B30B4A00007
71125+:1061A000128000DF000000009373000812600008F6
71126+:1061B00000000000976D001031ACFFFF00EC202BB9
71127+:1061C0001080000330AE004011C000D50000000078
71128+:1061D000A7850040AF87003893630008022028217C
71129+:1061E000AFB10020146000F527B40020AF60000CB0
71130+:1061F000978F004031F14000162000022403001662
71131+:106200002403000E24054007A363000AAF650014B1
71132+:10621000938A00428F70001431550001001512401E
71133+:1062200002024825AF690014979F00408F78001440
71134+:1062300033F9001003194025AF680014979200400D
71135+:106240003247000810E0016E000000008F67001464
71136+:106250003C1210003C11800000F27825AF6F001452
71137+:1062600036230E00946E000A3C0D81002406000EB9
71138+:1062700031CCFFFF018D2025AF640004A36600022E
71139+:106280009373000A3406FFFC266B0004A36B000A1C
71140+:1062900097980040330820001100015F00000000C3
71141+:1062A0003C05800034A90E00979900409538000CF9
71142+:1062B00097870040001940423312C00031030003A9
71143+:1062C00000127B0330F11000006F6825001172038B
71144+:1062D00001AE6025000C20C0A76400129793004017
71145+:1062E000936A000A001359823175003C02AA1021FA
71146+:1062F0002450003CA3700009953F000C33F93FFF88
71147+:10630000A779001097700012936900090130F821F5
71148+:1063100027E5000230B900070019C0233308000741
71149+:10632000A368000B9371000997720012976F001019
71150+:10633000322700FF8F910038978D004000F218211E
71151+:10634000006F702101C6602131A6004010C0000519
71152+:106350003185FFFF00B1102B3C1280001040001768
71153+:10636000000098210225A82B56A0013E8FA50020F1
71154+:106370003C048000348A0E008D5300143C068000DB
71155+:10638000AD5300108D4B001CAD4B0018AD45000007
71156+:106390008CCD000031AC00081180FFFD34CE0E0022
71157+:1063A00095C3000800A0882100009021A783004029
71158+:1063B0008DC6000424130001AF860038976F0010CB
71159+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
71160+:1063D000AE85000093620008144000DD000000005C
71161+:1063E0000E0001E7240400108F900048004028218F
71162+:1063F0003C023200320600FF000654000142F8253C
71163+:1064000026090001AF890048ACBF0000937900095C
71164+:1064100097780012936F000A332800FF3303FFFFC1
71165+:106420000103382100076C0031EE00FF01AE60254A
71166+:10643000ACAC00048F840048978B0040316A200088
71167+:106440001140010AACA4000897640012308BFFFFD2
71168+:1064500006400108ACAB000C978E004031C5000827
71169+:1064600014A0000226280006262800023C1F8000F7
71170+:1064700037E70E0094F900148CE5001C8F670004C8
71171+:10648000937800023324FFFF330300FFAFA3001013
71172+:106490008F6F0014AFA800180E0001CBAFAF00142F
71173+:1064A000240400100E0001FB000000008E9200008A
71174+:1064B00016400005000000008F7800142403FFBF81
71175+:1064C0000303A024AF7400148F67000C00F5C821EB
71176+:1064D000AF79000C9375000816A0000800000000BA
71177+:1064E00012600006000000008F6800143C0AEFFFF5
71178+:1064F0003549FFFE0109F824AF7F0014A37300089B
71179+:106500008FA500200A00034F02202021AED10000F9
71180+:106510000A00022D3C03800014E0FF1E30BFA040A3
71181+:106520000E0001900000A0212E9100010237B0253D
71182+:1065300012C000188FBF00488F87003C24170F003F
71183+:1065400010F700D43C0680008CD901780720FFFEAC
71184+:10655000241F0F0010FF00F634CA0E008D560014E1
71185+:1065600034C7014024080240ACF600048D49001CE9
71186+:106570003C141000ACE90008A0E00012A4E0001AEE
71187+:10658000ACE00020A4E00018ACE80014ACD4017822
71188+:106590008FBF00488FB700448FB600408FB5003CD6
71189+:1065A0008FB400388FB300348FB200308FB1002C1D
71190+:1065B0008FB0002803E0000827BD00508F910038FD
71191+:1065C000978800403C1280000220A821310700403B
71192+:1065D00014E0FF7C00009821977900108F9200381A
71193+:1065E0003338FFFF131200A8000020210080A021F3
71194+:1065F000108000F300A088211620FECE00000000CD
71195+:106600000A00031F2E9100013C0380008C62017878
71196+:106610000440FFFE240808008F860000AC68017863
71197+:106620003C038000946D008A31ACFFFF0186582343
71198+:10663000256AFFFF31441FFF2C8900081520FFF950
71199+:10664000000000008F8F0048347040008F83003CB2
71200+:1066500000E0A021240E0F0025E70001AF870048CD
71201+:1066600000D03021023488233C08800031F500FF3F
71202+:10667000106E0005240700019398004233130001B7
71203+:106680000013924036470001001524003C0A010027
71204+:10669000008A4825ACC900008F82004830BF003610
71205+:1066A00030B90008ACC200041320009900FF9825FF
71206+:1066B00035120E009650000A8F8700003C0F8100B3
71207+:1066C0003203FFFF24ED000835060140006F60250E
71208+:1066D0003C0E100031AB1FFF269200062405000E71
71209+:1066E000ACCC0020026E9825A4C5001AAF8B000028
71210+:1066F000A4D20018162000083C1080008F89003CAE
71211+:1067000024020F00512200022417000136730040BA
71212+:106710000E0001883C10800036060E008CCB001461
71213+:10672000360A014002402021AD4B00048CC5001CFC
71214+:10673000AD450008A1550012AD5300140E0001989C
71215+:106740003C151000AE1501780A000352000000004D
71216+:10675000936F0009976E0012936D000B31E500FFF7
71217+:1067600000AE202131AC00FF008C80212602000AFF
71218+:106770003050FFFF0E0001E7020020218F86004805
71219+:106780003C0341003C05800024CB0001AF8B004856
71220+:10679000936A00099769001230C600FF315F00FF5D
71221+:1067A0003128FFFF03E8382124F900020006C40065
71222+:1067B0000319782501E37025AC4E00008F6D000CA5
71223+:1067C00034A40E00948B001401B26025AC4C00047C
71224+:1067D0008C85001C8F670004936A00023164FFFF00
71225+:1067E000314900FFAFA900108F680014AFB1001845
71226+:1067F0000E0001CBAFA800140A0002FD0200202108
71227+:10680000AF600004A36000029798004033082000A6
71228+:106810001500FEA300003021A760001297840040FD
71229+:10682000936B000A3C10800030931F0000135183CB
71230+:10683000014BA82126A20028A362000936090E00F8
71231+:10684000953F000C0A000295A77F00108F7000147E
71232+:10685000360900400E000188AF6900140A0002C921
71233+:10686000000000000A00034F000020210641FEFA4C
71234+:10687000ACA0000C8CAC000C3C0D8000018D902570
71235+:106880000A0002EAACB2000C000090210A0002C526
71236+:1068900024130001128000073C028000344B0E00DC
71237+:1068A0009566000830D300401260004900000000E7
71238+:1068B0003C0680008CD001780600FFFE34C50E0037
71239+:1068C00094B500103C03050034CC014032B8FFFF02
71240+:1068D00003039025AD92000C8CAF0014240D200012
71241+:1068E0003C041000AD8F00048CAE001CAD8E00087F
71242+:1068F000A1800012A580001AAD800020A58000189C
71243+:10690000AD8D0014ACC401780A0003263C0680005B
71244+:106910008F9F0000351801402692000227F90008D9
71245+:1069200033281FFFA71200180A000391AF88000048
71246+:106930003C02800034450140ACA0000C1280001BDA
71247+:1069400034530E0034510E008E370010ACB70004E3
71248+:106950008E2400183C0B8000ACA400083570014068
71249+:1069600024040040A20000128FBF0048A600001AB5
71250+:106970008FB70044AE0000208FB60040A60000187C
71251+:106980008FB5003CAE0400148FB400388FB30034D0
71252+:106990008FB200308FB1002C8FB000283C02100065
71253+:1069A00027BD005003E00008AD6201788E66001438
71254+:1069B000ACA600048E64001C0A00042A3C0B800074
71255+:1069C0000E0001902E9100010A0003200237B0252D
71256+:1069D000000000000000000D00000000240003691A
71257+:1069E0000A0004013C06800027BDFFD8AFBF00208D
71258+:1069F0003C0980003C1F20FFAFB200183C0760003C
71259+:106A000035320E002402001037F9FFFDACE23008E9
71260+:106A1000AFB3001CAFB10014AFB00010AE5900000E
71261+:106A20000000000000000000000000000000000066
71262+:106A3000000000003C1800FF3713FFFDAE530000BC
71263+:106A40003C0B60048D7050002411FF7F3C0E00024F
71264+:106A50000211782435EC380C35CD0109ACED4C1819
71265+:106A6000240A0009AD6C50008CE80438AD2A0008F7
71266+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
71267+:106A800000051E023062000F2486C0B310400007CC
71268+:106A9000AF8200088CE54C1C3C09001F3528FC0027
71269+:106AA00000A81824000321C2AF8400048CF1080858
71270+:106AB0003C0F57092412F0000232702435F0001008
71271+:106AC00001D0602601CF68262DAA00012D8B000180
71272+:106AD000014B382550E00009A380000C3C1F601CCE
71273+:106AE0008FF8000824190001A399000C33137C00CF
71274+:106AF000A7930010A780000EA380000DAF80004870
71275+:106B000014C00003AF8000003C066000ACC0442C01
71276+:106B10000E0005B93C1080000E000F1A361101005E
71277+:106B20003C12080026523DD03C13080026733E500C
71278+:106B30008E03000038640001308200011440FFFC25
71279+:106B40003C0B800A8E2600002407FF8024C90240E7
71280+:106B5000312A007F014B402101272824AE06002066
71281+:106B6000AF880044AE0500243C048000AF86003CA2
71282+:106B70008C8C01780580FFFE24180800922F0008F5
71283+:106B8000AC980178A38F0042938E004231CD000172
71284+:106B900011A0000F24050D0024DFF8002FF90301D8
71285+:106BA0001320001C000629C224A4FFF00004104298
71286+:106BB000000231400E00020200D2D8213C02400007
71287+:106BC0003C068000ACC201380A0004A000000000AE
71288+:106BD00010C50023240D0F0010CD00273C1F800896
71289+:106BE00037F9008093380000240E0050330F00FF67
71290+:106BF00015EEFFF33C0240000E000A3600000000D4
71291+:106C00003C0240003C068000ACC201380A0004A0EF
71292+:106C1000000000008F83000400A3402B1500000B30
71293+:106C20008F8B0008006B50212547FFFF00E5482BA4
71294+:106C30001520000600A36023000C19400E0002027C
71295+:106C40000073D8210A0004C43C0240000000000D7B
71296+:106C50000E000202000000000A0004C43C024000D2
71297+:106C60003C1B0800277B3F500E0002020000000082
71298+:106C70000A0004C43C0240003C1B0800277B3F7014
71299+:106C80000E000202000000000A0004C43C024000A2
71300+:106C90003C0660043C09080025290104ACC9502CBD
71301+:106CA0008CC850003C0580003C0200023507008083
71302+:106CB000ACC750003C040800248415A43C03080021
71303+:106CC0002463155CACA50008ACA2000C3C010800D4
71304+:106CD000AC243D603C010800AC233D6403E00008A7
71305+:106CE0002402000100A030213C1C0800279C3D68C4
71306+:106CF0003C0C04003C0B0002008B3826008C402624
71307+:106D00002CE200010007502B2D050001000A4880ED
71308+:106D10003C03080024633D60004520250123182121
71309+:106D20001080000300001021AC6600002402000166
71310+:106D300003E00008000000003C1C0800279C3D68A0
71311+:106D40003C0B04003C0A0002008A3026008B3826E7
71312+:106D50002CC200010006482B2CE5000100094080F0
71313+:106D60003C03080024633D600045202501031821F1
71314+:106D700010800005000010213C0C0800258C155CDB
71315+:106D8000AC6C00002402000103E0000800000000D9
71316+:106D90003C0900023C08040000883026008938269F
71317+:106DA0002CC30001008028212CE400010083102561
71318+:106DB0001040000B000030213C1C0800279C3D685F
71319+:106DC0003C0A80008D4E00082406000101CA682597
71320+:106DD000AD4D00088D4C000C01855825AD4B000CC5
71321+:106DE00003E0000800C010213C1C0800279C3D68FF
71322+:106DF0003C0580008CA6000C000420272402000122
71323+:106E000000C4182403E00008ACA3000C3C020002FC
71324+:106E10001082000B3C0560003C0704001087000353
71325+:106E20000000000003E00008000000008CA908D06A
71326+:106E3000240AFFFD012A402403E00008ACA808D082
71327+:106E40008CA408D02406FFFE0086182403E0000866
71328+:106E5000ACA308D03C05601A34A600108CC3008097
71329+:106E600027BDFFF88CC50084AFA3000093A40000E9
71330+:106E70002402000110820003AFA5000403E0000813
71331+:106E800027BD000893A7000114E0001497AC00028E
71332+:106E900097B800023C0F8000330EFFFC01CF682141
71333+:106EA000ADA50000A3A000003C0660008CC708D080
71334+:106EB0002408FFFE3C04601A00E82824ACC508D072
71335+:106EC0008FA300048FA200003499001027BD000892
71336+:106ED000AF22008003E00008AF2300843C0B800059
71337+:106EE000318AFFFC014B48218D2800000A00057DF6
71338+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
71339+:106F0000279C3D683C0580008CA4000C8CA20004EA
71340+:106F10003C0300020044282410A0000A00A3182407
71341+:106F20003C0604003C0400021460000900A6102482
71342+:106F30001440000F3C0404000000000D3C1C08003D
71343+:106F4000279C3D688FBF001003E0000827BD001894
71344+:106F50003C0208008C423D600040F809000000003F
71345+:106F60003C1C0800279C3D680A0005A68FBF001046
71346+:106F70003C0208008C423D640040F809000000001B
71347+:106F80000A0005AC00000000000411C003E0000886
71348+:106F9000244202403C04080024843FB42405001A23
71349+:106FA0000A00009C0000302127BDFFE0AFB00010B8
71350+:106FB0003C108000AFBF0018AFB1001436110100C3
71351+:106FC000922200090E0005B63044007F8E3F00007B
71352+:106FD0008F89003C3C0F008003E26021258800403F
71353+:106FE0000049F821240DFF80310E00783198007897
71354+:106FF00035F9000135F100020319382501D1482582
71355+:10700000010D302403ED5824018D2824240A00406A
71356+:1070100024040080240300C0AE0B0024AE0008103E
71357+:10702000AE0A0814AE040818AE03081CAE05080426
71358+:10703000AE070820AE060808AE0908243609090084
71359+:107040009539000C3605098033ED007F3338FFFF9A
71360+:10705000001889C0AE110800AE0F0828952C000C4E
71361+:107060008FBF00188FB10014318BFFFF000B51C090
71362+:10707000AE0A002C8CA400508FB000108CA3003CF2
71363+:107080008D2700048CA8001C8CA600383C0E800ABA
71364+:1070900001AE102127BD0020AF820044AF84005014
71365+:1070A000AF830054AF87004CAF88005C03E000085A
71366+:1070B000AF8600603C09080091293FD924A800024E
71367+:1070C0003C05110000093C0000E8302500C51825EA
71368+:1070D00024820008AC83000003E00008AC800004B8
71369+:1070E0003C098000352309009128010B906A0011AA
71370+:1070F0002402002800804821314700FF00A07021B1
71371+:1071000000C068213108004010E20002340C86DD26
71372+:10711000240C08003C0A800035420A9A944700007B
71373+:10712000354B0A9C35460AA030F9FFFFAD39000007
71374+:107130008D780000354B0A8024040001AD3800042E
71375+:107140008CCF0000AD2F00089165001930A300031B
71376+:107150001064009028640002148000AF240500022F
71377+:107160001065009E240F0003106F00B435450AA47B
71378+:10717000240A0800118A0048000000005100003D68
71379+:107180003C0B80003C0480003483090090670012AF
71380+:1071900030E200FF004D7821000FC8802724000155
71381+:1071A0003C0A8000354F090091E50019354C0980F3
71382+:1071B0008D87002830A300FF0003150000475825E5
71383+:1071C0000004C4003C19600001793025370806FF2F
71384+:1071D000AD260000AD2800048DEA002C25280028EB
71385+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
71386+:1071F000AD2500108DE400383C05800034AC093C1E
71387+:10720000AD2400148DE3001CAD2300188DE7002091
71388+:10721000AD27001C8DE20024AD2200208DF900284E
71389+:1072200034A20100AD3900248D830000AD0E0004AE
71390+:1072300034B90900AD0300008C47000C250200148E
71391+:10724000AD070008932B00123C04080090843FD83F
71392+:10725000AD000010317800FF030D302100064F0013
71393+:1072600000047C00012F702535CDFFFC03E00008F1
71394+:10727000AD0D000C35780900930600123C0508009E
71395+:1072800094A53FC830C800FF010D5021000A60805E
71396+:107290000A00063C018520211500005B000000006B
71397+:1072A0003C08080095083FCE3C06080094C63FC83D
71398+:1072B000010610213C0B800035790900933800113C
71399+:1072C000932A001935660A80330800FF94CF002AFC
71400+:1072D00000086082314500FF978A0058000C1E00AC
71401+:1072E000000524003047FFFF006410250047C0253B
71402+:1072F00001EA30213C0B4000030B402500066400EE
71403+:10730000AD280000AD2C0004932500183C030006B6
71404+:107310002528001400053E0000E31025AD220008DA
71405+:107320008F24002C3C05800034AC093CAD24000CBB
71406+:107330008F38001C34A20100254F0001AD38001029
71407+:107340008D830000AD0E000431EB7FFFAD03000024
71408+:107350008C47000C34B90900A78B0058AD07000812
71409+:10736000932B00123C04080090843FD8250200149F
71410+:10737000317800FF030D302100064F0000047C002F
71411+:10738000012F702535CDFFFCAD00001003E0000893
71412+:10739000AD0D000C3C02080094423FD23C050800B1
71413+:1073A00094A53FC835440AA43C07080094E73FC4AD
71414+:1073B000948B00000045C8210327C023000B1C004C
71415+:1073C0002706FFF200665025AD2A000CAD20001004
71416+:1073D000AD2C00140A00063025290018354F0AA4E8
71417+:1073E00095E50000956400280005140000043C00A9
71418+:1073F0003459810000EC5825AD39000CAD2B00103C
71419+:107400000A000630252900143C0C0800958C3FCE5C
71420+:107410000A000681258200015460FF56240A0800F4
71421+:1074200035580AA49706000000061C00006C502581
71422+:10743000AD2A000C0A000630252900103C03080084
71423+:1074400094633FD23C07080094E73FC83C0F080014
71424+:1074500095EF3FC494A4000095790028006710219F
71425+:10746000004F582300041C00001934002578FFEE5B
71426+:1074700000D87825346A8100AD2A000CAD2F0010A9
71427+:10748000AD200014AD2C00180A0006302529001C80
71428+:1074900003E00008240207D027BDFFE0AFB20018C8
71429+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
71430+:1074B000008088218F8800548F87004C3C0580080D
71431+:1074C00034B20080011128213C1080002402008089
71432+:1074D000240300C000A72023AE0208183C06800841
71433+:1074E000AE03081C18800004AF850054ACC500042E
71434+:1074F0008CC90004AF89004C1220000936040980B1
71435+:107500000E0006F800000000924C00278E0B00745D
71436+:1075100001825004014B3021AE46000C3604098034
71437+:107520008C8E001C8F8F005C01CF682319A0000493
71438+:107530008FBF001C8C90001CAF90005C8FBF001CA4
71439+:107540008FB200188FB100148FB000100A00007EB7
71440+:1075500027BD00208F8600508F8300548F82004CFF
71441+:107560003C05800834A40080AC860050AC83003C0D
71442+:1075700003E00008ACA200043C0308008C63005444
71443+:1075800027BDFFF8308400FF2462000130A500FF12
71444+:107590003C010800AC22005430C600FF3C078000CC
71445+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
71446+:1075B0008FAA0000358BFFFF014B4824000627C02F
71447+:1075C00001244025AFA8000034E201009043000AE6
71448+:1075D000A3A000023C1980FFA3A300018FAF00000D
71449+:1075E00030AE007F3738FFFF01F86024000E6E00D8
71450+:1075F0003C0A002034E50140018D58253549200022
71451+:107600002406FF803C04100027BD0008ACAB000C32
71452+:10761000ACA90014A4A00018A0A6001203E0000862
71453+:10762000ACE40178308800FF30A700FF3C03800005
71454+:107630008C6201780440FFFE3C0C8000358A0A0011
71455+:107640008D4B00203584014035850980AC8B0004CA
71456+:107650008D4900240007302B00061540AC89000836
71457+:10766000A088001090A3004CA083002D03E0000828
71458+:10767000A480001827BDFFE8308400FFAFBF0010D2
71459+:107680000E00075D30A500FF8F8300548FBF0010F0
71460+:107690003C06800034C50140344700402404FF907C
71461+:1076A0003C02100027BD0018ACA3000CA0A40012DF
71462+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
71463+:1076C0003C088008AFBF001CAFB20018AFB1001477
71464+:1076D000AFB00010351000808E0600183C07800007
71465+:1076E000309200FF00C72025AE0400180E00007C79
71466+:1076F00030B100FF92030005346200080E00007EE6
71467+:10770000A2020005024020210E000771022028215C
71468+:10771000024020218FBF001C8FB200188FB10014CF
71469+:107720008FB0001024050005240600010A0007326E
71470+:1077300027BD00203C05800034A309809066000826
71471+:1077400030C200081040000F3C0A01013549080A08
71472+:10775000AC8900008CA80074AC8800043C070800C9
71473+:1077600090E73FD830E5001050A00008AC8000083A
71474+:107770003C0D800835AC00808D8B0058AC8B000828
71475+:107780002484000C03E00008008010210A0007B5E3
71476+:107790002484000C27BDFFE83C098000AFB0001036
71477+:1077A000AFBF00143526098090C8000924020006E6
71478+:1077B00000A05821310300FF3527090000808021F7
71479+:1077C000240500041062007B2408000294CF005CB2
71480+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
71481+:1077E00090CA00083144002010800008000000000A
71482+:1077F00090C2004E3C1F010337F90300305800FFD0
71483+:107800000319302524050008AE06000490F9001184
71484+:1078100090E6001290E40011333800FF00187082E7
71485+:1078200030CF00FF01CF5021014B6821308900FF8C
71486+:1078300031AAFFFF39230028000A60801460002C61
71487+:10784000020C482390E400123C198000372F0100FD
71488+:10785000308C00FF018B1821000310800045F821B7
71489+:10786000001F8400360706FFAD270004373F0900DC
71490+:1078700093EC001193EE0012372609800005C082B8
71491+:107880008DE4000C8CC5003431CD00FF01AB10211C
71492+:107890000058182100A4F8230008840000033F00CA
71493+:1078A00000F0302533F9FFFF318F00FC00D970253F
71494+:1078B0000158202101E9682100045080ADAE000C80
71495+:1078C0000E00007C012A80213C088008240B000463
71496+:1078D000350500800E00007EA0AB000902001021DB
71497+:1078E0008FBF00148FB0001003E0000827BD001800
71498+:1078F00090EC001190E300193C18080097183FCE57
71499+:10790000318200FF0002F882307000FF001FCE00BD
71500+:1079100000103C000327302500D870253C0F4000A4
71501+:1079200001CF68253C198000AD2D0000373F0900CC
71502+:1079300093EC001193EE0012372F010037260980D7
71503+:107940000005C0828DE4000C8CC5003431CD00FFF1
71504+:1079500001AB10210058182100A4F823000884006E
71505+:1079600000033F0000F0302533F9FFFF318F00FCAA
71506+:1079700000D970250158202101E9682100045080B8
71507+:10798000ADAE000C0E00007C012A80213C0880086E
71508+:10799000240B0004350500800E00007EA0AB00091A
71509+:1079A000020010218FBF00148FB0001003E0000808
71510+:1079B00027BD00180A0007C72408001227BDFFD002
71511+:1079C0003C038000AFB60028AFB50024AFB4002060
71512+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
71513+:1079E000AFB000103467010090E6000B309400FF48
71514+:1079F00030B500FF30C200300000B02110400099C7
71515+:107A000000008821346409809088000800082E0056
71516+:107A100000051E03046000C0240400048F86005487
71517+:107A20003C010800A0243FD83C0C8000AD800048F9
71518+:107A30003C048000348E010091CD000B31A5002064
71519+:107A400010A000073C078000349309809272000860
71520+:107A50000012860000107E0305E000C43C1F800871
71521+:107A600034EC0100918A000B34EB09809169000825
71522+:107A7000314400400004402B3123000800C8982303
71523+:107A80001460000224120003000090213C108000CA
71524+:107A900036180A8036040900970E002C90830011D6
71525+:107AA0009089001293050018307F00FF312800FFF5
71526+:107AB000024810210002C880930D0018033F78216E
71527+:107AC00001F1302130B100FF00D11821A78E0058FC
71528+:107AD0003C010800A4263FCE3C010800A4233FD06F
71529+:107AE00015A00002000000000000000D920B010B29
71530+:107AF0003065FFFF3C010800A4233FD2316A0040FB
71531+:107B00003C010800A4203FC83C010800A4203FC459
71532+:107B10001140000224A4000A24A4000B3091FFFFAE
71533+:107B20000E0001E7022020219206010B3C0C080008
71534+:107B3000958C3FD2004020210006698231A70001C8
71535+:107B40000E00060101872821004020210260282123
71536+:107B50000E00060C024030210E0007A1004020213B
71537+:107B600016C00069004020219212010B32560040DD
71538+:107B700012C000053C0500FF8C93000034AEFFFFEF
71539+:107B8000026E8024AC9000000E0001FB0220202138
71540+:107B90003C0F080091EF3FD831F10003122000168E
71541+:107BA0003C1380088F8200543C09800835280080EF
71542+:107BB000245F0001AD1F003C3C0580088CB9000427
71543+:107BC00003E02021033FC0231B000002AF9F0054AD
71544+:107BD0008CA400040E0006F8ACA400043C0780004E
71545+:107BE0008CEB00743C04800834830080004B5021EF
71546+:107BF000AC6A000C3C1380083670008002802021A3
71547+:107C000002A02821A200006B0E00075D3C1480003A
71548+:107C10008F920054368C0140AD92000C8F86004844
71549+:107C20003C151000344D000624D60001AF960048E4
71550+:107C30008FBF002CA18600128FB60028AD8D0014D6
71551+:107C40008FB3001CAE9501788FB200188FB5002459
71552+:107C50008FB400208FB100148FB0001003E0000833
71553+:107C600027BD003034640980908F0008000F760033
71554+:107C7000000E6E0305A00033347F090093F8001B4B
71555+:107C8000241900103C010800A0393FD8331300022A
71556+:107C90001260FF678F8600548F8200601446FF6574
71557+:107CA0003C0480000E00007C000000003C048008C2
71558+:107CB0003485008090A8000924060016310300FFD7
71559+:107CC0001066000D0000000090AB00093C070800A2
71560+:107CD00090E73FD824090008316400FF34EA00012E
71561+:107CE0003C010800A02A3FD81089002F240C000A6C
71562+:107CF000108C00282402000C0E00007E0000000002
71563+:107D00000A0008608F8600540E0007B9024028213F
71564+:107D10000A0008AE004020213C0B8008356A008034
71565+:107D20008D4600548CE9000C1120FF3DAF860054B5
71566+:107D3000240700143C010800A0273FD80A00085F70
71567+:107D40003C0C800090910008241200023C010800C5
71568+:107D5000A0323FD8323000201200000B2416000160
71569+:107D60008F8600540A0008602411000837F800804C
71570+:107D70008F020038AFE200048FF90004AF19003C15
71571+:107D80000A00086C3C0780008F8600540A000860D7
71572+:107D900024110004A0A200090E00007E00000000D3
71573+:107DA0000A0008608F860054240200140A00093A71
71574+:107DB000A0A2000927BDFFE8AFB000103C10800072
71575+:107DC000AFBF001436020100904400090E00075DA9
71576+:107DD000240500013C0480089099000E3483008043
71577+:107DE000909F000F906F00269089000A33F800FFE3
71578+:107DF00000196E000018740031EC00FF01AE502530
71579+:107E0000000C5A00014B3825312800FF3603014091
71580+:107E10003445600000E830252402FF813C04100056
71581+:107E2000AC66000C8FBF0014AC650014A062001299
71582+:107E3000AE0401788FB0001003E0000827BD0018E1
71583+:107E400027BDFFE8308400FFAFBF00100E00075DC4
71584+:107E500030A500FF3C05800034A4014034470040B9
71585+:107E60002406FF92AC870014A08600128F83005472
71586+:107E70008FBF00103C02100027BD0018AC83000C1F
71587+:107E800003E00008ACA2017827BDFFD8AFB0001016
71588+:107E9000308400FF30B000FF3C058000AFB100141B
71589+:107EA000AFBF0020AFB3001CAFB20018000410C277
71590+:107EB00034A60100320300023051000114600007B3
71591+:107EC00090D200093C098008353300809268000593
71592+:107ED0003107000810E0000C308A00100240202119
71593+:107EE0000E00078302202821240200018FBF0020FA
71594+:107EF0008FB3001C8FB200188FB100148FB0001028
71595+:107F000003E0000827BD00281540003434A50A000E
71596+:107F10008CB800248CAF0008130F004B00003821F0
71597+:107F20003C0D800835B30080926C00682406000286
71598+:107F3000318B00FF116600843C06800034C20100D2
71599+:107F40009263004C90590009307F00FF53F9000400
71600+:107F50003213007C10E00069000000003213007C46
71601+:107F60005660005C0240202116200009320D0001FD
71602+:107F70003C0C800035840100358B0A008D6500249F
71603+:107F80008C86000414A6FFD900001021320D0001D8
71604+:107F900011A0000E024020213C1880003710010083
71605+:107FA0008E0F000C8F8E005011EE000800000000B4
71606+:107FB0000E000843022028218E19000C3C1F800867
71607+:107FC00037F00080AE190050024020210E000771EA
71608+:107FD000022028210A00098F240200013C05080024
71609+:107FE0008CA5006424A400013C010800AC240064BA
71610+:107FF0001600000D00000000022028210E0007716D
71611+:1080000002402021926E0068240C000231CD00FF56
71612+:1080100011AC0022024020210E00094100000000A6
71613+:108020000A00098F240200010E00007024040001E0
71614+:10803000926B0025020B30250E00007EA266002503
71615+:108040000A0009D3022028218E6200188CDF000468
71616+:108050008CB9002400021E0217F9FFB13065007FC1
71617+:108060009268004C264400013093007F1265004066
71618+:10807000310300FF1464FFAB3C0D8008264700016C
71619+:1080800030F1007F30E200FF1225000B24070001D1
71620+:10809000004090210A00099C2411000124050004DD
71621+:1080A0000E000732240600010E0009410000000006
71622+:1080B0000A00098F240200012405FF8002452024C4
71623+:1080C00000859026324200FF004090210A00099C62
71624+:1080D000241100010E00084302202821320700303D
71625+:1080E00010E0FFA132100082024020210E00078321
71626+:1080F000022028210A00098F240200018E6900183D
71627+:108100000240202102202821012640250E0009647A
71628+:10811000AE6800189264004C240500032406000198
71629+:108120000E000732308400FF0E00007024040001AE
71630+:1081300092710025021150250E00007EA26A0025D2
71631+:108140000A00098F240200018E6F00183C1880007D
71632+:108150000240202101F87025022028210E0007711D
71633+:10816000AE6E00189264004C0A000A1B240500043D
71634+:10817000324A0080394900801469FF6A3C0D80084A
71635+:108180000A0009F42647000127BDFFC0AFB0001860
71636+:108190003C108000AFBF0038AFB70034AFB600303E
71637+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
71638+:1081B0000E0005BEAFB1001C360201009045000B59
71639+:1081C0000E00097690440008144000E78FBF003885
71640+:1081D0003C08800835070080A0E0006B3606098067
71641+:1081E00090C50000240300503C17080026F73F907C
71642+:1081F00030A400FF3C13080026733FA01083000347
71643+:108200003C1080000000B82100009821241F0010BD
71644+:108210003611010036120A00361509808E580024E6
71645+:108220008E3400048EAF00208F8C00543C01080077
71646+:10823000A03F3FD836190A80972B002C8EF60000FD
71647+:10824000932A00180298702301EC68233C0108006F
71648+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
71649+:10826000AC2C3FDCA78B005802C0F809315400FF4A
71650+:1082700030490002152000E930420001504000C49E
71651+:108280009227000992A90008312800081500000271
71652+:10829000241500030000A8213C0A80003543090092
71653+:1082A00035440A008C8D00249072001190700012E9
71654+:1082B000907F0011325900FF321100FF02B11021EE
71655+:1082C0000002C08033EF00FF0319B021028F70213C
71656+:1082D00002D4602125CB00103C010800A4363FCE1B
71657+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
71658+:1082F0003C010800A42B3FCC3556010035540980C1
71659+:1083000035510E008F8700548F89005C8E850020C8
71660+:1083100024080006012730233C010800AC283FD484
71661+:1083200000A7282304C000B50000902104A000B3DA
71662+:1083300000C5502B114000B5000000003C010800B2
71663+:10834000AC263FB88E6200000040F8090000000033
71664+:108350003046000214C0007400408021304B000100
71665+:10836000556000118E6200043C0D08008DAD3FBCCD
71666+:108370003C0EC0003C04800001AE6025AE2C000025
71667+:108380008C980000330F000811E0FFFD0000000092
71668+:10839000963F000824120001A79F00408E39000478
71669+:1083A000AF9900388E6200040040F8090000000018
71670+:1083B0000202802532030002146000B300000000B6
71671+:1083C0003C09080095293FC43C06080094C63FD0EC
71672+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
71673+:1083E000012670213C0308008C633FE03C08080034
71674+:1083F00095083FDA01CA20218ED9000C00E9282116
71675+:10840000249F000200A878210067C02133E4FFFF09
71676+:10841000AF9900503C010800AC383FE03C01080037
71677+:10842000A42F3FC83C010800A42E3FD20E0001E754
71678+:10843000000000008F8D0048004020213C01080012
71679+:10844000A02D3FD98E62000825AC0001AF8C0048FA
71680+:108450000040F809000000008F85005402A0302180
71681+:108460000E00060C004020210E0007A10040202134
71682+:108470008E6B000C0160F809004020213C0A0800C6
71683+:10848000954A3FD23C06080094C63FC601464821A3
71684+:10849000252800020E0001FB3104FFFF3C05080007
71685+:1084A0008CA53FB43C0708008CE73FBC00A7202305
71686+:1084B0003C010800AC243FB414800006000000001A
71687+:1084C0003C0208008C423FD4344B00403C01080081
71688+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
71689+:1084E0008F920044AE4D00208E2C0018AE4C00241C
71690+:1084F0003C04080094843FC80E0006FA0000000007
71691+:108500008F9F00548E6700103C010800AC3F3FDC99
71692+:1085100000E0F809000000003C1908008F393FB462
71693+:108520001720FF798F870054979300583C11800ED5
71694+:10853000321601000E000729A633002C16C0004594
71695+:10854000320300105460004C8EE5000432080040F5
71696+:108550005500001D8EF000088EE4000C0080F80924
71697+:10856000000000008FBF00388FB700348FB6003096
71698+:108570008FB5002C8FB400288FB300248FB2002059
71699+:108580008FB1001C8FB0001803E0000827BD004029
71700+:108590008F86003C36110E0000072E0000A6202515
71701+:1085A000AE0400808E4300208E500024AFA3001044
71702+:1085B000AE2300148FB20010AE320010AE30001C9B
71703+:1085C0000A000A75AE3000180200F8090000000029
71704+:1085D0008EE4000C0080F809000000000A000B2E59
71705+:1085E0008FBF003824180001240F0001A5C000200F
71706+:1085F000A5D800220A000B10ADCF00243C010800D2
71707+:10860000AC203FB80A000AA68E6200003C010800B8
71708+:10861000AC253FB80A000AA68E6200009224000929
71709+:108620000E000771000028218FBF00388FB700347B
71710+:108630008FB600308FB5002C8FB400288FB3002484
71711+:108640008FB200208FB1001C8FB0001803E000082B
71712+:1086500027BD00403C1480009295010900002821AC
71713+:108660000E00084332A400FF320300105060FFB830
71714+:10867000320800408EE5000400A0F8090000000068
71715+:108680000A000B28320800405240FFA89793005878
71716+:108690008E3400148F930044AE7400208E35001C7D
71717+:1086A000AE7500240A000B1F979300588F820014A8
71718+:1086B0000004218003E00008008210213C078008AC
71719+:1086C00034E200809043006900804021106000097E
71720+:1086D0003C0401003C0708008CE73FDC8F8300303E
71721+:1086E00000E32023048000089389001C14E30003A6
71722+:1086F0000100202103E00008008010213C0401005B
71723+:1087000003E00008008010211120000B00673823CF
71724+:108710003C0D800035AC0980918B007C316A0002F1
71725+:10872000114000202409003400E9702B15C0FFF12E
71726+:108730000100202100E938232403FFFC00A3C82402
71727+:1087400000E3C02400F9782B15E0FFEA030820219C
71728+:1087500030C400030004102314C000143049000387
71729+:108760000000302100A9782101E6702100EE682B7D
71730+:1087700011A0FFE03C0401002D3800010006C82BC9
71731+:10878000010548210319382414E0FFDA2524FFFCF1
71732+:108790002402FFFC00A218240068202103E0000846
71733+:1087A000008010210A000B9E240900303C0C800040
71734+:1087B0003586098090CB007C316A00041540FFE9C2
71735+:1087C000240600040A000BAD000030213C03080021
71736+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
71737+:1087E000AFB1001410620005AFB00010000329C043
71738+:1087F00024A40280AF840014AF8300183C108000D2
71739+:1088000036020A0094450032361101000E000B7F3B
71740+:1088100030A43FFF8E240000241FFF803C11008005
71741+:108820000082C021031F60243309007F000CC9406F
71742+:1088300003294025330E0078362F00033C0D10002D
71743+:10884000010D502501CF5825AE0C002836080980AF
71744+:10885000AE0C080CAE0B082CAE0A08309103006970
71745+:108860003C06800C0126382110600006AF870034DA
71746+:108870008D09003C8D03006C0123382318E0008231
71747+:10888000000000003C0B8008356A00803C1080002E
71748+:10889000A1400069360609808CC200383C06800081
71749+:1088A00034C50A0090A8003C310C00201180001A49
71750+:1088B000AF820030240D00013C0E800035D10A004B
71751+:1088C000A38D001CAF8000248E2400248F850024FB
71752+:1088D000240D0008AF800020AF8000283C01080074
71753+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
71754+:1088F000000030219228003C8FBF00188FB1001477
71755+:108900008FB0001000086142AF82002C27BD00200C
71756+:1089100003E000083182000190B80032240E00010B
71757+:10892000330F00FF000F2182108E00412419000236
71758+:108930001099006434C40AC03C03800034640A0007
71759+:108940008C8F002415E0001E34660900909F0030D3
71760+:108950002418000533F9003F1338004E24030001AA
71761+:108960008F860020A383001CAF860028AF860024DA
71762+:108970003C0E800035D10A008E2400248F8500240F
71763+:10898000240D00083C010800A42D3FC63C0108004E
71764+:10899000A4203FDA0E000B83000000009228003C68
71765+:1089A0008FBF00188FB100148FB000100008614213
71766+:1089B000AF82002C27BD002003E0000831820001B7
71767+:1089C0008C8A00088C8B00248CD000643C0E8000C4
71768+:1089D00035D10A00014B2823AF900024A380001C4E
71769+:1089E000AF8500288E2400248F8600208F850024E8
71770+:1089F000240D00083C010800A42D3FC63C010800DE
71771+:108A0000A4203FDA0E000B83000000009228003CF7
71772+:108A10008FBF00188FB100148FB0001000086142A2
71773+:108A2000AF82002C27BD002003E000083182000146
71774+:108A300090A200303051003F5224002834C50AC0B3
71775+:108A40008CB000241600002234CB09008CA600480C
71776+:108A50003C0A7FFF3545FFFF00C510243C0E800017
71777+:108A6000AF82002035C509008F8800208CAD0060E2
71778+:108A7000010D602B15800002010020218CA40060F4
71779+:108A80000A000C22AF8400208D02006C0A000BFC4F
71780+:108A90003C0680008C8200488F8600203C097FFFC6
71781+:108AA0003527FFFF004788243C0480082403000189
71782+:108AB000AF910028AC80006CA383001C0A000C302E
71783+:108AC000AF8600248C9F00140A000C22AF9F002068
71784+:108AD0008D6200680A000C6C3C0E800034C4098072
71785+:108AE0008C8900708CA300140123382B10E0000443
71786+:108AF000000000008C8200700A000C6C3C0E8000AC
71787+:108B00008CA200140A000C6C3C0E80008F8500249F
71788+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
71789+:108B2000AFB000103C04800034870A0090E60030AB
71790+:108B30002402000530C3003F106200B934840900EC
71791+:108B40008F91002000A080213C048000348E0A0018
71792+:108B50008DCD00043C0608008CC63FB831A73FFF0E
71793+:108B600000E6602B5580000100E03021938F001C4F
71794+:108B700011E0007800D0282B349F098093F9007C05
71795+:108B800033380002130000792403003400C3102B93
71796+:108B9000144000D90000000000C3302300D0282B6F
71797+:108BA0003C010800A4233FC414A0006E0200182159
71798+:108BB0003C0408008C843FB40064402B5500000145
71799+:108BC000006020213C05800034A90A00912A003C65
71800+:108BD0003C010800AC243FBC31430020146000037A
71801+:108BE0000000482134AB0E008D6900188F88002CDE
71802+:108BF0000128202B1080005F000000003C050800C9
71803+:108C00008CA53FBC00A96821010D602B1180005C80
71804+:108C100000B0702B0109382300E028213C01080036
71805+:108C2000AC273FBC12000003240AFFFC10B0008DEB
71806+:108C30003224000300AA18243C010800A4203FDAD3
71807+:108C40003C010800AC233FBC006028218F84002435
71808+:108C5000120400063C0B80088D6C006C0200202181
71809+:108C6000AF91002025900001AD70006C8F8D002821
71810+:108C700000858823AF91002401A52023AF8400281C
71811+:108C80001220000224070018240700103C18800856
71812+:108C90003706008090CF00683C010800A0273FD82D
71813+:108CA0002407000131EE00FF11C70047000000005B
71814+:108CB00014800018000028213C06800034D109806F
71815+:108CC00034CD010091A600098E2C001824C40001A7
71816+:108CD000000C86023205007F308B007F1165007F1B
71817+:108CE0002407FF803C19800837290080A124004C0C
71818+:108CF0003C0808008D083FD4241800023C010800FD
71819+:108D0000A0384019350F00083C010800AC2F3FD4B3
71820+:108D1000240500103C02800034440A009083003C8B
71821+:108D2000307F002013E0000500A02021240A00016C
71822+:108D30003C010800AC2A3FBC34A400018FBF0018DE
71823+:108D40008FB100148FB000100080102103E00008E4
71824+:108D500027BD00203C010800A4203FC410A0FF94C0
71825+:108D6000020018210A000CC000C018210A000CB72C
71826+:108D7000240300303C0508008CA53FBC00B0702BDC
71827+:108D800011C0FFA8000000003C19080097393FC43B
71828+:108D90000325C0210307782B11E000072CAA00044B
71829+:108DA0003C0360008C625404305F003F17E0FFE337
71830+:108DB000240400422CAA00041140FF9A240400421B
71831+:108DC0000A000D248FBF00181528FFB9000000000D
71832+:108DD0008CCA00183C1F800024020002015F182585
71833+:108DE000ACC3001837F90A00A0C200689329003C00
71834+:108DF0002404000400A01021312800203C010800B8
71835+:108E0000A0244019110000022405001024020001D2
71836+:108E10003C010800AC223FB40A000D1A3C0280005D
71837+:108E20008F8800288C8900600109282B14A000027B
71838+:108E3000010088218C9100603C048000348B0E007E
71839+:108E40008D640018240A000102202821022030210C
71840+:108E5000A38A001C0E000B83022080210A000CA6AE
71841+:108E6000AF82002C00045823122000073164000355
71842+:108E70003C0E800035C7098090ED007C31AC0004C9
71843+:108E800015800019248F00043C010800A4243FDA57
71844+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
71845+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
71846+:108EB0002404004230A200031440000200A2182340
71847+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
71848+:108ED000A4203FDA0A000CE70060282100C77024B4
71849+:108EE0000A000D0D01C720263C010800A42F3FDA1F
71850+:108EF0000A000D78000000003C010800AC203FBCD7
71851+:108F00000A000D23240400428F8300283C058000C2
71852+:108F100034AA0A00146000060000102191470030B6
71853+:108F20002406000530E400FF108600030000000066
71854+:108F300003E0000800000000914B0048316900FF89
71855+:108F4000000941C21500FFFA3C0680083C040800F5
71856+:108F500094843FC43C0308008C633FDC3C19080048
71857+:108F60008F393FBC3C0F080095EF3FDA0064C02109
71858+:108F70008CCD00040319702101CF602134AB0E00A9
71859+:108F8000018D282318A0001D00000000914F004C07
71860+:108F90008F8C0034956D001031EE00FF8D89000438
71861+:108FA00001AE30238D8A000030CEFFFF000E290075
71862+:108FB0000125C82100003821014720210325182B55
71863+:108FC0000083C021AD990004AD980000918F000A84
71864+:108FD00001CF6821A18D000A956500128F8A0034A7
71865+:108FE000A5450008954B003825690001A5490038C2
71866+:108FF0009148000D35070008A147000D03E0000867
71867+:109000000000000027BDFFD8AFB000189388001CF7
71868+:109010008FB000143C0A80003C197FFF8F8700242A
71869+:109020003738FFFFAFBF0020AFB1001C355F0A002B
71870+:109030000218182493EB003C00087FC03C02BFFFDD
71871+:10904000006F60252CF000013449FFFF3C1F080031
71872+:109050008FFF3FDC8F9900303C18080097183FD2F3
71873+:1090600001897824001047803C07EFFF3C05F0FFA2
71874+:1090700001E818253C1180003169002034E2FFFF2F
71875+:1090800034ADFFFF362E098027A50010240600020C
71876+:1090900003F96023270B0002354A0E0000621824F2
71877+:1090A0000080802115200002000040218D48001C16
71878+:1090B000A7AB0012058000392407000030E800FF4C
71879+:1090C00000083F00006758253C028008AFAB001441
71880+:1090D000344F008091EA00683C08080091083FD9AD
71881+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
71882+:1090F00094423FCCA3A80011016CC024001FCF40B4
71883+:10910000031918258FA70010AFA300143C0C08000A
71884+:10911000918C3FDBA7A200168FAB001400ED482412
71885+:109120003C0F01003C0A0FFF012FC82531980003B6
71886+:10913000355FFFFF016D40243C027000033F38247F
71887+:1091400000181E0000E2482501037825AFAF001487
71888+:10915000AFA9001091CC007C0E000092A3AC0015CA
71889+:10916000362D0A0091A6003C30C400201080000675
71890+:10917000260200083C11080096313FC8262EFFFF4A
71891+:109180003C010800A42E3FC88FBF00208FB1001CF7
71892+:109190008FB0001803E0000827BD00288F8B002C3B
71893+:1091A000010B502B5540FFC5240700010A000E0497
71894+:1091B00030E800FF9383001C3C02800027BDFFD8ED
71895+:1091C00034480A0000805021AFBF002034460AC056
71896+:1091D000010028211060000E3444098091070030FE
71897+:1091E000240B00058F89002030EC003F118B000B11
71898+:1091F00000003821AFA900103C0B80088D69006C7D
71899+:10920000AFAA00180E00015AAFA90014A380001CD9
71900+:109210008FBF002003E0000827BD00288D1F0048F5
71901+:109220003C1808008F183FBC8F9900283C027FFF34
71902+:109230008D0800443443FFFFAFA900103C0B8008A9
71903+:109240008D69006C03E370240319782101CF682332
71904+:1092500001A83821AFAA00180E00015AAFA90014C6
71905+:109260000A000E58A380001C3C05800034A60A00AA
71906+:1092700090C7003C3C06080094C63FDA3C02080058
71907+:109280008C423FD430E30020000624001060001E12
71908+:10929000004438253C0880083505008090A300680C
71909+:1092A00000004821240800010000282124040001B6
71910+:1092B0003C0680008CCD017805A0FFFE34CF014034
71911+:1092C000ADE800083C0208008C423FDCA5E5000444
71912+:1092D000A5E40006ADE2000C3C04080090843FD9F0
71913+:1092E0003C03800834790080A1E40012ADE700144B
71914+:1092F000A5E900189338004C3C0E1000A1F8002D91
71915+:1093000003E00008ACCE017834A90E008D28001CC3
71916+:109310003C0C08008D8C3FBC952B0016952A001440
71917+:10932000018648213164FFFF0A000E803145FFFFAE
71918+:109330003C04800034830A009065003C30A2002089
71919+:109340001040001934870E00000040210000382131
71920+:10935000000020213C0680008CC901780520FFFE1A
71921+:1093600034CA014034CF010091EB0009AD48000838
71922+:109370003C0E08008DCE3FDC240DFF91240C0040F4
71923+:109380003C081000A5440004A5470006AD4E000CA3
71924+:10939000A14D0012AD4C0014A5400018A14B002DAA
71925+:1093A00003E00008ACC801788CE8001894E60012CD
71926+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
71927+:1093C0003C04800034830A009065003C30A20020F9
71928+:1093D0001040002727BDFFF82409000100003821B4
71929+:1093E000240800013C0680008CCA01780540FFFE7D
71930+:1093F0003C0280FF34C40100908D00093C0C080041
71931+:10940000918C4019A3AD00038FAB00003185007F24
71932+:109410003459FFFF01665025AFAA00009083000A6F
71933+:10942000A3A0000200057E00A3A300018FB80000E6
71934+:1094300034CB0140240C30000319702401CF68257F
71935+:10944000AD6D000C27BD0008AD6C0014A5600018C0
71936+:10945000AD690008A56700042409FF80A56800061F
71937+:109460003C081000A169001203E00008ACC80178B4
71938+:1094700034870E008CE9001894E6001294E4001082
71939+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
71940+:10949000AFB100143C118000AFB00010AFBF001896
71941+:1094A00036380A00970F0032363001000E000B7F6D
71942+:1094B00031E43FFF8E0E0000240DFF803C042000AD
71943+:1094C00001C25821016D6024000C4940316A007FBF
71944+:1094D000012A4025010438253C048008AE270830C5
71945+:1094E0003486008090C500682403000230A200FF8B
71946+:1094F000104300048F9F00208F990024AC9F0068C8
71947+:10950000AC9900648FBF00188FB100148FB00010A9
71948+:1095100003E0000827BD00203C0A0800254A3A80E5
71949+:109520003C09080025293B103C08080025082F1C91
71950+:109530003C07080024E73BDC3C06080024C639044D
71951+:109540003C05080024A536583C0408002484325CFD
71952+:109550003C030800246339B83C0208002442375415
71953+:109560003C010800AC2A3F983C010800AC293F941C
71954+:109570003C010800AC283F903C010800AC273F9C10
71955+:109580003C010800AC263FAC3C010800AC253FA4E0
71956+:109590003C010800AC243FA03C010800AC233FB0D4
71957+:1095A0003C010800AC223FA803E0000800000000D6
71958+:1095B00080000940800009008008010080080080C8
71959+:1095C00080080000800E00008008008080080000F5
71960+:1095D00080000A8080000A00800009808000090065
71961+:00000001FF
71962diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
71963index 53f1e8a..2b96b597 100644
71964--- a/fs/9p/vfs_inode.c
71965+++ b/fs/9p/vfs_inode.c
71966@@ -1311,7 +1311,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
71967 void
71968 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
71969 {
71970- char *s = nd_get_link(nd);
71971+ const char *s = nd_get_link(nd);
71972
71973 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
71974 dentry, IS_ERR(s) ? "<error>" : s);
71975diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
71976index 2d0cbbd..a6d6149 100644
71977--- a/fs/Kconfig.binfmt
71978+++ b/fs/Kconfig.binfmt
71979@@ -103,7 +103,7 @@ config HAVE_AOUT
71980
71981 config BINFMT_AOUT
71982 tristate "Kernel support for a.out and ECOFF binaries"
71983- depends on HAVE_AOUT
71984+ depends on HAVE_AOUT && BROKEN
71985 ---help---
71986 A.out (Assembler.OUTput) is a set of formats for libraries and
71987 executables used in the earliest versions of UNIX. Linux used
71988diff --git a/fs/afs/inode.c b/fs/afs/inode.c
71989index e06f5a2..81d07ac 100644
71990--- a/fs/afs/inode.c
71991+++ b/fs/afs/inode.c
71992@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
71993 struct afs_vnode *vnode;
71994 struct super_block *sb;
71995 struct inode *inode;
71996- static atomic_t afs_autocell_ino;
71997+ static atomic_unchecked_t afs_autocell_ino;
71998
71999 _enter("{%x:%u},%*.*s,",
72000 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
72001@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
72002 data.fid.unique = 0;
72003 data.fid.vnode = 0;
72004
72005- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
72006+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
72007 afs_iget5_autocell_test, afs_iget5_set,
72008 &data);
72009 if (!inode) {
72010diff --git a/fs/aio.c b/fs/aio.c
72011index 480440f..623fd88 100644
72012--- a/fs/aio.c
72013+++ b/fs/aio.c
72014@@ -441,7 +441,7 @@ static int aio_setup_ring(struct kioctx *ctx)
72015 size += sizeof(struct io_event) * nr_events;
72016
72017 nr_pages = PFN_UP(size);
72018- if (nr_pages < 0)
72019+ if (nr_pages <= 0)
72020 return -EINVAL;
72021
72022 file = aio_private_file(ctx, nr_pages);
72023diff --git a/fs/attr.c b/fs/attr.c
72024index 6530ced..4a827e2 100644
72025--- a/fs/attr.c
72026+++ b/fs/attr.c
72027@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
72028 unsigned long limit;
72029
72030 limit = rlimit(RLIMIT_FSIZE);
72031+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
72032 if (limit != RLIM_INFINITY && offset > limit)
72033 goto out_sig;
72034 if (offset > inode->i_sb->s_maxbytes)
72035diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
72036index 35b755e..f4b9e0a 100644
72037--- a/fs/autofs4/waitq.c
72038+++ b/fs/autofs4/waitq.c
72039@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
72040 {
72041 unsigned long sigpipe, flags;
72042 mm_segment_t fs;
72043- const char *data = (const char *)addr;
72044+ const char __user *data = (const char __force_user *)addr;
72045 ssize_t wr = 0;
72046
72047 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
72048@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
72049 return 1;
72050 }
72051
72052+#ifdef CONFIG_GRKERNSEC_HIDESYM
72053+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
72054+#endif
72055+
72056 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72057 enum autofs_notify notify)
72058 {
72059@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72060
72061 /* If this is a direct mount request create a dummy name */
72062 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
72063+#ifdef CONFIG_GRKERNSEC_HIDESYM
72064+ /* this name does get written to userland via autofs4_write() */
72065+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
72066+#else
72067 qstr.len = sprintf(name, "%p", dentry);
72068+#endif
72069 else {
72070 qstr.len = autofs4_getpath(sbi, dentry, &name);
72071 if (!qstr.len) {
72072diff --git a/fs/befs/endian.h b/fs/befs/endian.h
72073index 2722387..56059b5 100644
72074--- a/fs/befs/endian.h
72075+++ b/fs/befs/endian.h
72076@@ -11,7 +11,7 @@
72077
72078 #include <asm/byteorder.h>
72079
72080-static inline u64
72081+static inline u64 __intentional_overflow(-1)
72082 fs64_to_cpu(const struct super_block *sb, fs64 n)
72083 {
72084 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72085@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
72086 return (__force fs64)cpu_to_be64(n);
72087 }
72088
72089-static inline u32
72090+static inline u32 __intentional_overflow(-1)
72091 fs32_to_cpu(const struct super_block *sb, fs32 n)
72092 {
72093 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72094@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
72095 return (__force fs32)cpu_to_be32(n);
72096 }
72097
72098-static inline u16
72099+static inline u16 __intentional_overflow(-1)
72100 fs16_to_cpu(const struct super_block *sb, fs16 n)
72101 {
72102 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72103diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
72104index 4c55668..eeae150 100644
72105--- a/fs/binfmt_aout.c
72106+++ b/fs/binfmt_aout.c
72107@@ -16,6 +16,7 @@
72108 #include <linux/string.h>
72109 #include <linux/fs.h>
72110 #include <linux/file.h>
72111+#include <linux/security.h>
72112 #include <linux/stat.h>
72113 #include <linux/fcntl.h>
72114 #include <linux/ptrace.h>
72115@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
72116 #endif
72117 # define START_STACK(u) ((void __user *)u.start_stack)
72118
72119+ memset(&dump, 0, sizeof(dump));
72120+
72121 fs = get_fs();
72122 set_fs(KERNEL_DS);
72123 has_dumped = 1;
72124@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
72125
72126 /* If the size of the dump file exceeds the rlimit, then see what would happen
72127 if we wrote the stack, but not the data area. */
72128+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
72129 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
72130 dump.u_dsize = 0;
72131
72132 /* Make sure we have enough room to write the stack and data areas. */
72133+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
72134 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
72135 dump.u_ssize = 0;
72136
72137@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
72138 rlim = rlimit(RLIMIT_DATA);
72139 if (rlim >= RLIM_INFINITY)
72140 rlim = ~0;
72141+
72142+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
72143 if (ex.a_data + ex.a_bss > rlim)
72144 return -ENOMEM;
72145
72146@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
72147
72148 install_exec_creds(bprm);
72149
72150+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72151+ current->mm->pax_flags = 0UL;
72152+#endif
72153+
72154+#ifdef CONFIG_PAX_PAGEEXEC
72155+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
72156+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
72157+
72158+#ifdef CONFIG_PAX_EMUTRAMP
72159+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
72160+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
72161+#endif
72162+
72163+#ifdef CONFIG_PAX_MPROTECT
72164+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
72165+ current->mm->pax_flags |= MF_PAX_MPROTECT;
72166+#endif
72167+
72168+ }
72169+#endif
72170+
72171 if (N_MAGIC(ex) == OMAGIC) {
72172 unsigned long text_addr, map_size;
72173 loff_t pos;
72174@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
72175 return error;
72176
72177 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
72178- PROT_READ | PROT_WRITE | PROT_EXEC,
72179+ PROT_READ | PROT_WRITE,
72180 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
72181 fd_offset + ex.a_text);
72182 if (error != N_DATADDR(ex))
72183diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
72184index cd46e41..244f778 100644
72185--- a/fs/binfmt_elf.c
72186+++ b/fs/binfmt_elf.c
72187@@ -35,6 +35,7 @@
72188 #include <linux/utsname.h>
72189 #include <linux/coredump.h>
72190 #include <linux/sched.h>
72191+#include <linux/xattr.h>
72192 #include <asm/uaccess.h>
72193 #include <asm/param.h>
72194 #include <asm/page.h>
72195@@ -48,7 +49,7 @@
72196
72197 static int load_elf_binary(struct linux_binprm *bprm);
72198 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
72199- int, int, unsigned long);
72200+ int, int, unsigned long) __intentional_overflow(-1);
72201
72202 #ifdef CONFIG_USELIB
72203 static int load_elf_library(struct file *);
72204@@ -66,6 +67,14 @@ static int elf_core_dump(struct coredump_params *cprm);
72205 #define elf_core_dump NULL
72206 #endif
72207
72208+#ifdef CONFIG_PAX_MPROTECT
72209+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
72210+#endif
72211+
72212+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72213+static void elf_handle_mmap(struct file *file);
72214+#endif
72215+
72216 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
72217 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
72218 #else
72219@@ -85,6 +94,15 @@ static struct linux_binfmt elf_format = {
72220 .load_binary = load_elf_binary,
72221 .load_shlib = load_elf_library,
72222 .core_dump = elf_core_dump,
72223+
72224+#ifdef CONFIG_PAX_MPROTECT
72225+ .handle_mprotect= elf_handle_mprotect,
72226+#endif
72227+
72228+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72229+ .handle_mmap = elf_handle_mmap,
72230+#endif
72231+
72232 .min_coredump = ELF_EXEC_PAGESIZE,
72233 };
72234
72235@@ -92,6 +110,8 @@ static struct linux_binfmt elf_format = {
72236
72237 static int set_brk(unsigned long start, unsigned long end)
72238 {
72239+ unsigned long e = end;
72240+
72241 start = ELF_PAGEALIGN(start);
72242 end = ELF_PAGEALIGN(end);
72243 if (end > start) {
72244@@ -100,7 +120,7 @@ static int set_brk(unsigned long start, unsigned long end)
72245 if (BAD_ADDR(addr))
72246 return addr;
72247 }
72248- current->mm->start_brk = current->mm->brk = end;
72249+ current->mm->start_brk = current->mm->brk = e;
72250 return 0;
72251 }
72252
72253@@ -161,12 +181,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72254 elf_addr_t __user *u_rand_bytes;
72255 const char *k_platform = ELF_PLATFORM;
72256 const char *k_base_platform = ELF_BASE_PLATFORM;
72257- unsigned char k_rand_bytes[16];
72258+ u32 k_rand_bytes[4];
72259 int items;
72260 elf_addr_t *elf_info;
72261 int ei_index = 0;
72262 const struct cred *cred = current_cred();
72263 struct vm_area_struct *vma;
72264+ unsigned long saved_auxv[AT_VECTOR_SIZE];
72265
72266 /*
72267 * In some cases (e.g. Hyper-Threading), we want to avoid L1
72268@@ -208,8 +229,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72269 * Generate 16 random bytes for userspace PRNG seeding.
72270 */
72271 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
72272- u_rand_bytes = (elf_addr_t __user *)
72273- STACK_ALLOC(p, sizeof(k_rand_bytes));
72274+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
72275+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
72276+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
72277+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
72278+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
72279+ u_rand_bytes = (elf_addr_t __user *) p;
72280 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
72281 return -EFAULT;
72282
72283@@ -324,9 +349,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72284 return -EFAULT;
72285 current->mm->env_end = p;
72286
72287+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
72288+
72289 /* Put the elf_info on the stack in the right place. */
72290 sp = (elf_addr_t __user *)envp + 1;
72291- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
72292+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
72293 return -EFAULT;
72294 return 0;
72295 }
72296@@ -515,14 +542,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
72297 an ELF header */
72298
72299 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72300- struct file *interpreter, unsigned long *interp_map_addr,
72301+ struct file *interpreter,
72302 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
72303 {
72304 struct elf_phdr *eppnt;
72305- unsigned long load_addr = 0;
72306+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
72307 int load_addr_set = 0;
72308 unsigned long last_bss = 0, elf_bss = 0;
72309- unsigned long error = ~0UL;
72310+ unsigned long error = -EINVAL;
72311 unsigned long total_size;
72312 int i;
72313
72314@@ -542,6 +569,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72315 goto out;
72316 }
72317
72318+#ifdef CONFIG_PAX_SEGMEXEC
72319+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
72320+ pax_task_size = SEGMEXEC_TASK_SIZE;
72321+#endif
72322+
72323 eppnt = interp_elf_phdata;
72324 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
72325 if (eppnt->p_type == PT_LOAD) {
72326@@ -565,8 +597,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72327 map_addr = elf_map(interpreter, load_addr + vaddr,
72328 eppnt, elf_prot, elf_type, total_size);
72329 total_size = 0;
72330- if (!*interp_map_addr)
72331- *interp_map_addr = map_addr;
72332 error = map_addr;
72333 if (BAD_ADDR(map_addr))
72334 goto out;
72335@@ -585,8 +615,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72336 k = load_addr + eppnt->p_vaddr;
72337 if (BAD_ADDR(k) ||
72338 eppnt->p_filesz > eppnt->p_memsz ||
72339- eppnt->p_memsz > TASK_SIZE ||
72340- TASK_SIZE - eppnt->p_memsz < k) {
72341+ eppnt->p_memsz > pax_task_size ||
72342+ pax_task_size - eppnt->p_memsz < k) {
72343 error = -ENOMEM;
72344 goto out;
72345 }
72346@@ -625,9 +655,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72347 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
72348
72349 /* Map the last of the bss segment */
72350- error = vm_brk(elf_bss, last_bss - elf_bss);
72351- if (BAD_ADDR(error))
72352- goto out;
72353+ if (last_bss > elf_bss) {
72354+ error = vm_brk(elf_bss, last_bss - elf_bss);
72355+ if (BAD_ADDR(error))
72356+ goto out;
72357+ }
72358 }
72359
72360 error = load_addr;
72361@@ -635,6 +667,336 @@ out:
72362 return error;
72363 }
72364
72365+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72366+#ifdef CONFIG_PAX_SOFTMODE
72367+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
72368+{
72369+ unsigned long pax_flags = 0UL;
72370+
72371+#ifdef CONFIG_PAX_PAGEEXEC
72372+ if (elf_phdata->p_flags & PF_PAGEEXEC)
72373+ pax_flags |= MF_PAX_PAGEEXEC;
72374+#endif
72375+
72376+#ifdef CONFIG_PAX_SEGMEXEC
72377+ if (elf_phdata->p_flags & PF_SEGMEXEC)
72378+ pax_flags |= MF_PAX_SEGMEXEC;
72379+#endif
72380+
72381+#ifdef CONFIG_PAX_EMUTRAMP
72382+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72383+ pax_flags |= MF_PAX_EMUTRAMP;
72384+#endif
72385+
72386+#ifdef CONFIG_PAX_MPROTECT
72387+ if (elf_phdata->p_flags & PF_MPROTECT)
72388+ pax_flags |= MF_PAX_MPROTECT;
72389+#endif
72390+
72391+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72392+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
72393+ pax_flags |= MF_PAX_RANDMMAP;
72394+#endif
72395+
72396+ return pax_flags;
72397+}
72398+#endif
72399+
72400+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
72401+{
72402+ unsigned long pax_flags = 0UL;
72403+
72404+#ifdef CONFIG_PAX_PAGEEXEC
72405+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
72406+ pax_flags |= MF_PAX_PAGEEXEC;
72407+#endif
72408+
72409+#ifdef CONFIG_PAX_SEGMEXEC
72410+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
72411+ pax_flags |= MF_PAX_SEGMEXEC;
72412+#endif
72413+
72414+#ifdef CONFIG_PAX_EMUTRAMP
72415+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
72416+ pax_flags |= MF_PAX_EMUTRAMP;
72417+#endif
72418+
72419+#ifdef CONFIG_PAX_MPROTECT
72420+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
72421+ pax_flags |= MF_PAX_MPROTECT;
72422+#endif
72423+
72424+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72425+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
72426+ pax_flags |= MF_PAX_RANDMMAP;
72427+#endif
72428+
72429+ return pax_flags;
72430+}
72431+#endif
72432+
72433+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72434+#ifdef CONFIG_PAX_SOFTMODE
72435+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
72436+{
72437+ unsigned long pax_flags = 0UL;
72438+
72439+#ifdef CONFIG_PAX_PAGEEXEC
72440+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
72441+ pax_flags |= MF_PAX_PAGEEXEC;
72442+#endif
72443+
72444+#ifdef CONFIG_PAX_SEGMEXEC
72445+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
72446+ pax_flags |= MF_PAX_SEGMEXEC;
72447+#endif
72448+
72449+#ifdef CONFIG_PAX_EMUTRAMP
72450+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72451+ pax_flags |= MF_PAX_EMUTRAMP;
72452+#endif
72453+
72454+#ifdef CONFIG_PAX_MPROTECT
72455+ if (pax_flags_softmode & MF_PAX_MPROTECT)
72456+ pax_flags |= MF_PAX_MPROTECT;
72457+#endif
72458+
72459+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72460+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
72461+ pax_flags |= MF_PAX_RANDMMAP;
72462+#endif
72463+
72464+ return pax_flags;
72465+}
72466+#endif
72467+
72468+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
72469+{
72470+ unsigned long pax_flags = 0UL;
72471+
72472+#ifdef CONFIG_PAX_PAGEEXEC
72473+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
72474+ pax_flags |= MF_PAX_PAGEEXEC;
72475+#endif
72476+
72477+#ifdef CONFIG_PAX_SEGMEXEC
72478+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
72479+ pax_flags |= MF_PAX_SEGMEXEC;
72480+#endif
72481+
72482+#ifdef CONFIG_PAX_EMUTRAMP
72483+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
72484+ pax_flags |= MF_PAX_EMUTRAMP;
72485+#endif
72486+
72487+#ifdef CONFIG_PAX_MPROTECT
72488+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
72489+ pax_flags |= MF_PAX_MPROTECT;
72490+#endif
72491+
72492+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72493+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
72494+ pax_flags |= MF_PAX_RANDMMAP;
72495+#endif
72496+
72497+ return pax_flags;
72498+}
72499+#endif
72500+
72501+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72502+static unsigned long pax_parse_defaults(void)
72503+{
72504+ unsigned long pax_flags = 0UL;
72505+
72506+#ifdef CONFIG_PAX_SOFTMODE
72507+ if (pax_softmode)
72508+ return pax_flags;
72509+#endif
72510+
72511+#ifdef CONFIG_PAX_PAGEEXEC
72512+ pax_flags |= MF_PAX_PAGEEXEC;
72513+#endif
72514+
72515+#ifdef CONFIG_PAX_SEGMEXEC
72516+ pax_flags |= MF_PAX_SEGMEXEC;
72517+#endif
72518+
72519+#ifdef CONFIG_PAX_MPROTECT
72520+ pax_flags |= MF_PAX_MPROTECT;
72521+#endif
72522+
72523+#ifdef CONFIG_PAX_RANDMMAP
72524+ if (randomize_va_space)
72525+ pax_flags |= MF_PAX_RANDMMAP;
72526+#endif
72527+
72528+ return pax_flags;
72529+}
72530+
72531+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
72532+{
72533+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
72534+
72535+#ifdef CONFIG_PAX_EI_PAX
72536+
72537+#ifdef CONFIG_PAX_SOFTMODE
72538+ if (pax_softmode)
72539+ return pax_flags;
72540+#endif
72541+
72542+ pax_flags = 0UL;
72543+
72544+#ifdef CONFIG_PAX_PAGEEXEC
72545+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
72546+ pax_flags |= MF_PAX_PAGEEXEC;
72547+#endif
72548+
72549+#ifdef CONFIG_PAX_SEGMEXEC
72550+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
72551+ pax_flags |= MF_PAX_SEGMEXEC;
72552+#endif
72553+
72554+#ifdef CONFIG_PAX_EMUTRAMP
72555+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
72556+ pax_flags |= MF_PAX_EMUTRAMP;
72557+#endif
72558+
72559+#ifdef CONFIG_PAX_MPROTECT
72560+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
72561+ pax_flags |= MF_PAX_MPROTECT;
72562+#endif
72563+
72564+#ifdef CONFIG_PAX_ASLR
72565+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
72566+ pax_flags |= MF_PAX_RANDMMAP;
72567+#endif
72568+
72569+#endif
72570+
72571+ return pax_flags;
72572+
72573+}
72574+
72575+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
72576+{
72577+
72578+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72579+ unsigned long i;
72580+
72581+ for (i = 0UL; i < elf_ex->e_phnum; i++)
72582+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
72583+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
72584+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
72585+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
72586+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
72587+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
72588+ return PAX_PARSE_FLAGS_FALLBACK;
72589+
72590+#ifdef CONFIG_PAX_SOFTMODE
72591+ if (pax_softmode)
72592+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
72593+ else
72594+#endif
72595+
72596+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
72597+ break;
72598+ }
72599+#endif
72600+
72601+ return PAX_PARSE_FLAGS_FALLBACK;
72602+}
72603+
72604+static unsigned long pax_parse_xattr_pax(struct file * const file)
72605+{
72606+
72607+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72608+ ssize_t xattr_size, i;
72609+ unsigned char xattr_value[sizeof("pemrs") - 1];
72610+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
72611+
72612+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
72613+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
72614+ return PAX_PARSE_FLAGS_FALLBACK;
72615+
72616+ for (i = 0; i < xattr_size; i++)
72617+ switch (xattr_value[i]) {
72618+ default:
72619+ return PAX_PARSE_FLAGS_FALLBACK;
72620+
72621+#define parse_flag(option1, option2, flag) \
72622+ case option1: \
72623+ if (pax_flags_hardmode & MF_PAX_##flag) \
72624+ return PAX_PARSE_FLAGS_FALLBACK;\
72625+ pax_flags_hardmode |= MF_PAX_##flag; \
72626+ break; \
72627+ case option2: \
72628+ if (pax_flags_softmode & MF_PAX_##flag) \
72629+ return PAX_PARSE_FLAGS_FALLBACK;\
72630+ pax_flags_softmode |= MF_PAX_##flag; \
72631+ break;
72632+
72633+ parse_flag('p', 'P', PAGEEXEC);
72634+ parse_flag('e', 'E', EMUTRAMP);
72635+ parse_flag('m', 'M', MPROTECT);
72636+ parse_flag('r', 'R', RANDMMAP);
72637+ parse_flag('s', 'S', SEGMEXEC);
72638+
72639+#undef parse_flag
72640+ }
72641+
72642+ if (pax_flags_hardmode & pax_flags_softmode)
72643+ return PAX_PARSE_FLAGS_FALLBACK;
72644+
72645+#ifdef CONFIG_PAX_SOFTMODE
72646+ if (pax_softmode)
72647+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
72648+ else
72649+#endif
72650+
72651+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
72652+#else
72653+ return PAX_PARSE_FLAGS_FALLBACK;
72654+#endif
72655+
72656+}
72657+
72658+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
72659+{
72660+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
72661+
72662+ pax_flags = pax_parse_defaults();
72663+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
72664+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
72665+ xattr_pax_flags = pax_parse_xattr_pax(file);
72666+
72667+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
72668+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
72669+ pt_pax_flags != xattr_pax_flags)
72670+ return -EINVAL;
72671+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72672+ pax_flags = xattr_pax_flags;
72673+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72674+ pax_flags = pt_pax_flags;
72675+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72676+ pax_flags = ei_pax_flags;
72677+
72678+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
72679+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72680+ if ((__supported_pte_mask & _PAGE_NX))
72681+ pax_flags &= ~MF_PAX_SEGMEXEC;
72682+ else
72683+ pax_flags &= ~MF_PAX_PAGEEXEC;
72684+ }
72685+#endif
72686+
72687+ if (0 > pax_check_flags(&pax_flags))
72688+ return -EINVAL;
72689+
72690+ current->mm->pax_flags = pax_flags;
72691+ return 0;
72692+}
72693+#endif
72694+
72695 /*
72696 * These are the functions used to load ELF style executables and shared
72697 * libraries. There is no binary dependent code anywhere else.
72698@@ -648,6 +1010,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
72699 {
72700 unsigned long random_variable = 0;
72701
72702+#ifdef CONFIG_PAX_RANDUSTACK
72703+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
72704+ return stack_top - current->mm->delta_stack;
72705+#endif
72706+
72707 if ((current->flags & PF_RANDOMIZE) &&
72708 !(current->personality & ADDR_NO_RANDOMIZE)) {
72709 random_variable = (unsigned long) get_random_int();
72710@@ -667,7 +1034,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72711 unsigned long load_addr = 0, load_bias = 0;
72712 int load_addr_set = 0;
72713 char * elf_interpreter = NULL;
72714- unsigned long error;
72715+ unsigned long error = 0;
72716 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
72717 unsigned long elf_bss, elf_brk;
72718 int retval, i;
72719@@ -682,6 +1049,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72720 struct elfhdr interp_elf_ex;
72721 } *loc;
72722 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
72723+ unsigned long pax_task_size;
72724
72725 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
72726 if (!loc) {
72727@@ -840,6 +1208,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
72728 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
72729 may depend on the personality. */
72730 SET_PERSONALITY2(loc->elf_ex, &arch_state);
72731+
72732+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72733+ current->mm->pax_flags = 0UL;
72734+#endif
72735+
72736+#ifdef CONFIG_PAX_DLRESOLVE
72737+ current->mm->call_dl_resolve = 0UL;
72738+#endif
72739+
72740+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
72741+ current->mm->call_syscall = 0UL;
72742+#endif
72743+
72744+#ifdef CONFIG_PAX_ASLR
72745+ current->mm->delta_mmap = 0UL;
72746+ current->mm->delta_stack = 0UL;
72747+#endif
72748+
72749+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72750+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
72751+ send_sig(SIGKILL, current, 0);
72752+ goto out_free_dentry;
72753+ }
72754+#endif
72755+
72756+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
72757+ pax_set_initial_flags(bprm);
72758+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
72759+ if (pax_set_initial_flags_func)
72760+ (pax_set_initial_flags_func)(bprm);
72761+#endif
72762+
72763+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
72764+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
72765+ current->mm->context.user_cs_limit = PAGE_SIZE;
72766+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
72767+ }
72768+#endif
72769+
72770+#ifdef CONFIG_PAX_SEGMEXEC
72771+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
72772+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
72773+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
72774+ pax_task_size = SEGMEXEC_TASK_SIZE;
72775+ current->mm->def_flags |= VM_NOHUGEPAGE;
72776+ } else
72777+#endif
72778+
72779+ pax_task_size = TASK_SIZE;
72780+
72781+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
72782+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72783+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
72784+ put_cpu();
72785+ }
72786+#endif
72787+
72788+#ifdef CONFIG_PAX_ASLR
72789+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
72790+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
72791+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
72792+ }
72793+#endif
72794+
72795+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
72796+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72797+ executable_stack = EXSTACK_DISABLE_X;
72798+ current->personality &= ~READ_IMPLIES_EXEC;
72799+ } else
72800+#endif
72801+
72802 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
72803 current->personality |= READ_IMPLIES_EXEC;
72804
72805@@ -915,8 +1354,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
72806 if (current->flags & PF_RANDOMIZE)
72807 load_bias += arch_mmap_rnd();
72808 load_bias = ELF_PAGESTART(load_bias);
72809- total_size = total_mapping_size(elf_phdata,
72810- loc->elf_ex.e_phnum);
72811+
72812+#ifdef CONFIG_PAX_RANDMMAP
72813+ /* PaX: randomize base address at the default exe base if requested */
72814+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
72815+#ifdef CONFIG_SPARC64
72816+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
72817+#else
72818+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
72819+#endif
72820+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
72821+ elf_flags |= MAP_FIXED;
72822+ }
72823+#endif
72824+
72825+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
72826 if (!total_size) {
72827 retval = -EINVAL;
72828 goto out_free_dentry;
72829@@ -952,9 +1404,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
72830 * allowed task size. Note that p_filesz must always be
72831 * <= p_memsz so it is only necessary to check p_memsz.
72832 */
72833- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
72834- elf_ppnt->p_memsz > TASK_SIZE ||
72835- TASK_SIZE - elf_ppnt->p_memsz < k) {
72836+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
72837+ elf_ppnt->p_memsz > pax_task_size ||
72838+ pax_task_size - elf_ppnt->p_memsz < k) {
72839 /* set_brk can never work. Avoid overflows. */
72840 retval = -EINVAL;
72841 goto out_free_dentry;
72842@@ -990,16 +1442,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
72843 if (retval)
72844 goto out_free_dentry;
72845 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
72846- retval = -EFAULT; /* Nobody gets to see this, but.. */
72847- goto out_free_dentry;
72848+ /*
72849+ * This bss-zeroing can fail if the ELF
72850+ * file specifies odd protections. So
72851+ * we don't check the return value
72852+ */
72853 }
72854
72855+#ifdef CONFIG_PAX_RANDMMAP
72856+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
72857+ unsigned long start, size, flags;
72858+ vm_flags_t vm_flags;
72859+
72860+ start = ELF_PAGEALIGN(elf_brk);
72861+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
72862+ flags = MAP_FIXED | MAP_PRIVATE;
72863+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
72864+
72865+ down_write(&current->mm->mmap_sem);
72866+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
72867+ retval = -ENOMEM;
72868+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
72869+// if (current->personality & ADDR_NO_RANDOMIZE)
72870+// vm_flags |= VM_READ | VM_MAYREAD;
72871+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
72872+ retval = IS_ERR_VALUE(start) ? start : 0;
72873+ }
72874+ up_write(&current->mm->mmap_sem);
72875+ if (retval == 0)
72876+ retval = set_brk(start + size, start + size + PAGE_SIZE);
72877+ if (retval < 0)
72878+ goto out_free_dentry;
72879+ }
72880+#endif
72881+
72882 if (elf_interpreter) {
72883- unsigned long interp_map_addr = 0;
72884-
72885 elf_entry = load_elf_interp(&loc->interp_elf_ex,
72886 interpreter,
72887- &interp_map_addr,
72888 load_bias, interp_elf_phdata);
72889 if (!IS_ERR((void *)elf_entry)) {
72890 /*
72891@@ -1050,6 +1529,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72892 current->mm->end_data = end_data;
72893 current->mm->start_stack = bprm->p;
72894
72895+#ifndef CONFIG_PAX_RANDMMAP
72896 if ((current->flags & PF_RANDOMIZE) && (randomize_va_space > 1)) {
72897 current->mm->brk = current->mm->start_brk =
72898 arch_randomize_brk(current->mm);
72899@@ -1057,6 +1537,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72900 current->brk_randomized = 1;
72901 #endif
72902 }
72903+#endif
72904
72905 if (current->personality & MMAP_PAGE_ZERO) {
72906 /* Why this, you ask??? Well SVr4 maps page 0 as read-only,
72907@@ -1225,7 +1706,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
72908 * Decide what to dump of a segment, part, all or none.
72909 */
72910 static unsigned long vma_dump_size(struct vm_area_struct *vma,
72911- unsigned long mm_flags)
72912+ unsigned long mm_flags, long signr)
72913 {
72914 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
72915
72916@@ -1263,7 +1744,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
72917 if (vma->vm_file == NULL)
72918 return 0;
72919
72920- if (FILTER(MAPPED_PRIVATE))
72921+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
72922 goto whole;
72923
72924 /*
72925@@ -1470,9 +1951,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
72926 {
72927 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
72928 int i = 0;
72929- do
72930+ do {
72931 i += 2;
72932- while (auxv[i - 2] != AT_NULL);
72933+ } while (auxv[i - 2] != AT_NULL);
72934 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
72935 }
72936
72937@@ -1481,7 +1962,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
72938 {
72939 mm_segment_t old_fs = get_fs();
72940 set_fs(KERNEL_DS);
72941- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
72942+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
72943 set_fs(old_fs);
72944 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
72945 }
72946@@ -2201,7 +2682,7 @@ static int elf_core_dump(struct coredump_params *cprm)
72947 vma = next_vma(vma, gate_vma)) {
72948 unsigned long dump_size;
72949
72950- dump_size = vma_dump_size(vma, cprm->mm_flags);
72951+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
72952 vma_filesz[i++] = dump_size;
72953 vma_data_size += dump_size;
72954 }
72955@@ -2309,6 +2790,167 @@ out:
72956
72957 #endif /* CONFIG_ELF_CORE */
72958
72959+#ifdef CONFIG_PAX_MPROTECT
72960+/* PaX: non-PIC ELF libraries need relocations on their executable segments
72961+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
72962+ * we'll remove VM_MAYWRITE for good on RELRO segments.
72963+ *
72964+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
72965+ * basis because we want to allow the common case and not the special ones.
72966+ */
72967+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
72968+{
72969+ struct elfhdr elf_h;
72970+ struct elf_phdr elf_p;
72971+ unsigned long i;
72972+ unsigned long oldflags;
72973+ bool is_textrel_rw, is_textrel_rx, is_relro;
72974+
72975+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
72976+ return;
72977+
72978+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
72979+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
72980+
72981+#ifdef CONFIG_PAX_ELFRELOCS
72982+ /* possible TEXTREL */
72983+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
72984+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
72985+#else
72986+ is_textrel_rw = false;
72987+ is_textrel_rx = false;
72988+#endif
72989+
72990+ /* possible RELRO */
72991+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
72992+
72993+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
72994+ return;
72995+
72996+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
72997+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
72998+
72999+#ifdef CONFIG_PAX_ETEXECRELOCS
73000+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
73001+#else
73002+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
73003+#endif
73004+
73005+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
73006+ !elf_check_arch(&elf_h) ||
73007+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
73008+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
73009+ return;
73010+
73011+ for (i = 0UL; i < elf_h.e_phnum; i++) {
73012+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
73013+ return;
73014+ switch (elf_p.p_type) {
73015+ case PT_DYNAMIC:
73016+ if (!is_textrel_rw && !is_textrel_rx)
73017+ continue;
73018+ i = 0UL;
73019+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
73020+ elf_dyn dyn;
73021+
73022+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
73023+ break;
73024+ if (dyn.d_tag == DT_NULL)
73025+ break;
73026+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
73027+ gr_log_textrel(vma);
73028+ if (is_textrel_rw)
73029+ vma->vm_flags |= VM_MAYWRITE;
73030+ else
73031+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
73032+ vma->vm_flags &= ~VM_MAYWRITE;
73033+ break;
73034+ }
73035+ i++;
73036+ }
73037+ is_textrel_rw = false;
73038+ is_textrel_rx = false;
73039+ continue;
73040+
73041+ case PT_GNU_RELRO:
73042+ if (!is_relro)
73043+ continue;
73044+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
73045+ vma->vm_flags &= ~VM_MAYWRITE;
73046+ is_relro = false;
73047+ continue;
73048+
73049+#ifdef CONFIG_PAX_PT_PAX_FLAGS
73050+ case PT_PAX_FLAGS: {
73051+ const char *msg_mprotect = "", *msg_emutramp = "";
73052+ char *buffer_lib, *buffer_exe;
73053+
73054+ if (elf_p.p_flags & PF_NOMPROTECT)
73055+ msg_mprotect = "MPROTECT disabled";
73056+
73057+#ifdef CONFIG_PAX_EMUTRAMP
73058+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
73059+ msg_emutramp = "EMUTRAMP enabled";
73060+#endif
73061+
73062+ if (!msg_mprotect[0] && !msg_emutramp[0])
73063+ continue;
73064+
73065+ if (!printk_ratelimit())
73066+ continue;
73067+
73068+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
73069+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
73070+ if (buffer_lib && buffer_exe) {
73071+ char *path_lib, *path_exe;
73072+
73073+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
73074+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
73075+
73076+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
73077+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
73078+
73079+ }
73080+ free_page((unsigned long)buffer_exe);
73081+ free_page((unsigned long)buffer_lib);
73082+ continue;
73083+ }
73084+#endif
73085+
73086+ }
73087+ }
73088+}
73089+#endif
73090+
73091+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
73092+
73093+extern int grsec_enable_log_rwxmaps;
73094+
73095+static void elf_handle_mmap(struct file *file)
73096+{
73097+ struct elfhdr elf_h;
73098+ struct elf_phdr elf_p;
73099+ unsigned long i;
73100+
73101+ if (!grsec_enable_log_rwxmaps)
73102+ return;
73103+
73104+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
73105+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
73106+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
73107+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
73108+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
73109+ return;
73110+
73111+ for (i = 0UL; i < elf_h.e_phnum; i++) {
73112+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
73113+ return;
73114+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
73115+ gr_log_ptgnustack(file);
73116+ }
73117+}
73118+#endif
73119+
73120 static int __init init_elf_binfmt(void)
73121 {
73122 register_binfmt(&elf_format);
73123diff --git a/fs/block_dev.c b/fs/block_dev.c
73124index c7e4163..6939003 100644
73125--- a/fs/block_dev.c
73126+++ b/fs/block_dev.c
73127@@ -732,7 +732,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
73128 else if (bdev->bd_contains == bdev)
73129 return true; /* is a whole device which isn't held */
73130
73131- else if (whole->bd_holder == bd_may_claim)
73132+ else if (whole->bd_holder == (void *)bd_may_claim)
73133 return true; /* is a partition of a device that is being partitioned */
73134 else if (whole->bd_holder != NULL)
73135 return false; /* is a partition of a held device */
73136diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
73137index 0f11ebc..1bf3321 100644
73138--- a/fs/btrfs/ctree.c
73139+++ b/fs/btrfs/ctree.c
73140@@ -1180,9 +1180,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
73141 free_extent_buffer(buf);
73142 add_root_to_dirty_list(root);
73143 } else {
73144- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
73145- parent_start = parent->start;
73146- else
73147+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
73148+ if (parent)
73149+ parent_start = parent->start;
73150+ else
73151+ parent_start = 0;
73152+ } else
73153 parent_start = 0;
73154
73155 WARN_ON(trans->transid != btrfs_header_generation(parent));
73156diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
73157index a2ae427..53c2e98 100644
73158--- a/fs/btrfs/delayed-inode.c
73159+++ b/fs/btrfs/delayed-inode.c
73160@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
73161
73162 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
73163 {
73164- int seq = atomic_inc_return(&delayed_root->items_seq);
73165+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
73166 if ((atomic_dec_return(&delayed_root->items) <
73167 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
73168 waitqueue_active(&delayed_root->wait))
73169@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
73170
73171 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
73172 {
73173- int val = atomic_read(&delayed_root->items_seq);
73174+ int val = atomic_read_unchecked(&delayed_root->items_seq);
73175
73176 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
73177 return 1;
73178@@ -1437,7 +1437,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
73179 int seq;
73180 int ret;
73181
73182- seq = atomic_read(&delayed_root->items_seq);
73183+ seq = atomic_read_unchecked(&delayed_root->items_seq);
73184
73185 ret = btrfs_wq_run_delayed_node(delayed_root, fs_info, 0);
73186 if (ret)
73187diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
73188index f70119f..ab5894d 100644
73189--- a/fs/btrfs/delayed-inode.h
73190+++ b/fs/btrfs/delayed-inode.h
73191@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
73192 */
73193 struct list_head prepare_list;
73194 atomic_t items; /* for delayed items */
73195- atomic_t items_seq; /* for delayed items */
73196+ atomic_unchecked_t items_seq; /* for delayed items */
73197 int nodes; /* for delayed nodes */
73198 wait_queue_head_t wait;
73199 };
73200@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
73201 struct btrfs_delayed_root *delayed_root)
73202 {
73203 atomic_set(&delayed_root->items, 0);
73204- atomic_set(&delayed_root->items_seq, 0);
73205+ atomic_set_unchecked(&delayed_root->items_seq, 0);
73206 delayed_root->nodes = 0;
73207 spin_lock_init(&delayed_root->lock);
73208 init_waitqueue_head(&delayed_root->wait);
73209diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
73210index 9e66f5e..f7caaf0 100644
73211--- a/fs/btrfs/super.c
73212+++ b/fs/btrfs/super.c
73213@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
73214 function, line, errstr);
73215 return;
73216 }
73217- ACCESS_ONCE(trans->transaction->aborted) = errno;
73218+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
73219 /* Wake up anybody who may be waiting on this transaction */
73220 wake_up(&root->fs_info->transaction_wait);
73221 wake_up(&root->fs_info->transaction_blocked_wait);
73222diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
73223index e8a4c86..f8c22ae 100644
73224--- a/fs/btrfs/sysfs.c
73225+++ b/fs/btrfs/sysfs.c
73226@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
73227 for (set = 0; set < FEAT_MAX; set++) {
73228 int i;
73229 struct attribute *attrs[2];
73230- struct attribute_group agroup = {
73231+ attribute_group_no_const agroup = {
73232 .name = "features",
73233 .attrs = attrs,
73234 };
73235diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
73236index 2299bfd..4098e72 100644
73237--- a/fs/btrfs/tests/free-space-tests.c
73238+++ b/fs/btrfs/tests/free-space-tests.c
73239@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73240 * extent entry.
73241 */
73242 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
73243- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73244+ pax_open_kernel();
73245+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73246+ pax_close_kernel();
73247
73248 /*
73249 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
73250@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73251 if (ret)
73252 return ret;
73253
73254- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73255+ pax_open_kernel();
73256+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73257+ pax_close_kernel();
73258 __btrfs_remove_free_space_cache(cache->free_space_ctl);
73259
73260 return 0;
73261diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
73262index 6916a78..4598936 100644
73263--- a/fs/btrfs/tree-log.h
73264+++ b/fs/btrfs/tree-log.h
73265@@ -45,7 +45,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
73266 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
73267 struct btrfs_trans_handle *trans)
73268 {
73269- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
73270+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
73271 }
73272
73273 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
73274diff --git a/fs/buffer.c b/fs/buffer.c
73275index c7a5602..18eabd1 100644
73276--- a/fs/buffer.c
73277+++ b/fs/buffer.c
73278@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
73279 bh_cachep = kmem_cache_create("buffer_head",
73280 sizeof(struct buffer_head), 0,
73281 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
73282- SLAB_MEM_SPREAD),
73283+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
73284 NULL);
73285
73286 /*
73287diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
73288index 6af790f..ec4c1e6 100644
73289--- a/fs/cachefiles/bind.c
73290+++ b/fs/cachefiles/bind.c
73291@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
73292 args);
73293
73294 /* start by checking things over */
73295- ASSERT(cache->fstop_percent >= 0 &&
73296- cache->fstop_percent < cache->fcull_percent &&
73297+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
73298 cache->fcull_percent < cache->frun_percent &&
73299 cache->frun_percent < 100);
73300
73301- ASSERT(cache->bstop_percent >= 0 &&
73302- cache->bstop_percent < cache->bcull_percent &&
73303+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
73304 cache->bcull_percent < cache->brun_percent &&
73305 cache->brun_percent < 100);
73306
73307diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
73308index f601def..b2cf704 100644
73309--- a/fs/cachefiles/daemon.c
73310+++ b/fs/cachefiles/daemon.c
73311@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
73312 if (n > buflen)
73313 return -EMSGSIZE;
73314
73315- if (copy_to_user(_buffer, buffer, n) != 0)
73316+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
73317 return -EFAULT;
73318
73319 return n;
73320@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
73321 if (test_bit(CACHEFILES_DEAD, &cache->flags))
73322 return -EIO;
73323
73324- if (datalen < 0 || datalen > PAGE_SIZE - 1)
73325+ if (datalen > PAGE_SIZE - 1)
73326 return -EOPNOTSUPP;
73327
73328 /* drag the command string into the kernel so we can parse it */
73329@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
73330 if (args[0] != '%' || args[1] != '\0')
73331 return -EINVAL;
73332
73333- if (fstop < 0 || fstop >= cache->fcull_percent)
73334+ if (fstop >= cache->fcull_percent)
73335 return cachefiles_daemon_range_error(cache, args);
73336
73337 cache->fstop_percent = fstop;
73338@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
73339 if (args[0] != '%' || args[1] != '\0')
73340 return -EINVAL;
73341
73342- if (bstop < 0 || bstop >= cache->bcull_percent)
73343+ if (bstop >= cache->bcull_percent)
73344 return cachefiles_daemon_range_error(cache, args);
73345
73346 cache->bstop_percent = bstop;
73347diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
73348index 8c52472..c4e3a69 100644
73349--- a/fs/cachefiles/internal.h
73350+++ b/fs/cachefiles/internal.h
73351@@ -66,7 +66,7 @@ struct cachefiles_cache {
73352 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
73353 struct rb_root active_nodes; /* active nodes (can't be culled) */
73354 rwlock_t active_lock; /* lock for active_nodes */
73355- atomic_t gravecounter; /* graveyard uniquifier */
73356+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
73357 unsigned frun_percent; /* when to stop culling (% files) */
73358 unsigned fcull_percent; /* when to start culling (% files) */
73359 unsigned fstop_percent; /* when to stop allocating (% files) */
73360@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
73361 * proc.c
73362 */
73363 #ifdef CONFIG_CACHEFILES_HISTOGRAM
73364-extern atomic_t cachefiles_lookup_histogram[HZ];
73365-extern atomic_t cachefiles_mkdir_histogram[HZ];
73366-extern atomic_t cachefiles_create_histogram[HZ];
73367+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73368+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73369+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
73370
73371 extern int __init cachefiles_proc_init(void);
73372 extern void cachefiles_proc_cleanup(void);
73373 static inline
73374-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
73375+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
73376 {
73377 unsigned long jif = jiffies - start_jif;
73378 if (jif >= HZ)
73379 jif = HZ - 1;
73380- atomic_inc(&histogram[jif]);
73381+ atomic_inc_unchecked(&histogram[jif]);
73382 }
73383
73384 #else
73385diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
73386index ab857ab..ff8d593 100644
73387--- a/fs/cachefiles/namei.c
73388+++ b/fs/cachefiles/namei.c
73389@@ -309,7 +309,7 @@ try_again:
73390 /* first step is to make up a grave dentry in the graveyard */
73391 sprintf(nbuffer, "%08x%08x",
73392 (uint32_t) get_seconds(),
73393- (uint32_t) atomic_inc_return(&cache->gravecounter));
73394+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
73395
73396 /* do the multiway lock magic */
73397 trap = lock_rename(cache->graveyard, dir);
73398diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
73399index eccd339..4c1d995 100644
73400--- a/fs/cachefiles/proc.c
73401+++ b/fs/cachefiles/proc.c
73402@@ -14,9 +14,9 @@
73403 #include <linux/seq_file.h>
73404 #include "internal.h"
73405
73406-atomic_t cachefiles_lookup_histogram[HZ];
73407-atomic_t cachefiles_mkdir_histogram[HZ];
73408-atomic_t cachefiles_create_histogram[HZ];
73409+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73410+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73411+atomic_unchecked_t cachefiles_create_histogram[HZ];
73412
73413 /*
73414 * display the latency histogram
73415@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
73416 return 0;
73417 default:
73418 index = (unsigned long) v - 3;
73419- x = atomic_read(&cachefiles_lookup_histogram[index]);
73420- y = atomic_read(&cachefiles_mkdir_histogram[index]);
73421- z = atomic_read(&cachefiles_create_histogram[index]);
73422+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
73423+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
73424+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
73425 if (x == 0 && y == 0 && z == 0)
73426 return 0;
73427
73428diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
73429index 4248307..f41e44e 100644
73430--- a/fs/ceph/dir.c
73431+++ b/fs/ceph/dir.c
73432@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
73433 struct dentry *dentry, *last;
73434 struct ceph_dentry_info *di;
73435 int err = 0;
73436+ char d_name[DNAME_INLINE_LEN];
73437+ const unsigned char *name;
73438
73439 /* claim ref on last dentry we returned */
73440 last = fi->dentry;
73441@@ -190,7 +192,12 @@ more:
73442
73443 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
73444 dentry, dentry, d_inode(dentry));
73445- if (!dir_emit(ctx, dentry->d_name.name,
73446+ name = dentry->d_name.name;
73447+ if (name == dentry->d_iname) {
73448+ memcpy(d_name, name, dentry->d_name.len);
73449+ name = d_name;
73450+ }
73451+ if (!dir_emit(ctx, name,
73452 dentry->d_name.len,
73453 ceph_translate_ino(dentry->d_sb, d_inode(dentry)->i_ino),
73454 d_inode(dentry)->i_mode >> 12)) {
73455@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
73456 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
73457 struct ceph_mds_client *mdsc = fsc->mdsc;
73458 unsigned frag = fpos_frag(ctx->pos);
73459- int off = fpos_off(ctx->pos);
73460+ unsigned int off = fpos_off(ctx->pos);
73461 int err;
73462 u32 ftype;
73463 struct ceph_mds_reply_info_parsed *rinfo;
73464diff --git a/fs/ceph/super.c b/fs/ceph/super.c
73465index 4e99053..a7e2a5f 100644
73466--- a/fs/ceph/super.c
73467+++ b/fs/ceph/super.c
73468@@ -885,7 +885,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
73469 /*
73470 * construct our own bdi so we can control readahead, etc.
73471 */
73472-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
73473+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
73474
73475 static int ceph_register_bdi(struct super_block *sb,
73476 struct ceph_fs_client *fsc)
73477@@ -902,7 +902,7 @@ static int ceph_register_bdi(struct super_block *sb,
73478 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
73479
73480 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
73481- atomic_long_inc_return(&bdi_seq));
73482+ atomic_long_inc_return_unchecked(&bdi_seq));
73483 if (!err)
73484 sb->s_bdi = &fsc->backing_dev_info;
73485 return err;
73486diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
73487index 7febcf2..62a5721 100644
73488--- a/fs/cifs/cifs_debug.c
73489+++ b/fs/cifs/cifs_debug.c
73490@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73491
73492 if (strtobool(&c, &bv) == 0) {
73493 #ifdef CONFIG_CIFS_STATS2
73494- atomic_set(&totBufAllocCount, 0);
73495- atomic_set(&totSmBufAllocCount, 0);
73496+ atomic_set_unchecked(&totBufAllocCount, 0);
73497+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73498 #endif /* CONFIG_CIFS_STATS2 */
73499 spin_lock(&cifs_tcp_ses_lock);
73500 list_for_each(tmp1, &cifs_tcp_ses_list) {
73501@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73502 tcon = list_entry(tmp3,
73503 struct cifs_tcon,
73504 tcon_list);
73505- atomic_set(&tcon->num_smbs_sent, 0);
73506+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
73507 if (server->ops->clear_stats)
73508 server->ops->clear_stats(tcon);
73509 }
73510@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73511 smBufAllocCount.counter, cifs_min_small);
73512 #ifdef CONFIG_CIFS_STATS2
73513 seq_printf(m, "Total Large %d Small %d Allocations\n",
73514- atomic_read(&totBufAllocCount),
73515- atomic_read(&totSmBufAllocCount));
73516+ atomic_read_unchecked(&totBufAllocCount),
73517+ atomic_read_unchecked(&totSmBufAllocCount));
73518 #endif /* CONFIG_CIFS_STATS2 */
73519
73520 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
73521@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73522 if (tcon->need_reconnect)
73523 seq_puts(m, "\tDISCONNECTED ");
73524 seq_printf(m, "\nSMBs: %d",
73525- atomic_read(&tcon->num_smbs_sent));
73526+ atomic_read_unchecked(&tcon->num_smbs_sent));
73527 if (server->ops->print_stats)
73528 server->ops->print_stats(m, tcon);
73529 }
73530diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
73531index 0a9fb6b..9def7fa 100644
73532--- a/fs/cifs/cifsfs.c
73533+++ b/fs/cifs/cifsfs.c
73534@@ -1082,7 +1082,7 @@ cifs_init_request_bufs(void)
73535 */
73536 cifs_req_cachep = kmem_cache_create("cifs_request",
73537 CIFSMaxBufSize + max_hdr_size, 0,
73538- SLAB_HWCACHE_ALIGN, NULL);
73539+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
73540 if (cifs_req_cachep == NULL)
73541 return -ENOMEM;
73542
73543@@ -1109,7 +1109,7 @@ cifs_init_request_bufs(void)
73544 efficient to alloc 1 per page off the slab compared to 17K (5page)
73545 alloc of large cifs buffers even when page debugging is on */
73546 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
73547- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
73548+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
73549 NULL);
73550 if (cifs_sm_req_cachep == NULL) {
73551 mempool_destroy(cifs_req_poolp);
73552@@ -1194,8 +1194,8 @@ init_cifs(void)
73553 atomic_set(&bufAllocCount, 0);
73554 atomic_set(&smBufAllocCount, 0);
73555 #ifdef CONFIG_CIFS_STATS2
73556- atomic_set(&totBufAllocCount, 0);
73557- atomic_set(&totSmBufAllocCount, 0);
73558+ atomic_set_unchecked(&totBufAllocCount, 0);
73559+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73560 #endif /* CONFIG_CIFS_STATS2 */
73561
73562 atomic_set(&midCount, 0);
73563diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
73564index 22b289a..bbbba082 100644
73565--- a/fs/cifs/cifsglob.h
73566+++ b/fs/cifs/cifsglob.h
73567@@ -823,35 +823,35 @@ struct cifs_tcon {
73568 __u16 Flags; /* optional support bits */
73569 enum statusEnum tidStatus;
73570 #ifdef CONFIG_CIFS_STATS
73571- atomic_t num_smbs_sent;
73572+ atomic_unchecked_t num_smbs_sent;
73573 union {
73574 struct {
73575- atomic_t num_writes;
73576- atomic_t num_reads;
73577- atomic_t num_flushes;
73578- atomic_t num_oplock_brks;
73579- atomic_t num_opens;
73580- atomic_t num_closes;
73581- atomic_t num_deletes;
73582- atomic_t num_mkdirs;
73583- atomic_t num_posixopens;
73584- atomic_t num_posixmkdirs;
73585- atomic_t num_rmdirs;
73586- atomic_t num_renames;
73587- atomic_t num_t2renames;
73588- atomic_t num_ffirst;
73589- atomic_t num_fnext;
73590- atomic_t num_fclose;
73591- atomic_t num_hardlinks;
73592- atomic_t num_symlinks;
73593- atomic_t num_locks;
73594- atomic_t num_acl_get;
73595- atomic_t num_acl_set;
73596+ atomic_unchecked_t num_writes;
73597+ atomic_unchecked_t num_reads;
73598+ atomic_unchecked_t num_flushes;
73599+ atomic_unchecked_t num_oplock_brks;
73600+ atomic_unchecked_t num_opens;
73601+ atomic_unchecked_t num_closes;
73602+ atomic_unchecked_t num_deletes;
73603+ atomic_unchecked_t num_mkdirs;
73604+ atomic_unchecked_t num_posixopens;
73605+ atomic_unchecked_t num_posixmkdirs;
73606+ atomic_unchecked_t num_rmdirs;
73607+ atomic_unchecked_t num_renames;
73608+ atomic_unchecked_t num_t2renames;
73609+ atomic_unchecked_t num_ffirst;
73610+ atomic_unchecked_t num_fnext;
73611+ atomic_unchecked_t num_fclose;
73612+ atomic_unchecked_t num_hardlinks;
73613+ atomic_unchecked_t num_symlinks;
73614+ atomic_unchecked_t num_locks;
73615+ atomic_unchecked_t num_acl_get;
73616+ atomic_unchecked_t num_acl_set;
73617 } cifs_stats;
73618 #ifdef CONFIG_CIFS_SMB2
73619 struct {
73620- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73621- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73622+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73623+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73624 } smb2_stats;
73625 #endif /* CONFIG_CIFS_SMB2 */
73626 } stats;
73627@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
73628 }
73629
73630 #ifdef CONFIG_CIFS_STATS
73631-#define cifs_stats_inc atomic_inc
73632+#define cifs_stats_inc atomic_inc_unchecked
73633
73634 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
73635 unsigned int bytes)
73636@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
73637 /* Various Debug counters */
73638 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
73639 #ifdef CONFIG_CIFS_STATS2
73640-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
73641-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
73642+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
73643+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
73644 #endif
73645 GLOBAL_EXTERN atomic_t smBufAllocCount;
73646 GLOBAL_EXTERN atomic_t midCount;
73647diff --git a/fs/cifs/file.c b/fs/cifs/file.c
73648index 3f50cee..7741620 100644
73649--- a/fs/cifs/file.c
73650+++ b/fs/cifs/file.c
73651@@ -2054,10 +2054,14 @@ static int cifs_writepages(struct address_space *mapping,
73652 index = mapping->writeback_index; /* Start from prev offset */
73653 end = -1;
73654 } else {
73655- index = wbc->range_start >> PAGE_CACHE_SHIFT;
73656- end = wbc->range_end >> PAGE_CACHE_SHIFT;
73657- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
73658+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
73659 range_whole = true;
73660+ index = 0;
73661+ end = ULONG_MAX;
73662+ } else {
73663+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
73664+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
73665+ }
73666 scanned = true;
73667 }
73668 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
73669diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
73670index 8442b8b..ea6986f 100644
73671--- a/fs/cifs/misc.c
73672+++ b/fs/cifs/misc.c
73673@@ -170,7 +170,7 @@ cifs_buf_get(void)
73674 memset(ret_buf, 0, buf_size + 3);
73675 atomic_inc(&bufAllocCount);
73676 #ifdef CONFIG_CIFS_STATS2
73677- atomic_inc(&totBufAllocCount);
73678+ atomic_inc_unchecked(&totBufAllocCount);
73679 #endif /* CONFIG_CIFS_STATS2 */
73680 }
73681
73682@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
73683 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
73684 atomic_inc(&smBufAllocCount);
73685 #ifdef CONFIG_CIFS_STATS2
73686- atomic_inc(&totSmBufAllocCount);
73687+ atomic_inc_unchecked(&totSmBufAllocCount);
73688 #endif /* CONFIG_CIFS_STATS2 */
73689
73690 }
73691diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
73692index fc537c2..47d654c 100644
73693--- a/fs/cifs/smb1ops.c
73694+++ b/fs/cifs/smb1ops.c
73695@@ -622,27 +622,27 @@ static void
73696 cifs_clear_stats(struct cifs_tcon *tcon)
73697 {
73698 #ifdef CONFIG_CIFS_STATS
73699- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
73700- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
73701- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
73702- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
73703- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
73704- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
73705- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
73706- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
73707- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
73708- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
73709- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
73710- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
73711- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
73712- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
73713- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
73714- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
73715- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
73716- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
73717- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
73718- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
73719- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
73720+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
73721+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
73722+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
73723+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
73724+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
73725+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
73726+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
73727+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
73728+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
73729+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
73730+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
73731+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
73732+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
73733+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
73734+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
73735+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
73736+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
73737+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
73738+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
73739+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
73740+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
73741 #endif
73742 }
73743
73744@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
73745 {
73746 #ifdef CONFIG_CIFS_STATS
73747 seq_printf(m, " Oplocks breaks: %d",
73748- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
73749+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
73750 seq_printf(m, "\nReads: %d Bytes: %llu",
73751- atomic_read(&tcon->stats.cifs_stats.num_reads),
73752+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
73753 (long long)(tcon->bytes_read));
73754 seq_printf(m, "\nWrites: %d Bytes: %llu",
73755- atomic_read(&tcon->stats.cifs_stats.num_writes),
73756+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
73757 (long long)(tcon->bytes_written));
73758 seq_printf(m, "\nFlushes: %d",
73759- atomic_read(&tcon->stats.cifs_stats.num_flushes));
73760+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
73761 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
73762- atomic_read(&tcon->stats.cifs_stats.num_locks),
73763- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
73764- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
73765+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
73766+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
73767+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
73768 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
73769- atomic_read(&tcon->stats.cifs_stats.num_opens),
73770- atomic_read(&tcon->stats.cifs_stats.num_closes),
73771- atomic_read(&tcon->stats.cifs_stats.num_deletes));
73772+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
73773+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
73774+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
73775 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
73776- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
73777- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
73778+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
73779+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
73780 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
73781- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
73782- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
73783+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
73784+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
73785 seq_printf(m, "\nRenames: %d T2 Renames %d",
73786- atomic_read(&tcon->stats.cifs_stats.num_renames),
73787- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
73788+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
73789+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
73790 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
73791- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
73792- atomic_read(&tcon->stats.cifs_stats.num_fnext),
73793- atomic_read(&tcon->stats.cifs_stats.num_fclose));
73794+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
73795+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
73796+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
73797 #endif
73798 }
73799
73800diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
73801index 54daee5..2669fcb 100644
73802--- a/fs/cifs/smb2ops.c
73803+++ b/fs/cifs/smb2ops.c
73804@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
73805 #ifdef CONFIG_CIFS_STATS
73806 int i;
73807 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
73808- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
73809- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
73810+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
73811+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
73812 }
73813 #endif
73814 }
73815@@ -459,65 +459,65 @@ static void
73816 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
73817 {
73818 #ifdef CONFIG_CIFS_STATS
73819- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
73820- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
73821+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
73822+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
73823 seq_printf(m, "\nNegotiates: %d sent %d failed",
73824- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
73825- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
73826+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
73827+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
73828 seq_printf(m, "\nSessionSetups: %d sent %d failed",
73829- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
73830- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
73831+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
73832+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
73833 seq_printf(m, "\nLogoffs: %d sent %d failed",
73834- atomic_read(&sent[SMB2_LOGOFF_HE]),
73835- atomic_read(&failed[SMB2_LOGOFF_HE]));
73836+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
73837+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
73838 seq_printf(m, "\nTreeConnects: %d sent %d failed",
73839- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
73840- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
73841+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
73842+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
73843 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
73844- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
73845- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
73846+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
73847+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
73848 seq_printf(m, "\nCreates: %d sent %d failed",
73849- atomic_read(&sent[SMB2_CREATE_HE]),
73850- atomic_read(&failed[SMB2_CREATE_HE]));
73851+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
73852+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
73853 seq_printf(m, "\nCloses: %d sent %d failed",
73854- atomic_read(&sent[SMB2_CLOSE_HE]),
73855- atomic_read(&failed[SMB2_CLOSE_HE]));
73856+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
73857+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
73858 seq_printf(m, "\nFlushes: %d sent %d failed",
73859- atomic_read(&sent[SMB2_FLUSH_HE]),
73860- atomic_read(&failed[SMB2_FLUSH_HE]));
73861+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
73862+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
73863 seq_printf(m, "\nReads: %d sent %d failed",
73864- atomic_read(&sent[SMB2_READ_HE]),
73865- atomic_read(&failed[SMB2_READ_HE]));
73866+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
73867+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
73868 seq_printf(m, "\nWrites: %d sent %d failed",
73869- atomic_read(&sent[SMB2_WRITE_HE]),
73870- atomic_read(&failed[SMB2_WRITE_HE]));
73871+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
73872+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
73873 seq_printf(m, "\nLocks: %d sent %d failed",
73874- atomic_read(&sent[SMB2_LOCK_HE]),
73875- atomic_read(&failed[SMB2_LOCK_HE]));
73876+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
73877+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
73878 seq_printf(m, "\nIOCTLs: %d sent %d failed",
73879- atomic_read(&sent[SMB2_IOCTL_HE]),
73880- atomic_read(&failed[SMB2_IOCTL_HE]));
73881+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
73882+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
73883 seq_printf(m, "\nCancels: %d sent %d failed",
73884- atomic_read(&sent[SMB2_CANCEL_HE]),
73885- atomic_read(&failed[SMB2_CANCEL_HE]));
73886+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
73887+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
73888 seq_printf(m, "\nEchos: %d sent %d failed",
73889- atomic_read(&sent[SMB2_ECHO_HE]),
73890- atomic_read(&failed[SMB2_ECHO_HE]));
73891+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
73892+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
73893 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
73894- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
73895- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
73896+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
73897+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
73898 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
73899- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
73900- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
73901+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
73902+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
73903 seq_printf(m, "\nQueryInfos: %d sent %d failed",
73904- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
73905- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
73906+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
73907+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
73908 seq_printf(m, "\nSetInfos: %d sent %d failed",
73909- atomic_read(&sent[SMB2_SET_INFO_HE]),
73910- atomic_read(&failed[SMB2_SET_INFO_HE]));
73911+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
73912+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
73913 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
73914- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
73915- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
73916+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
73917+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
73918 #endif
73919 }
73920
73921diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
73922index 54cbe19..fcd4a1b 100644
73923--- a/fs/cifs/smb2pdu.c
73924+++ b/fs/cifs/smb2pdu.c
73925@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
73926 default:
73927 cifs_dbg(VFS, "info level %u isn't supported\n",
73928 srch_inf->info_level);
73929- rc = -EINVAL;
73930- goto qdir_exit;
73931+ return -EINVAL;
73932 }
73933
73934 req->FileIndex = cpu_to_le32(index);
73935diff --git a/fs/coda/cache.c b/fs/coda/cache.c
73936index 5bb630a..043dc70 100644
73937--- a/fs/coda/cache.c
73938+++ b/fs/coda/cache.c
73939@@ -24,7 +24,7 @@
73940 #include "coda_linux.h"
73941 #include "coda_cache.h"
73942
73943-static atomic_t permission_epoch = ATOMIC_INIT(0);
73944+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
73945
73946 /* replace or extend an acl cache hit */
73947 void coda_cache_enter(struct inode *inode, int mask)
73948@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
73949 struct coda_inode_info *cii = ITOC(inode);
73950
73951 spin_lock(&cii->c_lock);
73952- cii->c_cached_epoch = atomic_read(&permission_epoch);
73953+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
73954 if (!uid_eq(cii->c_uid, current_fsuid())) {
73955 cii->c_uid = current_fsuid();
73956 cii->c_cached_perm = mask;
73957@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
73958 {
73959 struct coda_inode_info *cii = ITOC(inode);
73960 spin_lock(&cii->c_lock);
73961- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
73962+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
73963 spin_unlock(&cii->c_lock);
73964 }
73965
73966 /* remove all acl caches */
73967 void coda_cache_clear_all(struct super_block *sb)
73968 {
73969- atomic_inc(&permission_epoch);
73970+ atomic_inc_unchecked(&permission_epoch);
73971 }
73972
73973
73974@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
73975 spin_lock(&cii->c_lock);
73976 hit = (mask & cii->c_cached_perm) == mask &&
73977 uid_eq(cii->c_uid, current_fsuid()) &&
73978- cii->c_cached_epoch == atomic_read(&permission_epoch);
73979+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
73980 spin_unlock(&cii->c_lock);
73981
73982 return hit;
73983diff --git a/fs/compat.c b/fs/compat.c
73984index 6fd272d..dd34ba2 100644
73985--- a/fs/compat.c
73986+++ b/fs/compat.c
73987@@ -54,7 +54,7 @@
73988 #include <asm/ioctls.h>
73989 #include "internal.h"
73990
73991-int compat_log = 1;
73992+int compat_log = 0;
73993
73994 int compat_printk(const char *fmt, ...)
73995 {
73996@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
73997
73998 set_fs(KERNEL_DS);
73999 /* The __user pointer cast is valid because of the set_fs() */
74000- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
74001+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
74002 set_fs(oldfs);
74003 /* truncating is ok because it's a user address */
74004 if (!ret)
74005@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
74006 goto out;
74007
74008 ret = -EINVAL;
74009- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
74010+ if (nr_segs > UIO_MAXIOV)
74011 goto out;
74012 if (nr_segs > fast_segs) {
74013 ret = -ENOMEM;
74014@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
74015 struct compat_readdir_callback {
74016 struct dir_context ctx;
74017 struct compat_old_linux_dirent __user *dirent;
74018+ struct file * file;
74019 int result;
74020 };
74021
74022@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
74023 buf->result = -EOVERFLOW;
74024 return -EOVERFLOW;
74025 }
74026+
74027+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74028+ return 0;
74029+
74030 buf->result++;
74031 dirent = buf->dirent;
74032 if (!access_ok(VERIFY_WRITE, dirent,
74033@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
74034 if (!f.file)
74035 return -EBADF;
74036
74037+ buf.file = f.file;
74038 error = iterate_dir(f.file, &buf.ctx);
74039 if (buf.result)
74040 error = buf.result;
74041@@ -913,6 +919,7 @@ struct compat_getdents_callback {
74042 struct dir_context ctx;
74043 struct compat_linux_dirent __user *current_dir;
74044 struct compat_linux_dirent __user *previous;
74045+ struct file * file;
74046 int count;
74047 int error;
74048 };
74049@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
74050 buf->error = -EOVERFLOW;
74051 return -EOVERFLOW;
74052 }
74053+
74054+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74055+ return 0;
74056+
74057 dirent = buf->previous;
74058 if (dirent) {
74059 if (__put_user(offset, &dirent->d_off))
74060@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
74061 if (!f.file)
74062 return -EBADF;
74063
74064+ buf.file = f.file;
74065 error = iterate_dir(f.file, &buf.ctx);
74066 if (error >= 0)
74067 error = buf.error;
74068@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
74069 struct dir_context ctx;
74070 struct linux_dirent64 __user *current_dir;
74071 struct linux_dirent64 __user *previous;
74072+ struct file * file;
74073 int count;
74074 int error;
74075 };
74076@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
74077 buf->error = -EINVAL; /* only used if we fail.. */
74078 if (reclen > buf->count)
74079 return -EINVAL;
74080+
74081+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74082+ return 0;
74083+
74084 dirent = buf->previous;
74085
74086 if (dirent) {
74087@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
74088 if (!f.file)
74089 return -EBADF;
74090
74091+ buf.file = f.file;
74092 error = iterate_dir(f.file, &buf.ctx);
74093 if (error >= 0)
74094 error = buf.error;
74095diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
74096index 4d24d17..4f8c09e 100644
74097--- a/fs/compat_binfmt_elf.c
74098+++ b/fs/compat_binfmt_elf.c
74099@@ -30,11 +30,13 @@
74100 #undef elf_phdr
74101 #undef elf_shdr
74102 #undef elf_note
74103+#undef elf_dyn
74104 #undef elf_addr_t
74105 #define elfhdr elf32_hdr
74106 #define elf_phdr elf32_phdr
74107 #define elf_shdr elf32_shdr
74108 #define elf_note elf32_note
74109+#define elf_dyn Elf32_Dyn
74110 #define elf_addr_t Elf32_Addr
74111
74112 /*
74113diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
74114index 6b8e2f0..9b13a5e 100644
74115--- a/fs/compat_ioctl.c
74116+++ b/fs/compat_ioctl.c
74117@@ -622,7 +622,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
74118 return -EFAULT;
74119 if (__get_user(udata, &ss32->iomem_base))
74120 return -EFAULT;
74121- ss.iomem_base = compat_ptr(udata);
74122+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
74123 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
74124 __get_user(ss.port_high, &ss32->port_high))
74125 return -EFAULT;
74126@@ -704,8 +704,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
74127 for (i = 0; i < nmsgs; i++) {
74128 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
74129 return -EFAULT;
74130- if (get_user(datap, &umsgs[i].buf) ||
74131- put_user(compat_ptr(datap), &tmsgs[i].buf))
74132+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
74133+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
74134 return -EFAULT;
74135 }
74136 return sys_ioctl(fd, cmd, (unsigned long)tdata);
74137@@ -798,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
74138 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
74139 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
74140 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
74141- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
74142+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
74143 return -EFAULT;
74144
74145 return ioctl_preallocate(file, p);
74146@@ -1620,8 +1620,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
74147 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
74148 {
74149 unsigned int a, b;
74150- a = *(unsigned int *)p;
74151- b = *(unsigned int *)q;
74152+ a = *(const unsigned int *)p;
74153+ b = *(const unsigned int *)q;
74154 if (a > b)
74155 return 1;
74156 if (a < b)
74157diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
74158index c81ce7f..f3de5fd 100644
74159--- a/fs/configfs/dir.c
74160+++ b/fs/configfs/dir.c
74161@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74162 }
74163 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
74164 struct configfs_dirent *next;
74165- const char *name;
74166+ const unsigned char * name;
74167+ char d_name[sizeof(next->s_dentry->d_iname)];
74168 int len;
74169 struct inode *inode = NULL;
74170
74171@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74172 continue;
74173
74174 name = configfs_get_name(next);
74175- len = strlen(name);
74176+ if (next->s_dentry && name == next->s_dentry->d_iname) {
74177+ len = next->s_dentry->d_name.len;
74178+ memcpy(d_name, name, len);
74179+ name = d_name;
74180+ } else
74181+ len = strlen(name);
74182
74183 /*
74184 * We'll have a dentry and an inode for
74185diff --git a/fs/configfs/item.c b/fs/configfs/item.c
74186index e65f9ff..3ed264d 100644
74187--- a/fs/configfs/item.c
74188+++ b/fs/configfs/item.c
74189@@ -116,7 +116,7 @@ void config_item_init_type_name(struct config_item *item,
74190 const char *name,
74191 struct config_item_type *type)
74192 {
74193- config_item_set_name(item, name);
74194+ config_item_set_name(item, "%s", name);
74195 item->ci_type = type;
74196 config_item_init(item);
74197 }
74198@@ -125,7 +125,7 @@ EXPORT_SYMBOL(config_item_init_type_name);
74199 void config_group_init_type_name(struct config_group *group, const char *name,
74200 struct config_item_type *type)
74201 {
74202- config_item_set_name(&group->cg_item, name);
74203+ config_item_set_name(&group->cg_item, "%s", name);
74204 group->cg_item.ci_type = type;
74205 config_group_init(group);
74206 }
74207diff --git a/fs/coredump.c b/fs/coredump.c
74208index bbbe139..b76fae5 100644
74209--- a/fs/coredump.c
74210+++ b/fs/coredump.c
74211@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
74212 struct pipe_inode_info *pipe = file->private_data;
74213
74214 pipe_lock(pipe);
74215- pipe->readers++;
74216- pipe->writers--;
74217+ atomic_inc(&pipe->readers);
74218+ atomic_dec(&pipe->writers);
74219 wake_up_interruptible_sync(&pipe->wait);
74220 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
74221 pipe_unlock(pipe);
74222@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
74223 * We actually want wait_event_freezable() but then we need
74224 * to clear TIF_SIGPENDING and improve dump_interrupted().
74225 */
74226- wait_event_interruptible(pipe->wait, pipe->readers == 1);
74227+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
74228
74229 pipe_lock(pipe);
74230- pipe->readers--;
74231- pipe->writers++;
74232+ atomic_dec(&pipe->readers);
74233+ atomic_inc(&pipe->writers);
74234 pipe_unlock(pipe);
74235 }
74236
74237@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
74238 struct files_struct *displaced;
74239 bool need_nonrelative = false;
74240 bool core_dumped = false;
74241- static atomic_t core_dump_count = ATOMIC_INIT(0);
74242+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
74243+ long signr = siginfo->si_signo;
74244+ int dumpable;
74245 struct coredump_params cprm = {
74246 .siginfo = siginfo,
74247 .regs = signal_pt_regs(),
74248@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
74249 .mm_flags = mm->flags,
74250 };
74251
74252- audit_core_dumps(siginfo->si_signo);
74253+ audit_core_dumps(signr);
74254+
74255+ dumpable = __get_dumpable(cprm.mm_flags);
74256+
74257+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
74258+ gr_handle_brute_attach(dumpable);
74259
74260 binfmt = mm->binfmt;
74261 if (!binfmt || !binfmt->core_dump)
74262 goto fail;
74263- if (!__get_dumpable(cprm.mm_flags))
74264+ if (!dumpable)
74265 goto fail;
74266
74267 cred = prepare_creds();
74268@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
74269 need_nonrelative = true;
74270 }
74271
74272- retval = coredump_wait(siginfo->si_signo, &core_state);
74273+ retval = coredump_wait(signr, &core_state);
74274 if (retval < 0)
74275 goto fail_creds;
74276
74277@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
74278 }
74279 cprm.limit = RLIM_INFINITY;
74280
74281- dump_count = atomic_inc_return(&core_dump_count);
74282+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
74283 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
74284 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
74285 task_tgid_vnr(current), current->comm);
74286@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
74287 } else {
74288 struct inode *inode;
74289
74290+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
74291+
74292 if (cprm.limit < binfmt->min_coredump)
74293 goto fail_unlock;
74294
74295@@ -681,7 +690,7 @@ close_fail:
74296 filp_close(cprm.file, NULL);
74297 fail_dropcount:
74298 if (ispipe)
74299- atomic_dec(&core_dump_count);
74300+ atomic_dec_unchecked(&core_dump_count);
74301 fail_unlock:
74302 kfree(cn.corename);
74303 coredump_finish(mm, core_dumped);
74304@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
74305 struct file *file = cprm->file;
74306 loff_t pos = file->f_pos;
74307 ssize_t n;
74308+
74309+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
74310 if (cprm->written + nr > cprm->limit)
74311 return 0;
74312 while (nr) {
74313diff --git a/fs/dcache.c b/fs/dcache.c
74314index 5d03eb0..d874b57 100644
74315--- a/fs/dcache.c
74316+++ b/fs/dcache.c
74317@@ -545,7 +545,7 @@ static void __dentry_kill(struct dentry *dentry)
74318 * dentry_iput drops the locks, at which point nobody (except
74319 * transient RCU lookups) can reach this dentry.
74320 */
74321- BUG_ON(dentry->d_lockref.count > 0);
74322+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
74323 this_cpu_dec(nr_dentry);
74324 if (dentry->d_op && dentry->d_op->d_release)
74325 dentry->d_op->d_release(dentry);
74326@@ -598,7 +598,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
74327 struct dentry *parent = dentry->d_parent;
74328 if (IS_ROOT(dentry))
74329 return NULL;
74330- if (unlikely(dentry->d_lockref.count < 0))
74331+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
74332 return NULL;
74333 if (likely(spin_trylock(&parent->d_lock)))
74334 return parent;
74335@@ -660,8 +660,8 @@ static inline bool fast_dput(struct dentry *dentry)
74336 */
74337 if (unlikely(ret < 0)) {
74338 spin_lock(&dentry->d_lock);
74339- if (dentry->d_lockref.count > 1) {
74340- dentry->d_lockref.count--;
74341+ if (__lockref_read(&dentry->d_lockref) > 1) {
74342+ __lockref_dec(&dentry->d_lockref);
74343 spin_unlock(&dentry->d_lock);
74344 return 1;
74345 }
74346@@ -716,7 +716,7 @@ static inline bool fast_dput(struct dentry *dentry)
74347 * else could have killed it and marked it dead. Either way, we
74348 * don't need to do anything else.
74349 */
74350- if (dentry->d_lockref.count) {
74351+ if (__lockref_read(&dentry->d_lockref)) {
74352 spin_unlock(&dentry->d_lock);
74353 return 1;
74354 }
74355@@ -726,7 +726,7 @@ static inline bool fast_dput(struct dentry *dentry)
74356 * lock, and we just tested that it was zero, so we can just
74357 * set it to 1.
74358 */
74359- dentry->d_lockref.count = 1;
74360+ __lockref_set(&dentry->d_lockref, 1);
74361 return 0;
74362 }
74363
74364@@ -788,7 +788,7 @@ repeat:
74365 dentry->d_flags |= DCACHE_REFERENCED;
74366 dentry_lru_add(dentry);
74367
74368- dentry->d_lockref.count--;
74369+ __lockref_dec(&dentry->d_lockref);
74370 spin_unlock(&dentry->d_lock);
74371 return;
74372
74373@@ -803,7 +803,7 @@ EXPORT_SYMBOL(dput);
74374 /* This must be called with d_lock held */
74375 static inline void __dget_dlock(struct dentry *dentry)
74376 {
74377- dentry->d_lockref.count++;
74378+ __lockref_inc(&dentry->d_lockref);
74379 }
74380
74381 static inline void __dget(struct dentry *dentry)
74382@@ -844,8 +844,8 @@ repeat:
74383 goto repeat;
74384 }
74385 rcu_read_unlock();
74386- BUG_ON(!ret->d_lockref.count);
74387- ret->d_lockref.count++;
74388+ BUG_ON(!__lockref_read(&ret->d_lockref));
74389+ __lockref_inc(&ret->d_lockref);
74390 spin_unlock(&ret->d_lock);
74391 return ret;
74392 }
74393@@ -923,9 +923,9 @@ restart:
74394 spin_lock(&inode->i_lock);
74395 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
74396 spin_lock(&dentry->d_lock);
74397- if (!dentry->d_lockref.count) {
74398+ if (!__lockref_read(&dentry->d_lockref)) {
74399 struct dentry *parent = lock_parent(dentry);
74400- if (likely(!dentry->d_lockref.count)) {
74401+ if (likely(!__lockref_read(&dentry->d_lockref))) {
74402 __dentry_kill(dentry);
74403 dput(parent);
74404 goto restart;
74405@@ -960,7 +960,7 @@ static void shrink_dentry_list(struct list_head *list)
74406 * We found an inuse dentry which was not removed from
74407 * the LRU because of laziness during lookup. Do not free it.
74408 */
74409- if (dentry->d_lockref.count > 0) {
74410+ if (__lockref_read(&dentry->d_lockref) > 0) {
74411 spin_unlock(&dentry->d_lock);
74412 if (parent)
74413 spin_unlock(&parent->d_lock);
74414@@ -998,8 +998,8 @@ static void shrink_dentry_list(struct list_head *list)
74415 dentry = parent;
74416 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
74417 parent = lock_parent(dentry);
74418- if (dentry->d_lockref.count != 1) {
74419- dentry->d_lockref.count--;
74420+ if (__lockref_read(&dentry->d_lockref) != 1) {
74421+ __lockref_inc(&dentry->d_lockref);
74422 spin_unlock(&dentry->d_lock);
74423 if (parent)
74424 spin_unlock(&parent->d_lock);
74425@@ -1039,7 +1039,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
74426 * counts, just remove them from the LRU. Otherwise give them
74427 * another pass through the LRU.
74428 */
74429- if (dentry->d_lockref.count) {
74430+ if (__lockref_read(&dentry->d_lockref)) {
74431 d_lru_isolate(lru, dentry);
74432 spin_unlock(&dentry->d_lock);
74433 return LRU_REMOVED;
74434@@ -1373,7 +1373,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
74435 } else {
74436 if (dentry->d_flags & DCACHE_LRU_LIST)
74437 d_lru_del(dentry);
74438- if (!dentry->d_lockref.count) {
74439+ if (!__lockref_read(&dentry->d_lockref)) {
74440 d_shrink_add(dentry, &data->dispose);
74441 data->found++;
74442 }
74443@@ -1421,7 +1421,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74444 return D_WALK_CONTINUE;
74445
74446 /* root with refcount 1 is fine */
74447- if (dentry == _data && dentry->d_lockref.count == 1)
74448+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
74449 return D_WALK_CONTINUE;
74450
74451 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
74452@@ -1430,7 +1430,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74453 dentry->d_inode ?
74454 dentry->d_inode->i_ino : 0UL,
74455 dentry,
74456- dentry->d_lockref.count,
74457+ __lockref_read(&dentry->d_lockref),
74458 dentry->d_sb->s_type->name,
74459 dentry->d_sb->s_id);
74460 WARN_ON(1);
74461@@ -1571,7 +1571,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74462 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
74463 if (name->len > DNAME_INLINE_LEN-1) {
74464 size_t size = offsetof(struct external_name, name[1]);
74465- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
74466+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
74467 if (!p) {
74468 kmem_cache_free(dentry_cache, dentry);
74469 return NULL;
74470@@ -1594,7 +1594,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74471 smp_wmb();
74472 dentry->d_name.name = dname;
74473
74474- dentry->d_lockref.count = 1;
74475+ __lockref_set(&dentry->d_lockref, 1);
74476 dentry->d_flags = 0;
74477 spin_lock_init(&dentry->d_lock);
74478 seqcount_init(&dentry->d_seq);
74479@@ -1603,6 +1603,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74480 dentry->d_sb = sb;
74481 dentry->d_op = NULL;
74482 dentry->d_fsdata = NULL;
74483+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
74484+ atomic_set(&dentry->chroot_refcnt, 0);
74485+#endif
74486 INIT_HLIST_BL_NODE(&dentry->d_hash);
74487 INIT_LIST_HEAD(&dentry->d_lru);
74488 INIT_LIST_HEAD(&dentry->d_subdirs);
74489@@ -2324,7 +2327,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
74490 goto next;
74491 }
74492
74493- dentry->d_lockref.count++;
74494+ __lockref_inc(&dentry->d_lockref);
74495 found = dentry;
74496 spin_unlock(&dentry->d_lock);
74497 break;
74498@@ -2392,7 +2395,7 @@ again:
74499 spin_lock(&dentry->d_lock);
74500 inode = dentry->d_inode;
74501 isdir = S_ISDIR(inode->i_mode);
74502- if (dentry->d_lockref.count == 1) {
74503+ if (__lockref_read(&dentry->d_lockref) == 1) {
74504 if (!spin_trylock(&inode->i_lock)) {
74505 spin_unlock(&dentry->d_lock);
74506 cpu_relax();
74507@@ -3334,7 +3337,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
74508
74509 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
74510 dentry->d_flags |= DCACHE_GENOCIDE;
74511- dentry->d_lockref.count--;
74512+ __lockref_dec(&dentry->d_lockref);
74513 }
74514 }
74515 return D_WALK_CONTINUE;
74516@@ -3450,7 +3453,8 @@ void __init vfs_caches_init(unsigned long mempages)
74517 mempages -= reserve;
74518
74519 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
74520- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
74521+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
74522+ SLAB_NO_SANITIZE, NULL);
74523
74524 dcache_init();
74525 inode_init();
74526diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
74527index 1275604..d2ca85b 100644
74528--- a/fs/debugfs/inode.c
74529+++ b/fs/debugfs/inode.c
74530@@ -407,6 +407,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
74531 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
74532 * returned.
74533 */
74534+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74535+extern int grsec_enable_sysfs_restrict;
74536+#endif
74537+
74538 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74539 {
74540 struct dentry *dentry = start_creating(name, parent);
74541@@ -419,7 +423,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74542 if (unlikely(!inode))
74543 return failed_creating(dentry);
74544
74545- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74546+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74547+ if (grsec_enable_sysfs_restrict)
74548+ inode->i_mode = S_IFDIR | S_IRWXU;
74549+ else
74550+#endif
74551+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74552 inode->i_op = &simple_dir_inode_operations;
74553 inode->i_fop = &simple_dir_operations;
74554
74555diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
74556index fc850b5..1677a2a 100644
74557--- a/fs/ecryptfs/inode.c
74558+++ b/fs/ecryptfs/inode.c
74559@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
74560 old_fs = get_fs();
74561 set_fs(get_ds());
74562 rc = d_inode(lower_dentry)->i_op->readlink(lower_dentry,
74563- (char __user *)lower_buf,
74564+ (char __force_user *)lower_buf,
74565 PATH_MAX);
74566 set_fs(old_fs);
74567 if (rc < 0)
74568diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
74569index e4141f2..d8263e8 100644
74570--- a/fs/ecryptfs/miscdev.c
74571+++ b/fs/ecryptfs/miscdev.c
74572@@ -304,7 +304,7 @@ check_list:
74573 goto out_unlock_msg_ctx;
74574 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
74575 if (msg_ctx->msg) {
74576- if (copy_to_user(&buf[i], packet_length, packet_length_size))
74577+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
74578 goto out_unlock_msg_ctx;
74579 i += packet_length_size;
74580 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
74581diff --git a/fs/exec.c b/fs/exec.c
74582index 1977c2a..40e7f8f 100644
74583--- a/fs/exec.c
74584+++ b/fs/exec.c
74585@@ -56,8 +56,20 @@
74586 #include <linux/pipe_fs_i.h>
74587 #include <linux/oom.h>
74588 #include <linux/compat.h>
74589+#include <linux/random.h>
74590+#include <linux/seq_file.h>
74591+#include <linux/coredump.h>
74592+#include <linux/mman.h>
74593+
74594+#ifdef CONFIG_PAX_REFCOUNT
74595+#include <linux/kallsyms.h>
74596+#include <linux/kdebug.h>
74597+#endif
74598+
74599+#include <trace/events/fs.h>
74600
74601 #include <asm/uaccess.h>
74602+#include <asm/sections.h>
74603 #include <asm/mmu_context.h>
74604 #include <asm/tlb.h>
74605
74606@@ -66,19 +78,34 @@
74607
74608 #include <trace/events/sched.h>
74609
74610+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
74611+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
74612+{
74613+ 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");
74614+}
74615+#endif
74616+
74617+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
74618+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
74619+EXPORT_SYMBOL(pax_set_initial_flags_func);
74620+#endif
74621+
74622 int suid_dumpable = 0;
74623
74624 static LIST_HEAD(formats);
74625 static DEFINE_RWLOCK(binfmt_lock);
74626
74627+extern int gr_process_kernel_exec_ban(void);
74628+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
74629+
74630 void __register_binfmt(struct linux_binfmt * fmt, int insert)
74631 {
74632 BUG_ON(!fmt);
74633 if (WARN_ON(!fmt->load_binary))
74634 return;
74635 write_lock(&binfmt_lock);
74636- insert ? list_add(&fmt->lh, &formats) :
74637- list_add_tail(&fmt->lh, &formats);
74638+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
74639+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
74640 write_unlock(&binfmt_lock);
74641 }
74642
74643@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
74644 void unregister_binfmt(struct linux_binfmt * fmt)
74645 {
74646 write_lock(&binfmt_lock);
74647- list_del(&fmt->lh);
74648+ pax_list_del((struct list_head *)&fmt->lh);
74649 write_unlock(&binfmt_lock);
74650 }
74651
74652@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
74653 int write)
74654 {
74655 struct page *page;
74656- int ret;
74657
74658-#ifdef CONFIG_STACK_GROWSUP
74659- if (write) {
74660- ret = expand_downwards(bprm->vma, pos);
74661- if (ret < 0)
74662- return NULL;
74663- }
74664-#endif
74665- ret = get_user_pages(current, bprm->mm, pos,
74666- 1, write, 1, &page, NULL);
74667- if (ret <= 0)
74668+ if (0 > expand_downwards(bprm->vma, pos))
74669+ return NULL;
74670+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
74671 return NULL;
74672
74673 if (write) {
74674@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
74675 if (size <= ARG_MAX)
74676 return page;
74677
74678+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74679+ // only allow 512KB for argv+env on suid/sgid binaries
74680+ // to prevent easy ASLR exhaustion
74681+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
74682+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
74683+ (size > (512 * 1024))) {
74684+ put_page(page);
74685+ return NULL;
74686+ }
74687+#endif
74688+
74689 /*
74690 * Limit to 1/4-th the stack size for the argv+env strings.
74691 * This ensures that:
74692@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
74693 vma->vm_end = STACK_TOP_MAX;
74694 vma->vm_start = vma->vm_end - PAGE_SIZE;
74695 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
74696+
74697+#ifdef CONFIG_PAX_SEGMEXEC
74698+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
74699+#endif
74700+
74701 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
74702 INIT_LIST_HEAD(&vma->anon_vma_chain);
74703
74704@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
74705 arch_bprm_mm_init(mm, vma);
74706 up_write(&mm->mmap_sem);
74707 bprm->p = vma->vm_end - sizeof(void *);
74708+
74709+#ifdef CONFIG_PAX_RANDUSTACK
74710+ if (randomize_va_space)
74711+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
74712+#endif
74713+
74714 return 0;
74715 err:
74716 up_write(&mm->mmap_sem);
74717@@ -396,7 +437,7 @@ struct user_arg_ptr {
74718 } ptr;
74719 };
74720
74721-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74722+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74723 {
74724 const char __user *native;
74725
74726@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74727 compat_uptr_t compat;
74728
74729 if (get_user(compat, argv.ptr.compat + nr))
74730- return ERR_PTR(-EFAULT);
74731+ return (const char __force_user *)ERR_PTR(-EFAULT);
74732
74733 return compat_ptr(compat);
74734 }
74735 #endif
74736
74737 if (get_user(native, argv.ptr.native + nr))
74738- return ERR_PTR(-EFAULT);
74739+ return (const char __force_user *)ERR_PTR(-EFAULT);
74740
74741 return native;
74742 }
74743@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
74744 if (!p)
74745 break;
74746
74747- if (IS_ERR(p))
74748+ if (IS_ERR((const char __force_kernel *)p))
74749 return -EFAULT;
74750
74751 if (i >= max)
74752@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
74753
74754 ret = -EFAULT;
74755 str = get_user_arg_ptr(argv, argc);
74756- if (IS_ERR(str))
74757+ if (IS_ERR((const char __force_kernel *)str))
74758 goto out;
74759
74760 len = strnlen_user(str, MAX_ARG_STRLEN);
74761@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
74762 int r;
74763 mm_segment_t oldfs = get_fs();
74764 struct user_arg_ptr argv = {
74765- .ptr.native = (const char __user *const __user *)__argv,
74766+ .ptr.native = (const char __user * const __force_user *)__argv,
74767 };
74768
74769 set_fs(KERNEL_DS);
74770@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
74771 unsigned long new_end = old_end - shift;
74772 struct mmu_gather tlb;
74773
74774- BUG_ON(new_start > new_end);
74775+ if (new_start >= new_end || new_start < mmap_min_addr)
74776+ return -ENOMEM;
74777
74778 /*
74779 * ensure there are no vmas between where we want to go
74780@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
74781 if (vma != find_vma(mm, new_start))
74782 return -EFAULT;
74783
74784+#ifdef CONFIG_PAX_SEGMEXEC
74785+ BUG_ON(pax_find_mirror_vma(vma));
74786+#endif
74787+
74788 /*
74789 * cover the whole range: [new_start, old_end)
74790 */
74791@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
74792 stack_top = arch_align_stack(stack_top);
74793 stack_top = PAGE_ALIGN(stack_top);
74794
74795- if (unlikely(stack_top < mmap_min_addr) ||
74796- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
74797- return -ENOMEM;
74798-
74799 stack_shift = vma->vm_end - stack_top;
74800
74801 bprm->p -= stack_shift;
74802@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
74803 bprm->exec -= stack_shift;
74804
74805 down_write(&mm->mmap_sem);
74806+
74807+ /* Move stack pages down in memory. */
74808+ if (stack_shift) {
74809+ ret = shift_arg_pages(vma, stack_shift);
74810+ if (ret)
74811+ goto out_unlock;
74812+ }
74813+
74814 vm_flags = VM_STACK_FLAGS;
74815
74816+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
74817+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
74818+ vm_flags &= ~VM_EXEC;
74819+
74820+#ifdef CONFIG_PAX_MPROTECT
74821+ if (mm->pax_flags & MF_PAX_MPROTECT)
74822+ vm_flags &= ~VM_MAYEXEC;
74823+#endif
74824+
74825+ }
74826+#endif
74827+
74828 /*
74829 * Adjust stack execute permissions; explicitly enable for
74830 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
74831@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
74832 goto out_unlock;
74833 BUG_ON(prev != vma);
74834
74835- /* Move stack pages down in memory. */
74836- if (stack_shift) {
74837- ret = shift_arg_pages(vma, stack_shift);
74838- if (ret)
74839- goto out_unlock;
74840- }
74841-
74842 /* mprotect_fixup is overkill to remove the temporary stack flags */
74843 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
74844
74845@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
74846 #endif
74847 current->mm->start_stack = bprm->p;
74848 ret = expand_stack(vma, stack_base);
74849+
74850+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
74851+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
74852+ unsigned long size;
74853+ vm_flags_t vm_flags;
74854+
74855+ size = STACK_TOP - vma->vm_end;
74856+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
74857+
74858+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
74859+
74860+#ifdef CONFIG_X86
74861+ if (!ret) {
74862+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
74863+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
74864+ }
74865+#endif
74866+
74867+ }
74868+#endif
74869+
74870 if (ret)
74871 ret = -EFAULT;
74872
74873@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
74874 if (err)
74875 goto exit;
74876
74877- if (name->name[0] != '\0')
74878+ if (name->name[0] != '\0') {
74879 fsnotify_open(file);
74880+ trace_open_exec(name->name);
74881+ }
74882
74883 out:
74884 return file;
74885@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
74886 old_fs = get_fs();
74887 set_fs(get_ds());
74888 /* The cast to a user pointer is valid due to the set_fs() */
74889- result = vfs_read(file, (void __user *)addr, count, &pos);
74890+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
74891 set_fs(old_fs);
74892 return result;
74893 }
74894@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
74895 tsk->mm = mm;
74896 tsk->active_mm = mm;
74897 activate_mm(active_mm, mm);
74898+ populate_stack();
74899 tsk->mm->vmacache_seqnum = 0;
74900 vmacache_flush(tsk);
74901 task_unlock(tsk);
74902@@ -1271,7 +1350,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
74903 }
74904 rcu_read_unlock();
74905
74906- if (p->fs->users > n_fs)
74907+ if (atomic_read(&p->fs->users) > n_fs)
74908 bprm->unsafe |= LSM_UNSAFE_SHARE;
74909 else
74910 p->fs->in_exec = 1;
74911@@ -1472,6 +1551,31 @@ static int exec_binprm(struct linux_binprm *bprm)
74912 return ret;
74913 }
74914
74915+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74916+static DEFINE_PER_CPU(u64, exec_counter);
74917+static int __init init_exec_counters(void)
74918+{
74919+ unsigned int cpu;
74920+
74921+ for_each_possible_cpu(cpu) {
74922+ per_cpu(exec_counter, cpu) = (u64)cpu;
74923+ }
74924+
74925+ return 0;
74926+}
74927+early_initcall(init_exec_counters);
74928+static inline void increment_exec_counter(void)
74929+{
74930+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
74931+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
74932+}
74933+#else
74934+static inline void increment_exec_counter(void) {}
74935+#endif
74936+
74937+extern void gr_handle_exec_args(struct linux_binprm *bprm,
74938+ struct user_arg_ptr argv);
74939+
74940 /*
74941 * sys_execve() executes a new program.
74942 */
74943@@ -1480,6 +1584,11 @@ static int do_execveat_common(int fd, struct filename *filename,
74944 struct user_arg_ptr envp,
74945 int flags)
74946 {
74947+#ifdef CONFIG_GRKERNSEC
74948+ struct file *old_exec_file;
74949+ struct acl_subject_label *old_acl;
74950+ struct rlimit old_rlim[RLIM_NLIMITS];
74951+#endif
74952 char *pathbuf = NULL;
74953 struct linux_binprm *bprm;
74954 struct file *file;
74955@@ -1489,6 +1598,8 @@ static int do_execveat_common(int fd, struct filename *filename,
74956 if (IS_ERR(filename))
74957 return PTR_ERR(filename);
74958
74959+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
74960+
74961 /*
74962 * We move the actual failure in case of RLIMIT_NPROC excess from
74963 * set*uid() to execve() because too many poorly written programs
74964@@ -1526,6 +1637,11 @@ static int do_execveat_common(int fd, struct filename *filename,
74965 if (IS_ERR(file))
74966 goto out_unmark;
74967
74968+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
74969+ retval = -EPERM;
74970+ goto out_unmark;
74971+ }
74972+
74973 sched_exec();
74974
74975 bprm->file = file;
74976@@ -1552,6 +1668,11 @@ static int do_execveat_common(int fd, struct filename *filename,
74977 }
74978 bprm->interp = bprm->filename;
74979
74980+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
74981+ retval = -EACCES;
74982+ goto out_unmark;
74983+ }
74984+
74985 retval = bprm_mm_init(bprm);
74986 if (retval)
74987 goto out_unmark;
74988@@ -1568,24 +1689,70 @@ static int do_execveat_common(int fd, struct filename *filename,
74989 if (retval < 0)
74990 goto out;
74991
74992+#ifdef CONFIG_GRKERNSEC
74993+ old_acl = current->acl;
74994+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
74995+ old_exec_file = current->exec_file;
74996+ get_file(file);
74997+ current->exec_file = file;
74998+#endif
74999+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75000+ /* limit suid stack to 8MB
75001+ * we saved the old limits above and will restore them if this exec fails
75002+ */
75003+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
75004+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
75005+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
75006+#endif
75007+
75008+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
75009+ retval = -EPERM;
75010+ goto out_fail;
75011+ }
75012+
75013+ if (!gr_tpe_allow(file)) {
75014+ retval = -EACCES;
75015+ goto out_fail;
75016+ }
75017+
75018+ if (gr_check_crash_exec(file)) {
75019+ retval = -EACCES;
75020+ goto out_fail;
75021+ }
75022+
75023+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
75024+ bprm->unsafe);
75025+ if (retval < 0)
75026+ goto out_fail;
75027+
75028 retval = copy_strings_kernel(1, &bprm->filename, bprm);
75029 if (retval < 0)
75030- goto out;
75031+ goto out_fail;
75032
75033 bprm->exec = bprm->p;
75034 retval = copy_strings(bprm->envc, envp, bprm);
75035 if (retval < 0)
75036- goto out;
75037+ goto out_fail;
75038
75039 retval = copy_strings(bprm->argc, argv, bprm);
75040 if (retval < 0)
75041- goto out;
75042+ goto out_fail;
75043+
75044+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
75045+
75046+ gr_handle_exec_args(bprm, argv);
75047
75048 retval = exec_binprm(bprm);
75049 if (retval < 0)
75050- goto out;
75051+ goto out_fail;
75052+#ifdef CONFIG_GRKERNSEC
75053+ if (old_exec_file)
75054+ fput(old_exec_file);
75055+#endif
75056
75057 /* execve succeeded */
75058+
75059+ increment_exec_counter();
75060 current->fs->in_exec = 0;
75061 current->in_execve = 0;
75062 acct_update_integrals(current);
75063@@ -1597,6 +1764,14 @@ static int do_execveat_common(int fd, struct filename *filename,
75064 put_files_struct(displaced);
75065 return retval;
75066
75067+out_fail:
75068+#ifdef CONFIG_GRKERNSEC
75069+ current->acl = old_acl;
75070+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
75071+ fput(current->exec_file);
75072+ current->exec_file = old_exec_file;
75073+#endif
75074+
75075 out:
75076 if (bprm->mm) {
75077 acct_arg_size(bprm, 0);
75078@@ -1743,3 +1918,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
75079 argv, envp, flags);
75080 }
75081 #endif
75082+
75083+int pax_check_flags(unsigned long *flags)
75084+{
75085+ int retval = 0;
75086+
75087+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
75088+ if (*flags & MF_PAX_SEGMEXEC)
75089+ {
75090+ *flags &= ~MF_PAX_SEGMEXEC;
75091+ retval = -EINVAL;
75092+ }
75093+#endif
75094+
75095+ if ((*flags & MF_PAX_PAGEEXEC)
75096+
75097+#ifdef CONFIG_PAX_PAGEEXEC
75098+ && (*flags & MF_PAX_SEGMEXEC)
75099+#endif
75100+
75101+ )
75102+ {
75103+ *flags &= ~MF_PAX_PAGEEXEC;
75104+ retval = -EINVAL;
75105+ }
75106+
75107+ if ((*flags & MF_PAX_MPROTECT)
75108+
75109+#ifdef CONFIG_PAX_MPROTECT
75110+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75111+#endif
75112+
75113+ )
75114+ {
75115+ *flags &= ~MF_PAX_MPROTECT;
75116+ retval = -EINVAL;
75117+ }
75118+
75119+ if ((*flags & MF_PAX_EMUTRAMP)
75120+
75121+#ifdef CONFIG_PAX_EMUTRAMP
75122+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75123+#endif
75124+
75125+ )
75126+ {
75127+ *flags &= ~MF_PAX_EMUTRAMP;
75128+ retval = -EINVAL;
75129+ }
75130+
75131+ return retval;
75132+}
75133+
75134+EXPORT_SYMBOL(pax_check_flags);
75135+
75136+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
75137+char *pax_get_path(const struct path *path, char *buf, int buflen)
75138+{
75139+ char *pathname = d_path(path, buf, buflen);
75140+
75141+ if (IS_ERR(pathname))
75142+ goto toolong;
75143+
75144+ pathname = mangle_path(buf, pathname, "\t\n\\");
75145+ if (!pathname)
75146+ goto toolong;
75147+
75148+ *pathname = 0;
75149+ return buf;
75150+
75151+toolong:
75152+ return "<path too long>";
75153+}
75154+EXPORT_SYMBOL(pax_get_path);
75155+
75156+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
75157+{
75158+ struct task_struct *tsk = current;
75159+ struct mm_struct *mm = current->mm;
75160+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
75161+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
75162+ char *path_exec = NULL;
75163+ char *path_fault = NULL;
75164+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
75165+ siginfo_t info = { };
75166+
75167+ if (buffer_exec && buffer_fault) {
75168+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
75169+
75170+ down_read(&mm->mmap_sem);
75171+ vma = mm->mmap;
75172+ while (vma && (!vma_exec || !vma_fault)) {
75173+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
75174+ vma_exec = vma;
75175+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
75176+ vma_fault = vma;
75177+ vma = vma->vm_next;
75178+ }
75179+ if (vma_exec)
75180+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
75181+ if (vma_fault) {
75182+ start = vma_fault->vm_start;
75183+ end = vma_fault->vm_end;
75184+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
75185+ if (vma_fault->vm_file)
75186+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
75187+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
75188+ path_fault = "<heap>";
75189+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
75190+ path_fault = "<stack>";
75191+ else
75192+ path_fault = "<anonymous mapping>";
75193+ }
75194+ up_read(&mm->mmap_sem);
75195+ }
75196+ if (tsk->signal->curr_ip)
75197+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
75198+ else
75199+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
75200+ 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),
75201+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
75202+ free_page((unsigned long)buffer_exec);
75203+ free_page((unsigned long)buffer_fault);
75204+ pax_report_insns(regs, pc, sp);
75205+ info.si_signo = SIGKILL;
75206+ info.si_errno = 0;
75207+ info.si_code = SI_KERNEL;
75208+ info.si_pid = 0;
75209+ info.si_uid = 0;
75210+ do_coredump(&info);
75211+}
75212+#endif
75213+
75214+#ifdef CONFIG_PAX_REFCOUNT
75215+void pax_report_refcount_overflow(struct pt_regs *regs)
75216+{
75217+ if (current->signal->curr_ip)
75218+ printk(KERN_EMERG "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
75219+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
75220+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75221+ else
75222+ printk(KERN_EMERG "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
75223+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75224+ print_symbol(KERN_EMERG "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
75225+ preempt_disable();
75226+ show_regs(regs);
75227+ preempt_enable();
75228+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
75229+}
75230+#endif
75231+
75232+#ifdef CONFIG_PAX_USERCOPY
75233+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
75234+static noinline int check_stack_object(const void *obj, unsigned long len)
75235+{
75236+ const void * const stack = task_stack_page(current);
75237+ const void * const stackend = stack + THREAD_SIZE;
75238+
75239+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75240+ const void *frame = NULL;
75241+ const void *oldframe;
75242+#endif
75243+
75244+ if (obj + len < obj)
75245+ return -1;
75246+
75247+ if (obj + len <= stack || stackend <= obj)
75248+ return 0;
75249+
75250+ if (obj < stack || stackend < obj + len)
75251+ return -1;
75252+
75253+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75254+ oldframe = __builtin_frame_address(1);
75255+ if (oldframe)
75256+ frame = __builtin_frame_address(2);
75257+ /*
75258+ low ----------------------------------------------> high
75259+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
75260+ ^----------------^
75261+ allow copies only within here
75262+ */
75263+ while (stack <= frame && frame < stackend) {
75264+ /* if obj + len extends past the last frame, this
75265+ check won't pass and the next frame will be 0,
75266+ causing us to bail out and correctly report
75267+ the copy as invalid
75268+ */
75269+ if (obj + len <= frame)
75270+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
75271+ oldframe = frame;
75272+ frame = *(const void * const *)frame;
75273+ }
75274+ return -1;
75275+#else
75276+ return 1;
75277+#endif
75278+}
75279+
75280+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
75281+{
75282+ if (current->signal->curr_ip)
75283+ printk(KERN_EMERG "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75284+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75285+ else
75286+ printk(KERN_EMERG "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75287+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75288+ dump_stack();
75289+ gr_handle_kernel_exploit();
75290+ do_group_exit(SIGKILL);
75291+}
75292+#endif
75293+
75294+#ifdef CONFIG_PAX_USERCOPY
75295+
75296+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
75297+{
75298+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
75299+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
75300+#ifdef CONFIG_MODULES
75301+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
75302+#else
75303+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
75304+#endif
75305+
75306+#else
75307+ unsigned long textlow = (unsigned long)_stext;
75308+ unsigned long texthigh = (unsigned long)_etext;
75309+
75310+#ifdef CONFIG_X86_64
75311+ /* check against linear mapping as well */
75312+ if (high > (unsigned long)__va(__pa(textlow)) &&
75313+ low < (unsigned long)__va(__pa(texthigh)))
75314+ return true;
75315+#endif
75316+
75317+#endif
75318+
75319+ if (high <= textlow || low >= texthigh)
75320+ return false;
75321+ else
75322+ return true;
75323+}
75324+#endif
75325+
75326+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
75327+{
75328+#ifdef CONFIG_PAX_USERCOPY
75329+ const char *type;
75330+#endif
75331+
75332+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
75333+ unsigned long stackstart = (unsigned long)task_stack_page(current);
75334+ unsigned long currentsp = (unsigned long)&stackstart;
75335+ if (unlikely((currentsp < stackstart + 512 ||
75336+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
75337+ BUG();
75338+#endif
75339+
75340+#ifndef CONFIG_PAX_USERCOPY_DEBUG
75341+ if (const_size)
75342+ return;
75343+#endif
75344+
75345+#ifdef CONFIG_PAX_USERCOPY
75346+ if (!n)
75347+ return;
75348+
75349+ type = check_heap_object(ptr, n);
75350+ if (!type) {
75351+ int ret = check_stack_object(ptr, n);
75352+ if (ret == 1 || ret == 2)
75353+ return;
75354+ if (ret == 0) {
75355+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
75356+ type = "<kernel text>";
75357+ else
75358+ return;
75359+ } else
75360+ type = "<process stack>";
75361+ }
75362+
75363+ pax_report_usercopy(ptr, n, to_user, type);
75364+#endif
75365+
75366+}
75367+EXPORT_SYMBOL(__check_object_size);
75368+
75369+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
75370+void __used pax_track_stack(void)
75371+{
75372+ unsigned long sp = (unsigned long)&sp;
75373+ if (sp < current_thread_info()->lowest_stack &&
75374+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
75375+ current_thread_info()->lowest_stack = sp;
75376+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
75377+ BUG();
75378+}
75379+EXPORT_SYMBOL(pax_track_stack);
75380+#endif
75381+
75382+#ifdef CONFIG_PAX_SIZE_OVERFLOW
75383+void __nocapture(1, 3, 4) __used report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
75384+{
75385+ printk(KERN_EMERG "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
75386+ dump_stack();
75387+ do_group_exit(SIGKILL);
75388+}
75389+EXPORT_SYMBOL(report_size_overflow);
75390+#endif
75391diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
75392index 9f9992b..8b59411 100644
75393--- a/fs/ext2/balloc.c
75394+++ b/fs/ext2/balloc.c
75395@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
75396
75397 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75398 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75399- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75400+ if (free_blocks < root_blocks + 1 &&
75401 !uid_eq(sbi->s_resuid, current_fsuid()) &&
75402 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75403- !in_group_p (sbi->s_resgid))) {
75404+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75405 return 0;
75406 }
75407 return 1;
75408diff --git a/fs/ext2/super.c b/fs/ext2/super.c
75409index d0e746e..82e06f0 100644
75410--- a/fs/ext2/super.c
75411+++ b/fs/ext2/super.c
75412@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
75413 #ifdef CONFIG_EXT2_FS_XATTR
75414 if (test_opt(sb, XATTR_USER))
75415 seq_puts(seq, ",user_xattr");
75416- if (!test_opt(sb, XATTR_USER) &&
75417- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
75418+ if (!test_opt(sb, XATTR_USER))
75419 seq_puts(seq, ",nouser_xattr");
75420- }
75421 #endif
75422
75423 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75424@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
75425 if (def_mount_opts & EXT2_DEFM_UID16)
75426 set_opt(sbi->s_mount_opt, NO_UID32);
75427 #ifdef CONFIG_EXT2_FS_XATTR
75428- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
75429- set_opt(sbi->s_mount_opt, XATTR_USER);
75430+ /* always enable user xattrs */
75431+ set_opt(sbi->s_mount_opt, XATTR_USER);
75432 #endif
75433 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75434 if (def_mount_opts & EXT2_DEFM_ACL)
75435diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
75436index 0b6bfd3..93a2964 100644
75437--- a/fs/ext2/xattr.c
75438+++ b/fs/ext2/xattr.c
75439@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
75440 struct buffer_head *bh = NULL;
75441 struct ext2_xattr_entry *entry;
75442 char *end;
75443- size_t rest = buffer_size;
75444+ size_t rest = buffer_size, total_size = 0;
75445 int error;
75446
75447 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
75448@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
75449 buffer += size;
75450 }
75451 rest -= size;
75452+ total_size += size;
75453 }
75454 }
75455- error = buffer_size - rest; /* total size */
75456+ error = total_size;
75457
75458 cleanup:
75459 brelse(bh);
75460diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
75461index 158b5d4..2432610 100644
75462--- a/fs/ext3/balloc.c
75463+++ b/fs/ext3/balloc.c
75464@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
75465
75466 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75467 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75468- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75469+ if (free_blocks < root_blocks + 1 &&
75470 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
75471 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75472- !in_group_p (sbi->s_resgid))) {
75473+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75474 return 0;
75475 }
75476 return 1;
75477diff --git a/fs/ext3/super.c b/fs/ext3/super.c
75478index a9312f0..e3a11ec 100644
75479--- a/fs/ext3/super.c
75480+++ b/fs/ext3/super.c
75481@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
75482 #ifdef CONFIG_EXT3_FS_XATTR
75483 if (test_opt(sb, XATTR_USER))
75484 seq_puts(seq, ",user_xattr");
75485- if (!test_opt(sb, XATTR_USER) &&
75486- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
75487+ if (!test_opt(sb, XATTR_USER))
75488 seq_puts(seq, ",nouser_xattr");
75489- }
75490 #endif
75491 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75492 if (test_opt(sb, POSIX_ACL))
75493@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
75494 if (def_mount_opts & EXT3_DEFM_UID16)
75495 set_opt(sbi->s_mount_opt, NO_UID32);
75496 #ifdef CONFIG_EXT3_FS_XATTR
75497- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
75498- set_opt(sbi->s_mount_opt, XATTR_USER);
75499+ /* always enable user xattrs */
75500+ set_opt(sbi->s_mount_opt, XATTR_USER);
75501 #endif
75502 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75503 if (def_mount_opts & EXT3_DEFM_ACL)
75504diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
75505index 7cf3650..e3f4a51 100644
75506--- a/fs/ext3/xattr.c
75507+++ b/fs/ext3/xattr.c
75508@@ -330,7 +330,7 @@ static int
75509 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75510 char *buffer, size_t buffer_size)
75511 {
75512- size_t rest = buffer_size;
75513+ size_t rest = buffer_size, total_size = 0;
75514
75515 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
75516 const struct xattr_handler *handler =
75517@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75518 buffer += size;
75519 }
75520 rest -= size;
75521+ total_size += size;
75522 }
75523 }
75524- return buffer_size - rest;
75525+ return total_size;
75526 }
75527
75528 static int
75529diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
75530index 955bf49a..44ee359 100644
75531--- a/fs/ext4/balloc.c
75532+++ b/fs/ext4/balloc.c
75533@@ -556,8 +556,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
75534 /* Hm, nope. Are (enough) root reserved clusters available? */
75535 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
75536 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
75537- capable(CAP_SYS_RESOURCE) ||
75538- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
75539+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
75540+ capable_nolog(CAP_SYS_RESOURCE)) {
75541
75542 if (free_clusters >= (nclusters + dirty_clusters +
75543 resv_clusters))
75544diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
75545index 9a83f14..1dd1b38 100644
75546--- a/fs/ext4/ext4.h
75547+++ b/fs/ext4/ext4.h
75548@@ -1310,19 +1310,19 @@ struct ext4_sb_info {
75549 unsigned long s_mb_last_start;
75550
75551 /* stats for buddy allocator */
75552- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
75553- atomic_t s_bal_success; /* we found long enough chunks */
75554- atomic_t s_bal_allocated; /* in blocks */
75555- atomic_t s_bal_ex_scanned; /* total extents scanned */
75556- atomic_t s_bal_goals; /* goal hits */
75557- atomic_t s_bal_breaks; /* too long searches */
75558- atomic_t s_bal_2orders; /* 2^order hits */
75559+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
75560+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
75561+ atomic_unchecked_t s_bal_allocated; /* in blocks */
75562+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
75563+ atomic_unchecked_t s_bal_goals; /* goal hits */
75564+ atomic_unchecked_t s_bal_breaks; /* too long searches */
75565+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
75566 spinlock_t s_bal_lock;
75567 unsigned long s_mb_buddies_generated;
75568 unsigned long long s_mb_generation_time;
75569- atomic_t s_mb_lost_chunks;
75570- atomic_t s_mb_preallocated;
75571- atomic_t s_mb_discarded;
75572+ atomic_unchecked_t s_mb_lost_chunks;
75573+ atomic_unchecked_t s_mb_preallocated;
75574+ atomic_unchecked_t s_mb_discarded;
75575 atomic_t s_lock_busy;
75576
75577 /* locality groups */
75578diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
75579index 4126048..3788867 100644
75580--- a/fs/ext4/mballoc.c
75581+++ b/fs/ext4/mballoc.c
75582@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
75583 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
75584
75585 if (EXT4_SB(sb)->s_mb_stats)
75586- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
75587+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
75588
75589 break;
75590 }
75591@@ -2211,7 +2211,7 @@ repeat:
75592 ac->ac_status = AC_STATUS_CONTINUE;
75593 ac->ac_flags |= EXT4_MB_HINT_FIRST;
75594 cr = 3;
75595- atomic_inc(&sbi->s_mb_lost_chunks);
75596+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
75597 goto repeat;
75598 }
75599 }
75600@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
75601 if (sbi->s_mb_stats) {
75602 ext4_msg(sb, KERN_INFO,
75603 "mballoc: %u blocks %u reqs (%u success)",
75604- atomic_read(&sbi->s_bal_allocated),
75605- atomic_read(&sbi->s_bal_reqs),
75606- atomic_read(&sbi->s_bal_success));
75607+ atomic_read_unchecked(&sbi->s_bal_allocated),
75608+ atomic_read_unchecked(&sbi->s_bal_reqs),
75609+ atomic_read_unchecked(&sbi->s_bal_success));
75610 ext4_msg(sb, KERN_INFO,
75611 "mballoc: %u extents scanned, %u goal hits, "
75612 "%u 2^N hits, %u breaks, %u lost",
75613- atomic_read(&sbi->s_bal_ex_scanned),
75614- atomic_read(&sbi->s_bal_goals),
75615- atomic_read(&sbi->s_bal_2orders),
75616- atomic_read(&sbi->s_bal_breaks),
75617- atomic_read(&sbi->s_mb_lost_chunks));
75618+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
75619+ atomic_read_unchecked(&sbi->s_bal_goals),
75620+ atomic_read_unchecked(&sbi->s_bal_2orders),
75621+ atomic_read_unchecked(&sbi->s_bal_breaks),
75622+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
75623 ext4_msg(sb, KERN_INFO,
75624 "mballoc: %lu generated and it took %Lu",
75625 sbi->s_mb_buddies_generated,
75626 sbi->s_mb_generation_time);
75627 ext4_msg(sb, KERN_INFO,
75628 "mballoc: %u preallocated, %u discarded",
75629- atomic_read(&sbi->s_mb_preallocated),
75630- atomic_read(&sbi->s_mb_discarded));
75631+ atomic_read_unchecked(&sbi->s_mb_preallocated),
75632+ atomic_read_unchecked(&sbi->s_mb_discarded));
75633 }
75634
75635 free_percpu(sbi->s_locality_groups);
75636@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
75637 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
75638
75639 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
75640- atomic_inc(&sbi->s_bal_reqs);
75641- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
75642+ atomic_inc_unchecked(&sbi->s_bal_reqs);
75643+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
75644 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
75645- atomic_inc(&sbi->s_bal_success);
75646- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
75647+ atomic_inc_unchecked(&sbi->s_bal_success);
75648+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
75649 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
75650 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
75651- atomic_inc(&sbi->s_bal_goals);
75652+ atomic_inc_unchecked(&sbi->s_bal_goals);
75653 if (ac->ac_found > sbi->s_mb_max_to_scan)
75654- atomic_inc(&sbi->s_bal_breaks);
75655+ atomic_inc_unchecked(&sbi->s_bal_breaks);
75656 }
75657
75658 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
75659@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
75660 trace_ext4_mb_new_inode_pa(ac, pa);
75661
75662 ext4_mb_use_inode_pa(ac, pa);
75663- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
75664+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
75665
75666 ei = EXT4_I(ac->ac_inode);
75667 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
75668@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
75669 trace_ext4_mb_new_group_pa(ac, pa);
75670
75671 ext4_mb_use_group_pa(ac, pa);
75672- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
75673+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
75674
75675 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
75676 lg = ac->ac_lg;
75677@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
75678 * from the bitmap and continue.
75679 */
75680 }
75681- atomic_add(free, &sbi->s_mb_discarded);
75682+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
75683
75684 return err;
75685 }
75686@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
75687 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
75688 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
75689 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
75690- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
75691+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
75692 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
75693
75694 return 0;
75695diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
75696index 8313ca3..8a37d08 100644
75697--- a/fs/ext4/mmp.c
75698+++ b/fs/ext4/mmp.c
75699@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
75700 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
75701 const char *function, unsigned int line, const char *msg)
75702 {
75703- __ext4_warning(sb, function, line, msg);
75704+ __ext4_warning(sb, function, line, "%s", msg);
75705 __ext4_warning(sb, function, line,
75706 "MMP failure info: last update time: %llu, last update "
75707 "node: %s, last update device: %s\n",
75708diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
75709index cf0c472..ddf284d 100644
75710--- a/fs/ext4/resize.c
75711+++ b/fs/ext4/resize.c
75712@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75713
75714 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
75715 for (count2 = count; count > 0; count -= count2, block += count2) {
75716- ext4_fsblk_t start;
75717+ ext4_fsblk_t start, diff;
75718 struct buffer_head *bh;
75719 ext4_group_t group;
75720 int err;
75721@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75722 start = ext4_group_first_block_no(sb, group);
75723 group -= flex_gd->groups[0].group;
75724
75725- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
75726- if (count2 > count)
75727- count2 = count;
75728-
75729 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
75730 BUG_ON(flex_gd->count > 1);
75731 continue;
75732@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75733 err = ext4_journal_get_write_access(handle, bh);
75734 if (err)
75735 return err;
75736+
75737+ diff = block - start;
75738+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
75739+ if (count2 > count)
75740+ count2 = count;
75741+
75742 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
75743- block - start, count2);
75744- ext4_set_bits(bh->b_data, block - start, count2);
75745+ diff, count2);
75746+ ext4_set_bits(bh->b_data, diff, count2);
75747
75748 err = ext4_handle_dirty_metadata(handle, NULL, bh);
75749 if (unlikely(err))
75750diff --git a/fs/ext4/super.c b/fs/ext4/super.c
75751index ca12affd..18b4b75 100644
75752--- a/fs/ext4/super.c
75753+++ b/fs/ext4/super.c
75754@@ -1233,7 +1233,7 @@ static ext4_fsblk_t get_sb_block(void **data)
75755 }
75756
75757 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
75758-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
75759+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
75760 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
75761
75762 #ifdef CONFIG_QUOTA
75763@@ -2443,7 +2443,7 @@ struct ext4_attr {
75764 int offset;
75765 int deprecated_val;
75766 } u;
75767-};
75768+} __do_const;
75769
75770 static int parse_strtoull(const char *buf,
75771 unsigned long long max, unsigned long long *value)
75772diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
75773index 16e28c0..728c282 100644
75774--- a/fs/ext4/xattr.c
75775+++ b/fs/ext4/xattr.c
75776@@ -398,7 +398,7 @@ static int
75777 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
75778 char *buffer, size_t buffer_size)
75779 {
75780- size_t rest = buffer_size;
75781+ size_t rest = buffer_size, total_size = 0;
75782
75783 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
75784 const struct xattr_handler *handler =
75785@@ -415,9 +415,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
75786 buffer += size;
75787 }
75788 rest -= size;
75789+ total_size += size;
75790 }
75791 }
75792- return buffer_size - rest;
75793+ return total_size;
75794 }
75795
75796 static int
75797diff --git a/fs/fcntl.c b/fs/fcntl.c
75798index ee85cd4..9dd0d20 100644
75799--- a/fs/fcntl.c
75800+++ b/fs/fcntl.c
75801@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
75802 int force)
75803 {
75804 security_file_set_fowner(filp);
75805+ if (gr_handle_chroot_fowner(pid, type))
75806+ return;
75807+ if (gr_check_protected_task_fowner(pid, type))
75808+ return;
75809 f_modown(filp, pid, type, force);
75810 }
75811 EXPORT_SYMBOL(__f_setown);
75812diff --git a/fs/fhandle.c b/fs/fhandle.c
75813index d59712d..2281df9 100644
75814--- a/fs/fhandle.c
75815+++ b/fs/fhandle.c
75816@@ -8,6 +8,7 @@
75817 #include <linux/fs_struct.h>
75818 #include <linux/fsnotify.h>
75819 #include <linux/personality.h>
75820+#include <linux/grsecurity.h>
75821 #include <asm/uaccess.h>
75822 #include "internal.h"
75823 #include "mount.h"
75824@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
75825 } else
75826 retval = 0;
75827 /* copy the mount id */
75828- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
75829- sizeof(*mnt_id)) ||
75830+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
75831 copy_to_user(ufh, handle,
75832 sizeof(struct file_handle) + handle_bytes))
75833 retval = -EFAULT;
75834@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
75835 * the directory. Ideally we would like CAP_DAC_SEARCH.
75836 * But we don't have that
75837 */
75838- if (!capable(CAP_DAC_READ_SEARCH)) {
75839+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
75840 retval = -EPERM;
75841 goto out_err;
75842 }
75843diff --git a/fs/file.c b/fs/file.c
75844index 93c5f89..ed75817 100644
75845--- a/fs/file.c
75846+++ b/fs/file.c
75847@@ -16,6 +16,7 @@
75848 #include <linux/slab.h>
75849 #include <linux/vmalloc.h>
75850 #include <linux/file.h>
75851+#include <linux/security.h>
75852 #include <linux/fdtable.h>
75853 #include <linux/bitops.h>
75854 #include <linux/interrupt.h>
75855@@ -139,7 +140,7 @@ out:
75856 * Return <0 error code on error; 1 on successful completion.
75857 * The files->file_lock should be held on entry, and will be held on exit.
75858 */
75859-static int expand_fdtable(struct files_struct *files, int nr)
75860+static int expand_fdtable(struct files_struct *files, unsigned int nr)
75861 __releases(files->file_lock)
75862 __acquires(files->file_lock)
75863 {
75864@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
75865 * expanded and execution may have blocked.
75866 * The files->file_lock should be held on entry, and will be held on exit.
75867 */
75868-static int expand_files(struct files_struct *files, int nr)
75869+static int expand_files(struct files_struct *files, unsigned int nr)
75870 {
75871 struct fdtable *fdt;
75872
75873@@ -799,6 +800,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
75874 if (!file)
75875 return __close_fd(files, fd);
75876
75877+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
75878 if (fd >= rlimit(RLIMIT_NOFILE))
75879 return -EBADF;
75880
75881@@ -825,6 +827,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
75882 if (unlikely(oldfd == newfd))
75883 return -EINVAL;
75884
75885+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
75886 if (newfd >= rlimit(RLIMIT_NOFILE))
75887 return -EBADF;
75888
75889@@ -880,6 +883,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
75890 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
75891 {
75892 int err;
75893+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
75894 if (from >= rlimit(RLIMIT_NOFILE))
75895 return -EINVAL;
75896 err = alloc_fd(from, flags);
75897diff --git a/fs/filesystems.c b/fs/filesystems.c
75898index 5797d45..7d7d79a 100644
75899--- a/fs/filesystems.c
75900+++ b/fs/filesystems.c
75901@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
75902 int len = dot ? dot - name : strlen(name);
75903
75904 fs = __get_fs_type(name, len);
75905+#ifdef CONFIG_GRKERNSEC_MODHARDEN
75906+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
75907+#else
75908 if (!fs && (request_module("fs-%.*s", len, name) == 0))
75909+#endif
75910 fs = __get_fs_type(name, len);
75911
75912 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
75913diff --git a/fs/fs_struct.c b/fs/fs_struct.c
75914index 7dca743..1ff87ae 100644
75915--- a/fs/fs_struct.c
75916+++ b/fs/fs_struct.c
75917@@ -4,6 +4,7 @@
75918 #include <linux/path.h>
75919 #include <linux/slab.h>
75920 #include <linux/fs_struct.h>
75921+#include <linux/grsecurity.h>
75922 #include "internal.h"
75923
75924 /*
75925@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
75926 struct path old_root;
75927
75928 path_get(path);
75929+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
75930 spin_lock(&fs->lock);
75931 write_seqcount_begin(&fs->seq);
75932 old_root = fs->root;
75933 fs->root = *path;
75934+ gr_set_chroot_entries(current, path);
75935 write_seqcount_end(&fs->seq);
75936 spin_unlock(&fs->lock);
75937- if (old_root.dentry)
75938+ if (old_root.dentry) {
75939+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
75940 path_put(&old_root);
75941+ }
75942 }
75943
75944 /*
75945@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
75946 int hits = 0;
75947 spin_lock(&fs->lock);
75948 write_seqcount_begin(&fs->seq);
75949+ /* this root replacement is only done by pivot_root,
75950+ leave grsec's chroot tagging alone for this task
75951+ so that a pivoted root isn't treated as a chroot
75952+ */
75953 hits += replace_path(&fs->root, old_root, new_root);
75954 hits += replace_path(&fs->pwd, old_root, new_root);
75955 write_seqcount_end(&fs->seq);
75956@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
75957
75958 void free_fs_struct(struct fs_struct *fs)
75959 {
75960+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
75961 path_put(&fs->root);
75962 path_put(&fs->pwd);
75963 kmem_cache_free(fs_cachep, fs);
75964@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
75965 task_lock(tsk);
75966 spin_lock(&fs->lock);
75967 tsk->fs = NULL;
75968- kill = !--fs->users;
75969+ gr_clear_chroot_entries(tsk);
75970+ kill = !atomic_dec_return(&fs->users);
75971 spin_unlock(&fs->lock);
75972 task_unlock(tsk);
75973 if (kill)
75974@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
75975 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
75976 /* We don't need to lock fs - think why ;-) */
75977 if (fs) {
75978- fs->users = 1;
75979+ atomic_set(&fs->users, 1);
75980 fs->in_exec = 0;
75981 spin_lock_init(&fs->lock);
75982 seqcount_init(&fs->seq);
75983@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
75984 spin_lock(&old->lock);
75985 fs->root = old->root;
75986 path_get(&fs->root);
75987+ /* instead of calling gr_set_chroot_entries here,
75988+ we call it from every caller of this function
75989+ */
75990 fs->pwd = old->pwd;
75991 path_get(&fs->pwd);
75992 spin_unlock(&old->lock);
75993+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
75994 }
75995 return fs;
75996 }
75997@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
75998
75999 task_lock(current);
76000 spin_lock(&fs->lock);
76001- kill = !--fs->users;
76002+ kill = !atomic_dec_return(&fs->users);
76003 current->fs = new_fs;
76004+ gr_set_chroot_entries(current, &new_fs->root);
76005 spin_unlock(&fs->lock);
76006 task_unlock(current);
76007
76008@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
76009
76010 int current_umask(void)
76011 {
76012- return current->fs->umask;
76013+ return current->fs->umask | gr_acl_umask();
76014 }
76015 EXPORT_SYMBOL(current_umask);
76016
76017 /* to be mentioned only in INIT_TASK */
76018 struct fs_struct init_fs = {
76019- .users = 1,
76020+ .users = ATOMIC_INIT(1),
76021 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
76022 .seq = SEQCNT_ZERO(init_fs.seq),
76023 .umask = 0022,
76024diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
76025index 89acec7..a575262 100644
76026--- a/fs/fscache/cookie.c
76027+++ b/fs/fscache/cookie.c
76028@@ -19,7 +19,7 @@
76029
76030 struct kmem_cache *fscache_cookie_jar;
76031
76032-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
76033+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
76034
76035 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
76036 static int fscache_alloc_object(struct fscache_cache *cache,
76037@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
76038 parent ? (char *) parent->def->name : "<no-parent>",
76039 def->name, netfs_data, enable);
76040
76041- fscache_stat(&fscache_n_acquires);
76042+ fscache_stat_unchecked(&fscache_n_acquires);
76043
76044 /* if there's no parent cookie, then we don't create one here either */
76045 if (!parent) {
76046- fscache_stat(&fscache_n_acquires_null);
76047+ fscache_stat_unchecked(&fscache_n_acquires_null);
76048 _leave(" [no parent]");
76049 return NULL;
76050 }
76051@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76052 /* allocate and initialise a cookie */
76053 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
76054 if (!cookie) {
76055- fscache_stat(&fscache_n_acquires_oom);
76056+ fscache_stat_unchecked(&fscache_n_acquires_oom);
76057 _leave(" [ENOMEM]");
76058 return NULL;
76059 }
76060@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
76061
76062 switch (cookie->def->type) {
76063 case FSCACHE_COOKIE_TYPE_INDEX:
76064- fscache_stat(&fscache_n_cookie_index);
76065+ fscache_stat_unchecked(&fscache_n_cookie_index);
76066 break;
76067 case FSCACHE_COOKIE_TYPE_DATAFILE:
76068- fscache_stat(&fscache_n_cookie_data);
76069+ fscache_stat_unchecked(&fscache_n_cookie_data);
76070 break;
76071 default:
76072- fscache_stat(&fscache_n_cookie_special);
76073+ fscache_stat_unchecked(&fscache_n_cookie_special);
76074 break;
76075 }
76076
76077@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76078 } else {
76079 atomic_dec(&parent->n_children);
76080 __fscache_cookie_put(cookie);
76081- fscache_stat(&fscache_n_acquires_nobufs);
76082+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
76083 _leave(" = NULL");
76084 return NULL;
76085 }
76086@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76087 }
76088 }
76089
76090- fscache_stat(&fscache_n_acquires_ok);
76091+ fscache_stat_unchecked(&fscache_n_acquires_ok);
76092 _leave(" = %p", cookie);
76093 return cookie;
76094 }
76095@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
76096 cache = fscache_select_cache_for_object(cookie->parent);
76097 if (!cache) {
76098 up_read(&fscache_addremove_sem);
76099- fscache_stat(&fscache_n_acquires_no_cache);
76100+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
76101 _leave(" = -ENOMEDIUM [no cache]");
76102 return -ENOMEDIUM;
76103 }
76104@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
76105 object = cache->ops->alloc_object(cache, cookie);
76106 fscache_stat_d(&fscache_n_cop_alloc_object);
76107 if (IS_ERR(object)) {
76108- fscache_stat(&fscache_n_object_no_alloc);
76109+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
76110 ret = PTR_ERR(object);
76111 goto error;
76112 }
76113
76114- fscache_stat(&fscache_n_object_alloc);
76115+ fscache_stat_unchecked(&fscache_n_object_alloc);
76116
76117- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
76118+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
76119
76120 _debug("ALLOC OBJ%x: %s {%lx}",
76121 object->debug_id, cookie->def->name, object->events);
76122@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
76123
76124 _enter("{%s}", cookie->def->name);
76125
76126- fscache_stat(&fscache_n_invalidates);
76127+ fscache_stat_unchecked(&fscache_n_invalidates);
76128
76129 /* Only permit invalidation of data files. Invalidating an index will
76130 * require the caller to release all its attachments to the tree rooted
76131@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
76132 {
76133 struct fscache_object *object;
76134
76135- fscache_stat(&fscache_n_updates);
76136+ fscache_stat_unchecked(&fscache_n_updates);
76137
76138 if (!cookie) {
76139- fscache_stat(&fscache_n_updates_null);
76140+ fscache_stat_unchecked(&fscache_n_updates_null);
76141 _leave(" [no cookie]");
76142 return;
76143 }
76144@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
76145 */
76146 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
76147 {
76148- fscache_stat(&fscache_n_relinquishes);
76149+ fscache_stat_unchecked(&fscache_n_relinquishes);
76150 if (retire)
76151- fscache_stat(&fscache_n_relinquishes_retire);
76152+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
76153
76154 if (!cookie) {
76155- fscache_stat(&fscache_n_relinquishes_null);
76156+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
76157 _leave(" [no cookie]");
76158 return;
76159 }
76160@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
76161 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
76162 goto inconsistent;
76163
76164- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
76165+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
76166
76167 __fscache_use_cookie(cookie);
76168 if (fscache_submit_op(object, op) < 0)
76169diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
76170index 7872a62..d91b19f 100644
76171--- a/fs/fscache/internal.h
76172+++ b/fs/fscache/internal.h
76173@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
76174 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
76175 extern int fscache_wait_for_operation_activation(struct fscache_object *,
76176 struct fscache_operation *,
76177- atomic_t *,
76178- atomic_t *,
76179+ atomic_unchecked_t *,
76180+ atomic_unchecked_t *,
76181 void (*)(struct fscache_operation *));
76182 extern void fscache_invalidate_writes(struct fscache_cookie *);
76183
76184@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
76185 * stats.c
76186 */
76187 #ifdef CONFIG_FSCACHE_STATS
76188-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76189-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76190+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76191+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76192
76193-extern atomic_t fscache_n_op_pend;
76194-extern atomic_t fscache_n_op_run;
76195-extern atomic_t fscache_n_op_enqueue;
76196-extern atomic_t fscache_n_op_deferred_release;
76197-extern atomic_t fscache_n_op_release;
76198-extern atomic_t fscache_n_op_gc;
76199-extern atomic_t fscache_n_op_cancelled;
76200-extern atomic_t fscache_n_op_rejected;
76201+extern atomic_unchecked_t fscache_n_op_pend;
76202+extern atomic_unchecked_t fscache_n_op_run;
76203+extern atomic_unchecked_t fscache_n_op_enqueue;
76204+extern atomic_unchecked_t fscache_n_op_deferred_release;
76205+extern atomic_unchecked_t fscache_n_op_release;
76206+extern atomic_unchecked_t fscache_n_op_gc;
76207+extern atomic_unchecked_t fscache_n_op_cancelled;
76208+extern atomic_unchecked_t fscache_n_op_rejected;
76209
76210-extern atomic_t fscache_n_attr_changed;
76211-extern atomic_t fscache_n_attr_changed_ok;
76212-extern atomic_t fscache_n_attr_changed_nobufs;
76213-extern atomic_t fscache_n_attr_changed_nomem;
76214-extern atomic_t fscache_n_attr_changed_calls;
76215+extern atomic_unchecked_t fscache_n_attr_changed;
76216+extern atomic_unchecked_t fscache_n_attr_changed_ok;
76217+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
76218+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
76219+extern atomic_unchecked_t fscache_n_attr_changed_calls;
76220
76221-extern atomic_t fscache_n_allocs;
76222-extern atomic_t fscache_n_allocs_ok;
76223-extern atomic_t fscache_n_allocs_wait;
76224-extern atomic_t fscache_n_allocs_nobufs;
76225-extern atomic_t fscache_n_allocs_intr;
76226-extern atomic_t fscache_n_allocs_object_dead;
76227-extern atomic_t fscache_n_alloc_ops;
76228-extern atomic_t fscache_n_alloc_op_waits;
76229+extern atomic_unchecked_t fscache_n_allocs;
76230+extern atomic_unchecked_t fscache_n_allocs_ok;
76231+extern atomic_unchecked_t fscache_n_allocs_wait;
76232+extern atomic_unchecked_t fscache_n_allocs_nobufs;
76233+extern atomic_unchecked_t fscache_n_allocs_intr;
76234+extern atomic_unchecked_t fscache_n_allocs_object_dead;
76235+extern atomic_unchecked_t fscache_n_alloc_ops;
76236+extern atomic_unchecked_t fscache_n_alloc_op_waits;
76237
76238-extern atomic_t fscache_n_retrievals;
76239-extern atomic_t fscache_n_retrievals_ok;
76240-extern atomic_t fscache_n_retrievals_wait;
76241-extern atomic_t fscache_n_retrievals_nodata;
76242-extern atomic_t fscache_n_retrievals_nobufs;
76243-extern atomic_t fscache_n_retrievals_intr;
76244-extern atomic_t fscache_n_retrievals_nomem;
76245-extern atomic_t fscache_n_retrievals_object_dead;
76246-extern atomic_t fscache_n_retrieval_ops;
76247-extern atomic_t fscache_n_retrieval_op_waits;
76248+extern atomic_unchecked_t fscache_n_retrievals;
76249+extern atomic_unchecked_t fscache_n_retrievals_ok;
76250+extern atomic_unchecked_t fscache_n_retrievals_wait;
76251+extern atomic_unchecked_t fscache_n_retrievals_nodata;
76252+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
76253+extern atomic_unchecked_t fscache_n_retrievals_intr;
76254+extern atomic_unchecked_t fscache_n_retrievals_nomem;
76255+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
76256+extern atomic_unchecked_t fscache_n_retrieval_ops;
76257+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
76258
76259-extern atomic_t fscache_n_stores;
76260-extern atomic_t fscache_n_stores_ok;
76261-extern atomic_t fscache_n_stores_again;
76262-extern atomic_t fscache_n_stores_nobufs;
76263-extern atomic_t fscache_n_stores_oom;
76264-extern atomic_t fscache_n_store_ops;
76265-extern atomic_t fscache_n_store_calls;
76266-extern atomic_t fscache_n_store_pages;
76267-extern atomic_t fscache_n_store_radix_deletes;
76268-extern atomic_t fscache_n_store_pages_over_limit;
76269+extern atomic_unchecked_t fscache_n_stores;
76270+extern atomic_unchecked_t fscache_n_stores_ok;
76271+extern atomic_unchecked_t fscache_n_stores_again;
76272+extern atomic_unchecked_t fscache_n_stores_nobufs;
76273+extern atomic_unchecked_t fscache_n_stores_oom;
76274+extern atomic_unchecked_t fscache_n_store_ops;
76275+extern atomic_unchecked_t fscache_n_store_calls;
76276+extern atomic_unchecked_t fscache_n_store_pages;
76277+extern atomic_unchecked_t fscache_n_store_radix_deletes;
76278+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
76279
76280-extern atomic_t fscache_n_store_vmscan_not_storing;
76281-extern atomic_t fscache_n_store_vmscan_gone;
76282-extern atomic_t fscache_n_store_vmscan_busy;
76283-extern atomic_t fscache_n_store_vmscan_cancelled;
76284-extern atomic_t fscache_n_store_vmscan_wait;
76285+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
76286+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
76287+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
76288+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
76289+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
76290
76291-extern atomic_t fscache_n_marks;
76292-extern atomic_t fscache_n_uncaches;
76293+extern atomic_unchecked_t fscache_n_marks;
76294+extern atomic_unchecked_t fscache_n_uncaches;
76295
76296-extern atomic_t fscache_n_acquires;
76297-extern atomic_t fscache_n_acquires_null;
76298-extern atomic_t fscache_n_acquires_no_cache;
76299-extern atomic_t fscache_n_acquires_ok;
76300-extern atomic_t fscache_n_acquires_nobufs;
76301-extern atomic_t fscache_n_acquires_oom;
76302+extern atomic_unchecked_t fscache_n_acquires;
76303+extern atomic_unchecked_t fscache_n_acquires_null;
76304+extern atomic_unchecked_t fscache_n_acquires_no_cache;
76305+extern atomic_unchecked_t fscache_n_acquires_ok;
76306+extern atomic_unchecked_t fscache_n_acquires_nobufs;
76307+extern atomic_unchecked_t fscache_n_acquires_oom;
76308
76309-extern atomic_t fscache_n_invalidates;
76310-extern atomic_t fscache_n_invalidates_run;
76311+extern atomic_unchecked_t fscache_n_invalidates;
76312+extern atomic_unchecked_t fscache_n_invalidates_run;
76313
76314-extern atomic_t fscache_n_updates;
76315-extern atomic_t fscache_n_updates_null;
76316-extern atomic_t fscache_n_updates_run;
76317+extern atomic_unchecked_t fscache_n_updates;
76318+extern atomic_unchecked_t fscache_n_updates_null;
76319+extern atomic_unchecked_t fscache_n_updates_run;
76320
76321-extern atomic_t fscache_n_relinquishes;
76322-extern atomic_t fscache_n_relinquishes_null;
76323-extern atomic_t fscache_n_relinquishes_waitcrt;
76324-extern atomic_t fscache_n_relinquishes_retire;
76325+extern atomic_unchecked_t fscache_n_relinquishes;
76326+extern atomic_unchecked_t fscache_n_relinquishes_null;
76327+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
76328+extern atomic_unchecked_t fscache_n_relinquishes_retire;
76329
76330-extern atomic_t fscache_n_cookie_index;
76331-extern atomic_t fscache_n_cookie_data;
76332-extern atomic_t fscache_n_cookie_special;
76333+extern atomic_unchecked_t fscache_n_cookie_index;
76334+extern atomic_unchecked_t fscache_n_cookie_data;
76335+extern atomic_unchecked_t fscache_n_cookie_special;
76336
76337-extern atomic_t fscache_n_object_alloc;
76338-extern atomic_t fscache_n_object_no_alloc;
76339-extern atomic_t fscache_n_object_lookups;
76340-extern atomic_t fscache_n_object_lookups_negative;
76341-extern atomic_t fscache_n_object_lookups_positive;
76342-extern atomic_t fscache_n_object_lookups_timed_out;
76343-extern atomic_t fscache_n_object_created;
76344-extern atomic_t fscache_n_object_avail;
76345-extern atomic_t fscache_n_object_dead;
76346+extern atomic_unchecked_t fscache_n_object_alloc;
76347+extern atomic_unchecked_t fscache_n_object_no_alloc;
76348+extern atomic_unchecked_t fscache_n_object_lookups;
76349+extern atomic_unchecked_t fscache_n_object_lookups_negative;
76350+extern atomic_unchecked_t fscache_n_object_lookups_positive;
76351+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
76352+extern atomic_unchecked_t fscache_n_object_created;
76353+extern atomic_unchecked_t fscache_n_object_avail;
76354+extern atomic_unchecked_t fscache_n_object_dead;
76355
76356-extern atomic_t fscache_n_checkaux_none;
76357-extern atomic_t fscache_n_checkaux_okay;
76358-extern atomic_t fscache_n_checkaux_update;
76359-extern atomic_t fscache_n_checkaux_obsolete;
76360+extern atomic_unchecked_t fscache_n_checkaux_none;
76361+extern atomic_unchecked_t fscache_n_checkaux_okay;
76362+extern atomic_unchecked_t fscache_n_checkaux_update;
76363+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
76364
76365 extern atomic_t fscache_n_cop_alloc_object;
76366 extern atomic_t fscache_n_cop_lookup_object;
76367@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
76368 atomic_inc(stat);
76369 }
76370
76371+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
76372+{
76373+ atomic_inc_unchecked(stat);
76374+}
76375+
76376 static inline void fscache_stat_d(atomic_t *stat)
76377 {
76378 atomic_dec(stat);
76379@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
76380
76381 #define __fscache_stat(stat) (NULL)
76382 #define fscache_stat(stat) do {} while (0)
76383+#define fscache_stat_unchecked(stat) do {} while (0)
76384 #define fscache_stat_d(stat) do {} while (0)
76385 #endif
76386
76387diff --git a/fs/fscache/object.c b/fs/fscache/object.c
76388index da032da..0076ce7 100644
76389--- a/fs/fscache/object.c
76390+++ b/fs/fscache/object.c
76391@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76392 _debug("LOOKUP \"%s\" in \"%s\"",
76393 cookie->def->name, object->cache->tag->name);
76394
76395- fscache_stat(&fscache_n_object_lookups);
76396+ fscache_stat_unchecked(&fscache_n_object_lookups);
76397 fscache_stat(&fscache_n_cop_lookup_object);
76398 ret = object->cache->ops->lookup_object(object);
76399 fscache_stat_d(&fscache_n_cop_lookup_object);
76400@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76401 if (ret == -ETIMEDOUT) {
76402 /* probably stuck behind another object, so move this one to
76403 * the back of the queue */
76404- fscache_stat(&fscache_n_object_lookups_timed_out);
76405+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
76406 _leave(" [timeout]");
76407 return NO_TRANSIT;
76408 }
76409@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
76410 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
76411
76412 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76413- fscache_stat(&fscache_n_object_lookups_negative);
76414+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
76415
76416 /* Allow write requests to begin stacking up and read requests to begin
76417 * returning ENODATA.
76418@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
76419 /* if we were still looking up, then we must have a positive lookup
76420 * result, in which case there may be data available */
76421 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76422- fscache_stat(&fscache_n_object_lookups_positive);
76423+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
76424
76425 /* We do (presumably) have data */
76426 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
76427@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
76428 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
76429 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
76430 } else {
76431- fscache_stat(&fscache_n_object_created);
76432+ fscache_stat_unchecked(&fscache_n_object_created);
76433 }
76434
76435 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
76436@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
76437 fscache_stat_d(&fscache_n_cop_lookup_complete);
76438
76439 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
76440- fscache_stat(&fscache_n_object_avail);
76441+ fscache_stat_unchecked(&fscache_n_object_avail);
76442
76443 _leave("");
76444 return transit_to(JUMPSTART_DEPS);
76445@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
76446
76447 /* this just shifts the object release to the work processor */
76448 fscache_put_object(object);
76449- fscache_stat(&fscache_n_object_dead);
76450+ fscache_stat_unchecked(&fscache_n_object_dead);
76451
76452 _leave("");
76453 return transit_to(OBJECT_DEAD);
76454@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76455 enum fscache_checkaux result;
76456
76457 if (!object->cookie->def->check_aux) {
76458- fscache_stat(&fscache_n_checkaux_none);
76459+ fscache_stat_unchecked(&fscache_n_checkaux_none);
76460 return FSCACHE_CHECKAUX_OKAY;
76461 }
76462
76463@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76464 switch (result) {
76465 /* entry okay as is */
76466 case FSCACHE_CHECKAUX_OKAY:
76467- fscache_stat(&fscache_n_checkaux_okay);
76468+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
76469 break;
76470
76471 /* entry requires update */
76472 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
76473- fscache_stat(&fscache_n_checkaux_update);
76474+ fscache_stat_unchecked(&fscache_n_checkaux_update);
76475 break;
76476
76477 /* entry requires deletion */
76478 case FSCACHE_CHECKAUX_OBSOLETE:
76479- fscache_stat(&fscache_n_checkaux_obsolete);
76480+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
76481 break;
76482
76483 default:
76484@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
76485 {
76486 const struct fscache_state *s;
76487
76488- fscache_stat(&fscache_n_invalidates_run);
76489+ fscache_stat_unchecked(&fscache_n_invalidates_run);
76490 fscache_stat(&fscache_n_cop_invalidate_object);
76491 s = _fscache_invalidate_object(object, event);
76492 fscache_stat_d(&fscache_n_cop_invalidate_object);
76493@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
76494 {
76495 _enter("{OBJ%x},%d", object->debug_id, event);
76496
76497- fscache_stat(&fscache_n_updates_run);
76498+ fscache_stat_unchecked(&fscache_n_updates_run);
76499 fscache_stat(&fscache_n_cop_update_object);
76500 object->cache->ops->update_object(object);
76501 fscache_stat_d(&fscache_n_cop_update_object);
76502diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
76503index e7b87a0..a85d47a 100644
76504--- a/fs/fscache/operation.c
76505+++ b/fs/fscache/operation.c
76506@@ -17,7 +17,7 @@
76507 #include <linux/slab.h>
76508 #include "internal.h"
76509
76510-atomic_t fscache_op_debug_id;
76511+atomic_unchecked_t fscache_op_debug_id;
76512 EXPORT_SYMBOL(fscache_op_debug_id);
76513
76514 /**
76515@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
76516 ASSERTCMP(atomic_read(&op->usage), >, 0);
76517 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
76518
76519- fscache_stat(&fscache_n_op_enqueue);
76520+ fscache_stat_unchecked(&fscache_n_op_enqueue);
76521 switch (op->flags & FSCACHE_OP_TYPE) {
76522 case FSCACHE_OP_ASYNC:
76523 _debug("queue async");
76524@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
76525 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
76526 if (op->processor)
76527 fscache_enqueue_operation(op);
76528- fscache_stat(&fscache_n_op_run);
76529+ fscache_stat_unchecked(&fscache_n_op_run);
76530 }
76531
76532 /*
76533@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76534 if (object->n_in_progress > 0) {
76535 atomic_inc(&op->usage);
76536 list_add_tail(&op->pend_link, &object->pending_ops);
76537- fscache_stat(&fscache_n_op_pend);
76538+ fscache_stat_unchecked(&fscache_n_op_pend);
76539 } else if (!list_empty(&object->pending_ops)) {
76540 atomic_inc(&op->usage);
76541 list_add_tail(&op->pend_link, &object->pending_ops);
76542- fscache_stat(&fscache_n_op_pend);
76543+ fscache_stat_unchecked(&fscache_n_op_pend);
76544 fscache_start_operations(object);
76545 } else {
76546 ASSERTCMP(object->n_in_progress, ==, 0);
76547@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76548 object->n_exclusive++; /* reads and writes must wait */
76549 atomic_inc(&op->usage);
76550 list_add_tail(&op->pend_link, &object->pending_ops);
76551- fscache_stat(&fscache_n_op_pend);
76552+ fscache_stat_unchecked(&fscache_n_op_pend);
76553 ret = 0;
76554 } else {
76555 /* If we're in any other state, there must have been an I/O
76556@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
76557 if (object->n_exclusive > 0) {
76558 atomic_inc(&op->usage);
76559 list_add_tail(&op->pend_link, &object->pending_ops);
76560- fscache_stat(&fscache_n_op_pend);
76561+ fscache_stat_unchecked(&fscache_n_op_pend);
76562 } else if (!list_empty(&object->pending_ops)) {
76563 atomic_inc(&op->usage);
76564 list_add_tail(&op->pend_link, &object->pending_ops);
76565- fscache_stat(&fscache_n_op_pend);
76566+ fscache_stat_unchecked(&fscache_n_op_pend);
76567 fscache_start_operations(object);
76568 } else {
76569 ASSERTCMP(object->n_exclusive, ==, 0);
76570@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
76571 object->n_ops++;
76572 atomic_inc(&op->usage);
76573 list_add_tail(&op->pend_link, &object->pending_ops);
76574- fscache_stat(&fscache_n_op_pend);
76575+ fscache_stat_unchecked(&fscache_n_op_pend);
76576 ret = 0;
76577 } else if (fscache_object_is_dying(object)) {
76578- fscache_stat(&fscache_n_op_rejected);
76579+ fscache_stat_unchecked(&fscache_n_op_rejected);
76580 op->state = FSCACHE_OP_ST_CANCELLED;
76581 ret = -ENOBUFS;
76582 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
76583@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
76584 ret = -EBUSY;
76585 if (op->state == FSCACHE_OP_ST_PENDING) {
76586 ASSERT(!list_empty(&op->pend_link));
76587- fscache_stat(&fscache_n_op_cancelled);
76588+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76589 list_del_init(&op->pend_link);
76590 if (do_cancel)
76591 do_cancel(op);
76592@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
76593 while (!list_empty(&object->pending_ops)) {
76594 op = list_entry(object->pending_ops.next,
76595 struct fscache_operation, pend_link);
76596- fscache_stat(&fscache_n_op_cancelled);
76597+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76598 list_del_init(&op->pend_link);
76599
76600 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
76601@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
76602 op->state, ==, FSCACHE_OP_ST_CANCELLED);
76603 op->state = FSCACHE_OP_ST_DEAD;
76604
76605- fscache_stat(&fscache_n_op_release);
76606+ fscache_stat_unchecked(&fscache_n_op_release);
76607
76608 if (op->release) {
76609 op->release(op);
76610@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
76611 * lock, and defer it otherwise */
76612 if (!spin_trylock(&object->lock)) {
76613 _debug("defer put");
76614- fscache_stat(&fscache_n_op_deferred_release);
76615+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
76616
76617 cache = object->cache;
76618 spin_lock(&cache->op_gc_list_lock);
76619@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
76620
76621 _debug("GC DEFERRED REL OBJ%x OP%x",
76622 object->debug_id, op->debug_id);
76623- fscache_stat(&fscache_n_op_gc);
76624+ fscache_stat_unchecked(&fscache_n_op_gc);
76625
76626 ASSERTCMP(atomic_read(&op->usage), ==, 0);
76627 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
76628diff --git a/fs/fscache/page.c b/fs/fscache/page.c
76629index de33b3f..8be4d29 100644
76630--- a/fs/fscache/page.c
76631+++ b/fs/fscache/page.c
76632@@ -74,7 +74,7 @@ try_again:
76633 val = radix_tree_lookup(&cookie->stores, page->index);
76634 if (!val) {
76635 rcu_read_unlock();
76636- fscache_stat(&fscache_n_store_vmscan_not_storing);
76637+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
76638 __fscache_uncache_page(cookie, page);
76639 return true;
76640 }
76641@@ -104,11 +104,11 @@ try_again:
76642 spin_unlock(&cookie->stores_lock);
76643
76644 if (xpage) {
76645- fscache_stat(&fscache_n_store_vmscan_cancelled);
76646- fscache_stat(&fscache_n_store_radix_deletes);
76647+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
76648+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
76649 ASSERTCMP(xpage, ==, page);
76650 } else {
76651- fscache_stat(&fscache_n_store_vmscan_gone);
76652+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
76653 }
76654
76655 wake_up_bit(&cookie->flags, 0);
76656@@ -123,11 +123,11 @@ page_busy:
76657 * sleeping on memory allocation, so we may need to impose a timeout
76658 * too. */
76659 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
76660- fscache_stat(&fscache_n_store_vmscan_busy);
76661+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
76662 return false;
76663 }
76664
76665- fscache_stat(&fscache_n_store_vmscan_wait);
76666+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
76667 if (!release_page_wait_timeout(cookie, page))
76668 _debug("fscache writeout timeout page: %p{%lx}",
76669 page, page->index);
76670@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
76671 FSCACHE_COOKIE_STORING_TAG);
76672 if (!radix_tree_tag_get(&cookie->stores, page->index,
76673 FSCACHE_COOKIE_PENDING_TAG)) {
76674- fscache_stat(&fscache_n_store_radix_deletes);
76675+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
76676 xpage = radix_tree_delete(&cookie->stores, page->index);
76677 }
76678 spin_unlock(&cookie->stores_lock);
76679@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
76680
76681 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
76682
76683- fscache_stat(&fscache_n_attr_changed_calls);
76684+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
76685
76686 if (fscache_object_is_active(object)) {
76687 fscache_stat(&fscache_n_cop_attr_changed);
76688@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
76689
76690 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
76691
76692- fscache_stat(&fscache_n_attr_changed);
76693+ fscache_stat_unchecked(&fscache_n_attr_changed);
76694
76695 op = kzalloc(sizeof(*op), GFP_KERNEL);
76696 if (!op) {
76697- fscache_stat(&fscache_n_attr_changed_nomem);
76698+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
76699 _leave(" = -ENOMEM");
76700 return -ENOMEM;
76701 }
76702@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
76703 if (fscache_submit_exclusive_op(object, op) < 0)
76704 goto nobufs_dec;
76705 spin_unlock(&cookie->lock);
76706- fscache_stat(&fscache_n_attr_changed_ok);
76707+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
76708 fscache_put_operation(op);
76709 _leave(" = 0");
76710 return 0;
76711@@ -242,7 +242,7 @@ nobufs:
76712 kfree(op);
76713 if (wake_cookie)
76714 __fscache_wake_unused_cookie(cookie);
76715- fscache_stat(&fscache_n_attr_changed_nobufs);
76716+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
76717 _leave(" = %d", -ENOBUFS);
76718 return -ENOBUFS;
76719 }
76720@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
76721 /* allocate a retrieval operation and attempt to submit it */
76722 op = kzalloc(sizeof(*op), GFP_NOIO);
76723 if (!op) {
76724- fscache_stat(&fscache_n_retrievals_nomem);
76725+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76726 return NULL;
76727 }
76728
76729@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
76730 return 0;
76731 }
76732
76733- fscache_stat(&fscache_n_retrievals_wait);
76734+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
76735
76736 jif = jiffies;
76737 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
76738 TASK_INTERRUPTIBLE) != 0) {
76739- fscache_stat(&fscache_n_retrievals_intr);
76740+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76741 _leave(" = -ERESTARTSYS");
76742 return -ERESTARTSYS;
76743 }
76744@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
76745 */
76746 int fscache_wait_for_operation_activation(struct fscache_object *object,
76747 struct fscache_operation *op,
76748- atomic_t *stat_op_waits,
76749- atomic_t *stat_object_dead,
76750+ atomic_unchecked_t *stat_op_waits,
76751+ atomic_unchecked_t *stat_object_dead,
76752 void (*do_cancel)(struct fscache_operation *))
76753 {
76754 int ret;
76755@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
76756
76757 _debug(">>> WT");
76758 if (stat_op_waits)
76759- fscache_stat(stat_op_waits);
76760+ fscache_stat_unchecked(stat_op_waits);
76761 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
76762 TASK_INTERRUPTIBLE) != 0) {
76763 ret = fscache_cancel_op(op, do_cancel);
76764@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
76765 check_if_dead:
76766 if (op->state == FSCACHE_OP_ST_CANCELLED) {
76767 if (stat_object_dead)
76768- fscache_stat(stat_object_dead);
76769+ fscache_stat_unchecked(stat_object_dead);
76770 _leave(" = -ENOBUFS [cancelled]");
76771 return -ENOBUFS;
76772 }
76773@@ -381,7 +381,7 @@ check_if_dead:
76774 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
76775 fscache_cancel_op(op, do_cancel);
76776 if (stat_object_dead)
76777- fscache_stat(stat_object_dead);
76778+ fscache_stat_unchecked(stat_object_dead);
76779 return -ENOBUFS;
76780 }
76781 return 0;
76782@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
76783
76784 _enter("%p,%p,,,", cookie, page);
76785
76786- fscache_stat(&fscache_n_retrievals);
76787+ fscache_stat_unchecked(&fscache_n_retrievals);
76788
76789 if (hlist_empty(&cookie->backing_objects))
76790 goto nobufs;
76791@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
76792 goto nobufs_unlock_dec;
76793 spin_unlock(&cookie->lock);
76794
76795- fscache_stat(&fscache_n_retrieval_ops);
76796+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
76797
76798 /* pin the netfs read context in case we need to do the actual netfs
76799 * read because we've encountered a cache read failure */
76800@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
76801
76802 error:
76803 if (ret == -ENOMEM)
76804- fscache_stat(&fscache_n_retrievals_nomem);
76805+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76806 else if (ret == -ERESTARTSYS)
76807- fscache_stat(&fscache_n_retrievals_intr);
76808+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76809 else if (ret == -ENODATA)
76810- fscache_stat(&fscache_n_retrievals_nodata);
76811+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
76812 else if (ret < 0)
76813- fscache_stat(&fscache_n_retrievals_nobufs);
76814+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76815 else
76816- fscache_stat(&fscache_n_retrievals_ok);
76817+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
76818
76819 fscache_put_retrieval(op);
76820 _leave(" = %d", ret);
76821@@ -505,7 +505,7 @@ nobufs_unlock:
76822 __fscache_wake_unused_cookie(cookie);
76823 kfree(op);
76824 nobufs:
76825- fscache_stat(&fscache_n_retrievals_nobufs);
76826+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76827 _leave(" = -ENOBUFS");
76828 return -ENOBUFS;
76829 }
76830@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
76831
76832 _enter("%p,,%d,,,", cookie, *nr_pages);
76833
76834- fscache_stat(&fscache_n_retrievals);
76835+ fscache_stat_unchecked(&fscache_n_retrievals);
76836
76837 if (hlist_empty(&cookie->backing_objects))
76838 goto nobufs;
76839@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
76840 goto nobufs_unlock_dec;
76841 spin_unlock(&cookie->lock);
76842
76843- fscache_stat(&fscache_n_retrieval_ops);
76844+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
76845
76846 /* pin the netfs read context in case we need to do the actual netfs
76847 * read because we've encountered a cache read failure */
76848@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
76849
76850 error:
76851 if (ret == -ENOMEM)
76852- fscache_stat(&fscache_n_retrievals_nomem);
76853+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76854 else if (ret == -ERESTARTSYS)
76855- fscache_stat(&fscache_n_retrievals_intr);
76856+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76857 else if (ret == -ENODATA)
76858- fscache_stat(&fscache_n_retrievals_nodata);
76859+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
76860 else if (ret < 0)
76861- fscache_stat(&fscache_n_retrievals_nobufs);
76862+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76863 else
76864- fscache_stat(&fscache_n_retrievals_ok);
76865+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
76866
76867 fscache_put_retrieval(op);
76868 _leave(" = %d", ret);
76869@@ -636,7 +636,7 @@ nobufs_unlock:
76870 if (wake_cookie)
76871 __fscache_wake_unused_cookie(cookie);
76872 nobufs:
76873- fscache_stat(&fscache_n_retrievals_nobufs);
76874+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76875 _leave(" = -ENOBUFS");
76876 return -ENOBUFS;
76877 }
76878@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
76879
76880 _enter("%p,%p,,,", cookie, page);
76881
76882- fscache_stat(&fscache_n_allocs);
76883+ fscache_stat_unchecked(&fscache_n_allocs);
76884
76885 if (hlist_empty(&cookie->backing_objects))
76886 goto nobufs;
76887@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
76888 goto nobufs_unlock_dec;
76889 spin_unlock(&cookie->lock);
76890
76891- fscache_stat(&fscache_n_alloc_ops);
76892+ fscache_stat_unchecked(&fscache_n_alloc_ops);
76893
76894 ret = fscache_wait_for_operation_activation(
76895 object, &op->op,
76896@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
76897
76898 error:
76899 if (ret == -ERESTARTSYS)
76900- fscache_stat(&fscache_n_allocs_intr);
76901+ fscache_stat_unchecked(&fscache_n_allocs_intr);
76902 else if (ret < 0)
76903- fscache_stat(&fscache_n_allocs_nobufs);
76904+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
76905 else
76906- fscache_stat(&fscache_n_allocs_ok);
76907+ fscache_stat_unchecked(&fscache_n_allocs_ok);
76908
76909 fscache_put_retrieval(op);
76910 _leave(" = %d", ret);
76911@@ -730,7 +730,7 @@ nobufs_unlock:
76912 if (wake_cookie)
76913 __fscache_wake_unused_cookie(cookie);
76914 nobufs:
76915- fscache_stat(&fscache_n_allocs_nobufs);
76916+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
76917 _leave(" = -ENOBUFS");
76918 return -ENOBUFS;
76919 }
76920@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
76921
76922 spin_lock(&cookie->stores_lock);
76923
76924- fscache_stat(&fscache_n_store_calls);
76925+ fscache_stat_unchecked(&fscache_n_store_calls);
76926
76927 /* find a page to store */
76928 page = NULL;
76929@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
76930 page = results[0];
76931 _debug("gang %d [%lx]", n, page->index);
76932 if (page->index > op->store_limit) {
76933- fscache_stat(&fscache_n_store_pages_over_limit);
76934+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
76935 goto superseded;
76936 }
76937
76938@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
76939 spin_unlock(&cookie->stores_lock);
76940 spin_unlock(&object->lock);
76941
76942- fscache_stat(&fscache_n_store_pages);
76943+ fscache_stat_unchecked(&fscache_n_store_pages);
76944 fscache_stat(&fscache_n_cop_write_page);
76945 ret = object->cache->ops->write_page(op, page);
76946 fscache_stat_d(&fscache_n_cop_write_page);
76947@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
76948 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
76949 ASSERT(PageFsCache(page));
76950
76951- fscache_stat(&fscache_n_stores);
76952+ fscache_stat_unchecked(&fscache_n_stores);
76953
76954 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
76955 _leave(" = -ENOBUFS [invalidating]");
76956@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
76957 spin_unlock(&cookie->stores_lock);
76958 spin_unlock(&object->lock);
76959
76960- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
76961+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
76962 op->store_limit = object->store_limit;
76963
76964 __fscache_use_cookie(cookie);
76965@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
76966
76967 spin_unlock(&cookie->lock);
76968 radix_tree_preload_end();
76969- fscache_stat(&fscache_n_store_ops);
76970- fscache_stat(&fscache_n_stores_ok);
76971+ fscache_stat_unchecked(&fscache_n_store_ops);
76972+ fscache_stat_unchecked(&fscache_n_stores_ok);
76973
76974 /* the work queue now carries its own ref on the object */
76975 fscache_put_operation(&op->op);
76976@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
76977 return 0;
76978
76979 already_queued:
76980- fscache_stat(&fscache_n_stores_again);
76981+ fscache_stat_unchecked(&fscache_n_stores_again);
76982 already_pending:
76983 spin_unlock(&cookie->stores_lock);
76984 spin_unlock(&object->lock);
76985 spin_unlock(&cookie->lock);
76986 radix_tree_preload_end();
76987 kfree(op);
76988- fscache_stat(&fscache_n_stores_ok);
76989+ fscache_stat_unchecked(&fscache_n_stores_ok);
76990 _leave(" = 0");
76991 return 0;
76992
76993@@ -1039,14 +1039,14 @@ nobufs:
76994 kfree(op);
76995 if (wake_cookie)
76996 __fscache_wake_unused_cookie(cookie);
76997- fscache_stat(&fscache_n_stores_nobufs);
76998+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
76999 _leave(" = -ENOBUFS");
77000 return -ENOBUFS;
77001
77002 nomem_free:
77003 kfree(op);
77004 nomem:
77005- fscache_stat(&fscache_n_stores_oom);
77006+ fscache_stat_unchecked(&fscache_n_stores_oom);
77007 _leave(" = -ENOMEM");
77008 return -ENOMEM;
77009 }
77010@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
77011 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
77012 ASSERTCMP(page, !=, NULL);
77013
77014- fscache_stat(&fscache_n_uncaches);
77015+ fscache_stat_unchecked(&fscache_n_uncaches);
77016
77017 /* cache withdrawal may beat us to it */
77018 if (!PageFsCache(page))
77019@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
77020 struct fscache_cookie *cookie = op->op.object->cookie;
77021
77022 #ifdef CONFIG_FSCACHE_STATS
77023- atomic_inc(&fscache_n_marks);
77024+ atomic_inc_unchecked(&fscache_n_marks);
77025 #endif
77026
77027 _debug("- mark %p{%lx}", page, page->index);
77028diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
77029index 40d13c7..ddf52b9 100644
77030--- a/fs/fscache/stats.c
77031+++ b/fs/fscache/stats.c
77032@@ -18,99 +18,99 @@
77033 /*
77034 * operation counters
77035 */
77036-atomic_t fscache_n_op_pend;
77037-atomic_t fscache_n_op_run;
77038-atomic_t fscache_n_op_enqueue;
77039-atomic_t fscache_n_op_requeue;
77040-atomic_t fscache_n_op_deferred_release;
77041-atomic_t fscache_n_op_release;
77042-atomic_t fscache_n_op_gc;
77043-atomic_t fscache_n_op_cancelled;
77044-atomic_t fscache_n_op_rejected;
77045+atomic_unchecked_t fscache_n_op_pend;
77046+atomic_unchecked_t fscache_n_op_run;
77047+atomic_unchecked_t fscache_n_op_enqueue;
77048+atomic_unchecked_t fscache_n_op_requeue;
77049+atomic_unchecked_t fscache_n_op_deferred_release;
77050+atomic_unchecked_t fscache_n_op_release;
77051+atomic_unchecked_t fscache_n_op_gc;
77052+atomic_unchecked_t fscache_n_op_cancelled;
77053+atomic_unchecked_t fscache_n_op_rejected;
77054
77055-atomic_t fscache_n_attr_changed;
77056-atomic_t fscache_n_attr_changed_ok;
77057-atomic_t fscache_n_attr_changed_nobufs;
77058-atomic_t fscache_n_attr_changed_nomem;
77059-atomic_t fscache_n_attr_changed_calls;
77060+atomic_unchecked_t fscache_n_attr_changed;
77061+atomic_unchecked_t fscache_n_attr_changed_ok;
77062+atomic_unchecked_t fscache_n_attr_changed_nobufs;
77063+atomic_unchecked_t fscache_n_attr_changed_nomem;
77064+atomic_unchecked_t fscache_n_attr_changed_calls;
77065
77066-atomic_t fscache_n_allocs;
77067-atomic_t fscache_n_allocs_ok;
77068-atomic_t fscache_n_allocs_wait;
77069-atomic_t fscache_n_allocs_nobufs;
77070-atomic_t fscache_n_allocs_intr;
77071-atomic_t fscache_n_allocs_object_dead;
77072-atomic_t fscache_n_alloc_ops;
77073-atomic_t fscache_n_alloc_op_waits;
77074+atomic_unchecked_t fscache_n_allocs;
77075+atomic_unchecked_t fscache_n_allocs_ok;
77076+atomic_unchecked_t fscache_n_allocs_wait;
77077+atomic_unchecked_t fscache_n_allocs_nobufs;
77078+atomic_unchecked_t fscache_n_allocs_intr;
77079+atomic_unchecked_t fscache_n_allocs_object_dead;
77080+atomic_unchecked_t fscache_n_alloc_ops;
77081+atomic_unchecked_t fscache_n_alloc_op_waits;
77082
77083-atomic_t fscache_n_retrievals;
77084-atomic_t fscache_n_retrievals_ok;
77085-atomic_t fscache_n_retrievals_wait;
77086-atomic_t fscache_n_retrievals_nodata;
77087-atomic_t fscache_n_retrievals_nobufs;
77088-atomic_t fscache_n_retrievals_intr;
77089-atomic_t fscache_n_retrievals_nomem;
77090-atomic_t fscache_n_retrievals_object_dead;
77091-atomic_t fscache_n_retrieval_ops;
77092-atomic_t fscache_n_retrieval_op_waits;
77093+atomic_unchecked_t fscache_n_retrievals;
77094+atomic_unchecked_t fscache_n_retrievals_ok;
77095+atomic_unchecked_t fscache_n_retrievals_wait;
77096+atomic_unchecked_t fscache_n_retrievals_nodata;
77097+atomic_unchecked_t fscache_n_retrievals_nobufs;
77098+atomic_unchecked_t fscache_n_retrievals_intr;
77099+atomic_unchecked_t fscache_n_retrievals_nomem;
77100+atomic_unchecked_t fscache_n_retrievals_object_dead;
77101+atomic_unchecked_t fscache_n_retrieval_ops;
77102+atomic_unchecked_t fscache_n_retrieval_op_waits;
77103
77104-atomic_t fscache_n_stores;
77105-atomic_t fscache_n_stores_ok;
77106-atomic_t fscache_n_stores_again;
77107-atomic_t fscache_n_stores_nobufs;
77108-atomic_t fscache_n_stores_oom;
77109-atomic_t fscache_n_store_ops;
77110-atomic_t fscache_n_store_calls;
77111-atomic_t fscache_n_store_pages;
77112-atomic_t fscache_n_store_radix_deletes;
77113-atomic_t fscache_n_store_pages_over_limit;
77114+atomic_unchecked_t fscache_n_stores;
77115+atomic_unchecked_t fscache_n_stores_ok;
77116+atomic_unchecked_t fscache_n_stores_again;
77117+atomic_unchecked_t fscache_n_stores_nobufs;
77118+atomic_unchecked_t fscache_n_stores_oom;
77119+atomic_unchecked_t fscache_n_store_ops;
77120+atomic_unchecked_t fscache_n_store_calls;
77121+atomic_unchecked_t fscache_n_store_pages;
77122+atomic_unchecked_t fscache_n_store_radix_deletes;
77123+atomic_unchecked_t fscache_n_store_pages_over_limit;
77124
77125-atomic_t fscache_n_store_vmscan_not_storing;
77126-atomic_t fscache_n_store_vmscan_gone;
77127-atomic_t fscache_n_store_vmscan_busy;
77128-atomic_t fscache_n_store_vmscan_cancelled;
77129-atomic_t fscache_n_store_vmscan_wait;
77130+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
77131+atomic_unchecked_t fscache_n_store_vmscan_gone;
77132+atomic_unchecked_t fscache_n_store_vmscan_busy;
77133+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
77134+atomic_unchecked_t fscache_n_store_vmscan_wait;
77135
77136-atomic_t fscache_n_marks;
77137-atomic_t fscache_n_uncaches;
77138+atomic_unchecked_t fscache_n_marks;
77139+atomic_unchecked_t fscache_n_uncaches;
77140
77141-atomic_t fscache_n_acquires;
77142-atomic_t fscache_n_acquires_null;
77143-atomic_t fscache_n_acquires_no_cache;
77144-atomic_t fscache_n_acquires_ok;
77145-atomic_t fscache_n_acquires_nobufs;
77146-atomic_t fscache_n_acquires_oom;
77147+atomic_unchecked_t fscache_n_acquires;
77148+atomic_unchecked_t fscache_n_acquires_null;
77149+atomic_unchecked_t fscache_n_acquires_no_cache;
77150+atomic_unchecked_t fscache_n_acquires_ok;
77151+atomic_unchecked_t fscache_n_acquires_nobufs;
77152+atomic_unchecked_t fscache_n_acquires_oom;
77153
77154-atomic_t fscache_n_invalidates;
77155-atomic_t fscache_n_invalidates_run;
77156+atomic_unchecked_t fscache_n_invalidates;
77157+atomic_unchecked_t fscache_n_invalidates_run;
77158
77159-atomic_t fscache_n_updates;
77160-atomic_t fscache_n_updates_null;
77161-atomic_t fscache_n_updates_run;
77162+atomic_unchecked_t fscache_n_updates;
77163+atomic_unchecked_t fscache_n_updates_null;
77164+atomic_unchecked_t fscache_n_updates_run;
77165
77166-atomic_t fscache_n_relinquishes;
77167-atomic_t fscache_n_relinquishes_null;
77168-atomic_t fscache_n_relinquishes_waitcrt;
77169-atomic_t fscache_n_relinquishes_retire;
77170+atomic_unchecked_t fscache_n_relinquishes;
77171+atomic_unchecked_t fscache_n_relinquishes_null;
77172+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
77173+atomic_unchecked_t fscache_n_relinquishes_retire;
77174
77175-atomic_t fscache_n_cookie_index;
77176-atomic_t fscache_n_cookie_data;
77177-atomic_t fscache_n_cookie_special;
77178+atomic_unchecked_t fscache_n_cookie_index;
77179+atomic_unchecked_t fscache_n_cookie_data;
77180+atomic_unchecked_t fscache_n_cookie_special;
77181
77182-atomic_t fscache_n_object_alloc;
77183-atomic_t fscache_n_object_no_alloc;
77184-atomic_t fscache_n_object_lookups;
77185-atomic_t fscache_n_object_lookups_negative;
77186-atomic_t fscache_n_object_lookups_positive;
77187-atomic_t fscache_n_object_lookups_timed_out;
77188-atomic_t fscache_n_object_created;
77189-atomic_t fscache_n_object_avail;
77190-atomic_t fscache_n_object_dead;
77191+atomic_unchecked_t fscache_n_object_alloc;
77192+atomic_unchecked_t fscache_n_object_no_alloc;
77193+atomic_unchecked_t fscache_n_object_lookups;
77194+atomic_unchecked_t fscache_n_object_lookups_negative;
77195+atomic_unchecked_t fscache_n_object_lookups_positive;
77196+atomic_unchecked_t fscache_n_object_lookups_timed_out;
77197+atomic_unchecked_t fscache_n_object_created;
77198+atomic_unchecked_t fscache_n_object_avail;
77199+atomic_unchecked_t fscache_n_object_dead;
77200
77201-atomic_t fscache_n_checkaux_none;
77202-atomic_t fscache_n_checkaux_okay;
77203-atomic_t fscache_n_checkaux_update;
77204-atomic_t fscache_n_checkaux_obsolete;
77205+atomic_unchecked_t fscache_n_checkaux_none;
77206+atomic_unchecked_t fscache_n_checkaux_okay;
77207+atomic_unchecked_t fscache_n_checkaux_update;
77208+atomic_unchecked_t fscache_n_checkaux_obsolete;
77209
77210 atomic_t fscache_n_cop_alloc_object;
77211 atomic_t fscache_n_cop_lookup_object;
77212@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
77213 seq_puts(m, "FS-Cache statistics\n");
77214
77215 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
77216- atomic_read(&fscache_n_cookie_index),
77217- atomic_read(&fscache_n_cookie_data),
77218- atomic_read(&fscache_n_cookie_special));
77219+ atomic_read_unchecked(&fscache_n_cookie_index),
77220+ atomic_read_unchecked(&fscache_n_cookie_data),
77221+ atomic_read_unchecked(&fscache_n_cookie_special));
77222
77223 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
77224- atomic_read(&fscache_n_object_alloc),
77225- atomic_read(&fscache_n_object_no_alloc),
77226- atomic_read(&fscache_n_object_avail),
77227- atomic_read(&fscache_n_object_dead));
77228+ atomic_read_unchecked(&fscache_n_object_alloc),
77229+ atomic_read_unchecked(&fscache_n_object_no_alloc),
77230+ atomic_read_unchecked(&fscache_n_object_avail),
77231+ atomic_read_unchecked(&fscache_n_object_dead));
77232 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
77233- atomic_read(&fscache_n_checkaux_none),
77234- atomic_read(&fscache_n_checkaux_okay),
77235- atomic_read(&fscache_n_checkaux_update),
77236- atomic_read(&fscache_n_checkaux_obsolete));
77237+ atomic_read_unchecked(&fscache_n_checkaux_none),
77238+ atomic_read_unchecked(&fscache_n_checkaux_okay),
77239+ atomic_read_unchecked(&fscache_n_checkaux_update),
77240+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
77241
77242 seq_printf(m, "Pages : mrk=%u unc=%u\n",
77243- atomic_read(&fscache_n_marks),
77244- atomic_read(&fscache_n_uncaches));
77245+ atomic_read_unchecked(&fscache_n_marks),
77246+ atomic_read_unchecked(&fscache_n_uncaches));
77247
77248 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
77249 " oom=%u\n",
77250- atomic_read(&fscache_n_acquires),
77251- atomic_read(&fscache_n_acquires_null),
77252- atomic_read(&fscache_n_acquires_no_cache),
77253- atomic_read(&fscache_n_acquires_ok),
77254- atomic_read(&fscache_n_acquires_nobufs),
77255- atomic_read(&fscache_n_acquires_oom));
77256+ atomic_read_unchecked(&fscache_n_acquires),
77257+ atomic_read_unchecked(&fscache_n_acquires_null),
77258+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
77259+ atomic_read_unchecked(&fscache_n_acquires_ok),
77260+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
77261+ atomic_read_unchecked(&fscache_n_acquires_oom));
77262
77263 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
77264- atomic_read(&fscache_n_object_lookups),
77265- atomic_read(&fscache_n_object_lookups_negative),
77266- atomic_read(&fscache_n_object_lookups_positive),
77267- atomic_read(&fscache_n_object_created),
77268- atomic_read(&fscache_n_object_lookups_timed_out));
77269+ atomic_read_unchecked(&fscache_n_object_lookups),
77270+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
77271+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
77272+ atomic_read_unchecked(&fscache_n_object_created),
77273+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
77274
77275 seq_printf(m, "Invals : n=%u run=%u\n",
77276- atomic_read(&fscache_n_invalidates),
77277- atomic_read(&fscache_n_invalidates_run));
77278+ atomic_read_unchecked(&fscache_n_invalidates),
77279+ atomic_read_unchecked(&fscache_n_invalidates_run));
77280
77281 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
77282- atomic_read(&fscache_n_updates),
77283- atomic_read(&fscache_n_updates_null),
77284- atomic_read(&fscache_n_updates_run));
77285+ atomic_read_unchecked(&fscache_n_updates),
77286+ atomic_read_unchecked(&fscache_n_updates_null),
77287+ atomic_read_unchecked(&fscache_n_updates_run));
77288
77289 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
77290- atomic_read(&fscache_n_relinquishes),
77291- atomic_read(&fscache_n_relinquishes_null),
77292- atomic_read(&fscache_n_relinquishes_waitcrt),
77293- atomic_read(&fscache_n_relinquishes_retire));
77294+ atomic_read_unchecked(&fscache_n_relinquishes),
77295+ atomic_read_unchecked(&fscache_n_relinquishes_null),
77296+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
77297+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
77298
77299 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
77300- atomic_read(&fscache_n_attr_changed),
77301- atomic_read(&fscache_n_attr_changed_ok),
77302- atomic_read(&fscache_n_attr_changed_nobufs),
77303- atomic_read(&fscache_n_attr_changed_nomem),
77304- atomic_read(&fscache_n_attr_changed_calls));
77305+ atomic_read_unchecked(&fscache_n_attr_changed),
77306+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
77307+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
77308+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
77309+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
77310
77311 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
77312- atomic_read(&fscache_n_allocs),
77313- atomic_read(&fscache_n_allocs_ok),
77314- atomic_read(&fscache_n_allocs_wait),
77315- atomic_read(&fscache_n_allocs_nobufs),
77316- atomic_read(&fscache_n_allocs_intr));
77317+ atomic_read_unchecked(&fscache_n_allocs),
77318+ atomic_read_unchecked(&fscache_n_allocs_ok),
77319+ atomic_read_unchecked(&fscache_n_allocs_wait),
77320+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
77321+ atomic_read_unchecked(&fscache_n_allocs_intr));
77322 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
77323- atomic_read(&fscache_n_alloc_ops),
77324- atomic_read(&fscache_n_alloc_op_waits),
77325- atomic_read(&fscache_n_allocs_object_dead));
77326+ atomic_read_unchecked(&fscache_n_alloc_ops),
77327+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
77328+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
77329
77330 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
77331 " int=%u oom=%u\n",
77332- atomic_read(&fscache_n_retrievals),
77333- atomic_read(&fscache_n_retrievals_ok),
77334- atomic_read(&fscache_n_retrievals_wait),
77335- atomic_read(&fscache_n_retrievals_nodata),
77336- atomic_read(&fscache_n_retrievals_nobufs),
77337- atomic_read(&fscache_n_retrievals_intr),
77338- atomic_read(&fscache_n_retrievals_nomem));
77339+ atomic_read_unchecked(&fscache_n_retrievals),
77340+ atomic_read_unchecked(&fscache_n_retrievals_ok),
77341+ atomic_read_unchecked(&fscache_n_retrievals_wait),
77342+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
77343+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
77344+ atomic_read_unchecked(&fscache_n_retrievals_intr),
77345+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
77346 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
77347- atomic_read(&fscache_n_retrieval_ops),
77348- atomic_read(&fscache_n_retrieval_op_waits),
77349- atomic_read(&fscache_n_retrievals_object_dead));
77350+ atomic_read_unchecked(&fscache_n_retrieval_ops),
77351+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
77352+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
77353
77354 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
77355- atomic_read(&fscache_n_stores),
77356- atomic_read(&fscache_n_stores_ok),
77357- atomic_read(&fscache_n_stores_again),
77358- atomic_read(&fscache_n_stores_nobufs),
77359- atomic_read(&fscache_n_stores_oom));
77360+ atomic_read_unchecked(&fscache_n_stores),
77361+ atomic_read_unchecked(&fscache_n_stores_ok),
77362+ atomic_read_unchecked(&fscache_n_stores_again),
77363+ atomic_read_unchecked(&fscache_n_stores_nobufs),
77364+ atomic_read_unchecked(&fscache_n_stores_oom));
77365 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
77366- atomic_read(&fscache_n_store_ops),
77367- atomic_read(&fscache_n_store_calls),
77368- atomic_read(&fscache_n_store_pages),
77369- atomic_read(&fscache_n_store_radix_deletes),
77370- atomic_read(&fscache_n_store_pages_over_limit));
77371+ atomic_read_unchecked(&fscache_n_store_ops),
77372+ atomic_read_unchecked(&fscache_n_store_calls),
77373+ atomic_read_unchecked(&fscache_n_store_pages),
77374+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
77375+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
77376
77377 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
77378- atomic_read(&fscache_n_store_vmscan_not_storing),
77379- atomic_read(&fscache_n_store_vmscan_gone),
77380- atomic_read(&fscache_n_store_vmscan_busy),
77381- atomic_read(&fscache_n_store_vmscan_cancelled),
77382- atomic_read(&fscache_n_store_vmscan_wait));
77383+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
77384+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
77385+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
77386+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
77387+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
77388
77389 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
77390- atomic_read(&fscache_n_op_pend),
77391- atomic_read(&fscache_n_op_run),
77392- atomic_read(&fscache_n_op_enqueue),
77393- atomic_read(&fscache_n_op_cancelled),
77394- atomic_read(&fscache_n_op_rejected));
77395+ atomic_read_unchecked(&fscache_n_op_pend),
77396+ atomic_read_unchecked(&fscache_n_op_run),
77397+ atomic_read_unchecked(&fscache_n_op_enqueue),
77398+ atomic_read_unchecked(&fscache_n_op_cancelled),
77399+ atomic_read_unchecked(&fscache_n_op_rejected));
77400 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
77401- atomic_read(&fscache_n_op_deferred_release),
77402- atomic_read(&fscache_n_op_release),
77403- atomic_read(&fscache_n_op_gc));
77404+ atomic_read_unchecked(&fscache_n_op_deferred_release),
77405+ atomic_read_unchecked(&fscache_n_op_release),
77406+ atomic_read_unchecked(&fscache_n_op_gc));
77407
77408 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
77409 atomic_read(&fscache_n_cop_alloc_object),
77410diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
77411index e5bbf74..9bfdaf3 100644
77412--- a/fs/fuse/cuse.c
77413+++ b/fs/fuse/cuse.c
77414@@ -602,10 +602,12 @@ static int __init cuse_init(void)
77415 INIT_LIST_HEAD(&cuse_conntbl[i]);
77416
77417 /* inherit and extend fuse_dev_operations */
77418- cuse_channel_fops = fuse_dev_operations;
77419- cuse_channel_fops.owner = THIS_MODULE;
77420- cuse_channel_fops.open = cuse_channel_open;
77421- cuse_channel_fops.release = cuse_channel_release;
77422+ pax_open_kernel();
77423+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
77424+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
77425+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
77426+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
77427+ pax_close_kernel();
77428
77429 cuse_class = class_create(THIS_MODULE, "cuse");
77430 if (IS_ERR(cuse_class))
77431diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
77432index c8b68ab..97190db 100644
77433--- a/fs/fuse/dev.c
77434+++ b/fs/fuse/dev.c
77435@@ -1398,7 +1398,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77436 ret = 0;
77437 pipe_lock(pipe);
77438
77439- if (!pipe->readers) {
77440+ if (!atomic_read(&pipe->readers)) {
77441 send_sig(SIGPIPE, current, 0);
77442 if (!ret)
77443 ret = -EPIPE;
77444@@ -1427,7 +1427,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77445 page_nr++;
77446 ret += buf->len;
77447
77448- if (pipe->files)
77449+ if (atomic_read(&pipe->files))
77450 do_wakeup = 1;
77451 }
77452
77453diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
77454index 0572bca..cb9c3fa 100644
77455--- a/fs/fuse/dir.c
77456+++ b/fs/fuse/dir.c
77457@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
77458 return link;
77459 }
77460
77461-static void free_link(char *link)
77462+static void free_link(const char *link)
77463 {
77464 if (!IS_ERR(link))
77465 free_page((unsigned long) link);
77466diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
77467index 0fa8062..755b198 100644
77468--- a/fs/gfs2/glock.c
77469+++ b/fs/gfs2/glock.c
77470@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
77471 if (held1 != held2) {
77472 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
77473 if (held2)
77474- gl->gl_lockref.count++;
77475+ __lockref_inc(&gl->gl_lockref);
77476 else
77477- gl->gl_lockref.count--;
77478+ __lockref_dec(&gl->gl_lockref);
77479 }
77480 if (held1 && held2 && list_empty(&gl->gl_holders))
77481 clear_bit(GLF_QUEUED, &gl->gl_flags);
77482@@ -614,9 +614,9 @@ out:
77483 out_sched:
77484 clear_bit(GLF_LOCK, &gl->gl_flags);
77485 smp_mb__after_atomic();
77486- gl->gl_lockref.count++;
77487+ __lockref_inc(&gl->gl_lockref);
77488 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77489- gl->gl_lockref.count--;
77490+ __lockref_dec(&gl->gl_lockref);
77491 return;
77492
77493 out_unlock:
77494@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
77495 gl->gl_sbd = sdp;
77496 gl->gl_flags = 0;
77497 gl->gl_name = name;
77498- gl->gl_lockref.count = 1;
77499+ __lockref_set(&gl->gl_lockref, 1);
77500 gl->gl_state = LM_ST_UNLOCKED;
77501 gl->gl_target = LM_ST_UNLOCKED;
77502 gl->gl_demote_state = LM_ST_EXCLUSIVE;
77503@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
77504 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
77505 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
77506 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77507- gl->gl_lockref.count++;
77508+ __lockref_inc(&gl->gl_lockref);
77509 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77510- gl->gl_lockref.count--;
77511+ __lockref_dec(&gl->gl_lockref);
77512 }
77513 run_queue(gl, 1);
77514 spin_unlock(&gl->gl_spin);
77515@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
77516 }
77517 }
77518
77519- gl->gl_lockref.count++;
77520+ __lockref_inc(&gl->gl_lockref);
77521 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77522 spin_unlock(&gl->gl_spin);
77523
77524@@ -1384,12 +1384,12 @@ add_back_to_lru:
77525 goto add_back_to_lru;
77526 }
77527 clear_bit(GLF_LRU, &gl->gl_flags);
77528- gl->gl_lockref.count++;
77529+ __lockref_inc(&gl->gl_lockref);
77530 if (demote_ok(gl))
77531 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
77532 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
77533 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77534- gl->gl_lockref.count--;
77535+ __lockref_dec(&gl->gl_lockref);
77536 spin_unlock(&gl->gl_spin);
77537 cond_resched_lock(&lru_lock);
77538 }
77539@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
77540 state2str(gl->gl_demote_state), dtime,
77541 atomic_read(&gl->gl_ail_count),
77542 atomic_read(&gl->gl_revokes),
77543- (int)gl->gl_lockref.count, gl->gl_hold_time);
77544+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
77545
77546 list_for_each_entry(gh, &gl->gl_holders, gh_list)
77547 dump_holder(seq, gh);
77548diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
77549index fe91951..ce38a6e 100644
77550--- a/fs/gfs2/glops.c
77551+++ b/fs/gfs2/glops.c
77552@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
77553
77554 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
77555 gl->gl_state == LM_ST_SHARED && ip) {
77556- gl->gl_lockref.count++;
77557+ __lockref_inc(&gl->gl_lockref);
77558 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
77559- gl->gl_lockref.count--;
77560+ __lockref_dec(&gl->gl_lockref);
77561 }
77562 }
77563
77564diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
77565index e3065cb..45e7117 100644
77566--- a/fs/gfs2/quota.c
77567+++ b/fs/gfs2/quota.c
77568@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
77569 if (!spin_trylock(&qd->qd_lockref.lock))
77570 return LRU_SKIP;
77571
77572- if (qd->qd_lockref.count == 0) {
77573+ if (__lockref_read(&qd->qd_lockref) == 0) {
77574 lockref_mark_dead(&qd->qd_lockref);
77575 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
77576 }
77577@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
77578 return NULL;
77579
77580 qd->qd_sbd = sdp;
77581- qd->qd_lockref.count = 1;
77582+ __lockref_set(&qd->qd_lockref, 1);
77583 spin_lock_init(&qd->qd_lockref.lock);
77584 qd->qd_id = qid;
77585 qd->qd_slot = -1;
77586@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
77587 if (lockref_put_or_lock(&qd->qd_lockref))
77588 return;
77589
77590- qd->qd_lockref.count = 0;
77591+ __lockref_set(&qd->qd_lockref, 0);
77592 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
77593 spin_unlock(&qd->qd_lockref.lock);
77594
77595diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
77596index 07d8d8f..2c2a4e7 100644
77597--- a/fs/hostfs/hostfs_kern.c
77598+++ b/fs/hostfs/hostfs_kern.c
77599@@ -918,7 +918,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
77600
77601 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
77602 {
77603- char *s = nd_get_link(nd);
77604+ const char *s = nd_get_link(nd);
77605 if (!IS_ERR(s))
77606 __putname(s);
77607 }
77608diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
77609index 87724c1..5a5e53f 100644
77610--- a/fs/hugetlbfs/inode.c
77611+++ b/fs/hugetlbfs/inode.c
77612@@ -151,6 +151,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77613 struct mm_struct *mm = current->mm;
77614 struct vm_area_struct *vma;
77615 struct hstate *h = hstate_file(file);
77616+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
77617 struct vm_unmapped_area_info info;
77618
77619 if (len & ~huge_page_mask(h))
77620@@ -164,17 +165,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77621 return addr;
77622 }
77623
77624+#ifdef CONFIG_PAX_RANDMMAP
77625+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
77626+#endif
77627+
77628 if (addr) {
77629 addr = ALIGN(addr, huge_page_size(h));
77630 vma = find_vma(mm, addr);
77631- if (TASK_SIZE - len >= addr &&
77632- (!vma || addr + len <= vma->vm_start))
77633+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
77634 return addr;
77635 }
77636
77637 info.flags = 0;
77638 info.length = len;
77639 info.low_limit = TASK_UNMAPPED_BASE;
77640+
77641+#ifdef CONFIG_PAX_RANDMMAP
77642+ if (mm->pax_flags & MF_PAX_RANDMMAP)
77643+ info.low_limit += mm->delta_mmap;
77644+#endif
77645+
77646 info.high_limit = TASK_SIZE;
77647 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
77648 info.align_offset = 0;
77649@@ -939,7 +949,7 @@ static struct file_system_type hugetlbfs_fs_type = {
77650 };
77651 MODULE_ALIAS_FS("hugetlbfs");
77652
77653-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77654+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77655
77656 static int can_do_hugetlb_shm(void)
77657 {
77658diff --git a/fs/inode.c b/fs/inode.c
77659index 6e342ca..0538cb7 100644
77660--- a/fs/inode.c
77661+++ b/fs/inode.c
77662@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
77663 unsigned int *p = &get_cpu_var(last_ino);
77664 unsigned int res = *p;
77665
77666+start:
77667+
77668 #ifdef CONFIG_SMP
77669 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
77670- static atomic_t shared_last_ino;
77671- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
77672+ static atomic_unchecked_t shared_last_ino;
77673+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
77674
77675 res = next - LAST_INO_BATCH;
77676 }
77677 #endif
77678
77679- *p = ++res;
77680+ if (unlikely(!++res))
77681+ goto start; /* never zero */
77682+ *p = res;
77683 put_cpu_var(last_ino);
77684 return res;
77685 }
77686diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
77687index 4a6cf28..d3a29d3 100644
77688--- a/fs/jffs2/erase.c
77689+++ b/fs/jffs2/erase.c
77690@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
77691 struct jffs2_unknown_node marker = {
77692 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
77693 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
77694- .totlen = cpu_to_je32(c->cleanmarker_size)
77695+ .totlen = cpu_to_je32(c->cleanmarker_size),
77696+ .hdr_crc = cpu_to_je32(0)
77697 };
77698
77699 jffs2_prealloc_raw_node_refs(c, jeb, 1);
77700diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
77701index 09ed551..45684f8 100644
77702--- a/fs/jffs2/wbuf.c
77703+++ b/fs/jffs2/wbuf.c
77704@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
77705 {
77706 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
77707 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
77708- .totlen = constant_cpu_to_je32(8)
77709+ .totlen = constant_cpu_to_je32(8),
77710+ .hdr_crc = constant_cpu_to_je32(0)
77711 };
77712
77713 /*
77714diff --git a/fs/jfs/super.c b/fs/jfs/super.c
77715index 4cd9798..8dfe86a 100644
77716--- a/fs/jfs/super.c
77717+++ b/fs/jfs/super.c
77718@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
77719
77720 jfs_inode_cachep =
77721 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
77722- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
77723+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
77724 init_once);
77725 if (jfs_inode_cachep == NULL)
77726 return -ENOMEM;
77727diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
77728index 2d48d28..82eddad 100644
77729--- a/fs/kernfs/dir.c
77730+++ b/fs/kernfs/dir.c
77731@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
77732 *
77733 * Returns 31 bit hash of ns + name (so it fits in an off_t )
77734 */
77735-static unsigned int kernfs_name_hash(const char *name, const void *ns)
77736+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
77737 {
77738 unsigned long hash = init_name_hash();
77739 unsigned int len = strlen(name);
77740@@ -873,6 +873,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
77741 ret = scops->mkdir(parent, dentry->d_name.name, mode);
77742
77743 kernfs_put_active(parent);
77744+
77745+ if (!ret) {
77746+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
77747+ ret = PTR_ERR_OR_ZERO(dentry_ret);
77748+ }
77749+
77750 return ret;
77751 }
77752
77753diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
77754index 2bacb99..f745182 100644
77755--- a/fs/kernfs/file.c
77756+++ b/fs/kernfs/file.c
77757@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
77758
77759 struct kernfs_open_node {
77760 atomic_t refcnt;
77761- atomic_t event;
77762+ atomic_unchecked_t event;
77763 wait_queue_head_t poll;
77764 struct list_head files; /* goes through kernfs_open_file.list */
77765 };
77766@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
77767 {
77768 struct kernfs_open_file *of = sf->private;
77769
77770- of->event = atomic_read(&of->kn->attr.open->event);
77771+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
77772
77773 return of->kn->attr.ops->seq_show(sf, v);
77774 }
77775@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
77776 goto out_free;
77777 }
77778
77779- of->event = atomic_read(&of->kn->attr.open->event);
77780+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
77781 ops = kernfs_ops(of->kn);
77782 if (ops->read)
77783 len = ops->read(of, buf, len, *ppos);
77784@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
77785 {
77786 struct kernfs_open_file *of = kernfs_of(file);
77787 const struct kernfs_ops *ops;
77788- size_t len;
77789+ ssize_t len;
77790 char *buf;
77791
77792 if (of->atomic_write_len) {
77793@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
77794 return ret;
77795 }
77796
77797-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
77798- void *buf, int len, int write)
77799+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
77800+ void *buf, size_t len, int write)
77801 {
77802 struct file *file = vma->vm_file;
77803 struct kernfs_open_file *of = kernfs_of(file);
77804- int ret;
77805+ ssize_t ret;
77806
77807 if (!of->vm_ops)
77808 return -EINVAL;
77809@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
77810 return -ENOMEM;
77811
77812 atomic_set(&new_on->refcnt, 0);
77813- atomic_set(&new_on->event, 1);
77814+ atomic_set_unchecked(&new_on->event, 1);
77815 init_waitqueue_head(&new_on->poll);
77816 INIT_LIST_HEAD(&new_on->files);
77817 goto retry;
77818@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
77819
77820 kernfs_put_active(kn);
77821
77822- if (of->event != atomic_read(&on->event))
77823+ if (of->event != atomic_read_unchecked(&on->event))
77824 goto trigger;
77825
77826 return DEFAULT_POLLMASK;
77827@@ -824,7 +824,7 @@ repeat:
77828
77829 on = kn->attr.open;
77830 if (on) {
77831- atomic_inc(&on->event);
77832+ atomic_inc_unchecked(&on->event);
77833 wake_up_interruptible(&on->poll);
77834 }
77835
77836diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
77837index 8a19889..4c3069a 100644
77838--- a/fs/kernfs/symlink.c
77839+++ b/fs/kernfs/symlink.c
77840@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
77841 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
77842 void *cookie)
77843 {
77844- char *page = nd_get_link(nd);
77845+ const char *page = nd_get_link(nd);
77846 if (!IS_ERR(page))
77847 free_page((unsigned long)page);
77848 }
77849diff --git a/fs/libfs.c b/fs/libfs.c
77850index 0281359..24971ac 100644
77851--- a/fs/libfs.c
77852+++ b/fs/libfs.c
77853@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
77854
77855 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
77856 struct dentry *next = list_entry(p, struct dentry, d_child);
77857+ char d_name[sizeof(next->d_iname)];
77858+ const unsigned char *name;
77859+
77860 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
77861 if (!simple_positive(next)) {
77862 spin_unlock(&next->d_lock);
77863@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
77864
77865 spin_unlock(&next->d_lock);
77866 spin_unlock(&dentry->d_lock);
77867- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
77868+ name = next->d_name.name;
77869+ if (name == next->d_iname) {
77870+ memcpy(d_name, name, next->d_name.len);
77871+ name = d_name;
77872+ }
77873+ if (!dir_emit(ctx, name, next->d_name.len,
77874 d_inode(next)->i_ino, dt_type(d_inode(next))))
77875 return 0;
77876 spin_lock(&dentry->d_lock);
77877@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
77878 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
77879 void *cookie)
77880 {
77881- char *s = nd_get_link(nd);
77882+ const char *s = nd_get_link(nd);
77883 if (!IS_ERR(s))
77884 kfree(s);
77885 }
77886diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
77887index acd3947..1f896e2 100644
77888--- a/fs/lockd/clntproc.c
77889+++ b/fs/lockd/clntproc.c
77890@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
77891 /*
77892 * Cookie counter for NLM requests
77893 */
77894-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
77895+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
77896
77897 void nlmclnt_next_cookie(struct nlm_cookie *c)
77898 {
77899- u32 cookie = atomic_inc_return(&nlm_cookie);
77900+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
77901
77902 memcpy(c->data, &cookie, 4);
77903 c->len=4;
77904diff --git a/fs/mount.h b/fs/mount.h
77905index 6a61c2b..bd79179 100644
77906--- a/fs/mount.h
77907+++ b/fs/mount.h
77908@@ -13,7 +13,7 @@ struct mnt_namespace {
77909 u64 seq; /* Sequence number to prevent loops */
77910 wait_queue_head_t poll;
77911 u64 event;
77912-};
77913+} __randomize_layout;
77914
77915 struct mnt_pcp {
77916 int mnt_count;
77917@@ -65,7 +65,7 @@ struct mount {
77918 struct hlist_head mnt_pins;
77919 struct fs_pin mnt_umount;
77920 struct dentry *mnt_ex_mountpoint;
77921-};
77922+} __randomize_layout;
77923
77924 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
77925
77926diff --git a/fs/namei.c b/fs/namei.c
77927index fe30d3b..57656a7 100644
77928--- a/fs/namei.c
77929+++ b/fs/namei.c
77930@@ -336,17 +336,32 @@ int generic_permission(struct inode *inode, int mask)
77931 if (ret != -EACCES)
77932 return ret;
77933
77934+#ifdef CONFIG_GRKERNSEC
77935+ /* we'll block if we have to log due to a denied capability use */
77936+ if (mask & MAY_NOT_BLOCK)
77937+ return -ECHILD;
77938+#endif
77939+
77940 if (S_ISDIR(inode->i_mode)) {
77941 /* DACs are overridable for directories */
77942- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
77943- return 0;
77944 if (!(mask & MAY_WRITE))
77945- if (capable_wrt_inode_uidgid(inode,
77946- CAP_DAC_READ_SEARCH))
77947+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
77948+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
77949 return 0;
77950+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
77951+ return 0;
77952 return -EACCES;
77953 }
77954 /*
77955+ * Searching includes executable on directories, else just read.
77956+ */
77957+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
77958+ if (mask == MAY_READ)
77959+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
77960+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
77961+ return 0;
77962+
77963+ /*
77964 * Read/write DACs are always overridable.
77965 * Executable DACs are overridable when there is
77966 * at least one exec bit set.
77967@@ -355,14 +370,6 @@ int generic_permission(struct inode *inode, int mask)
77968 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
77969 return 0;
77970
77971- /*
77972- * Searching includes executable on directories, else just read.
77973- */
77974- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
77975- if (mask == MAY_READ)
77976- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
77977- return 0;
77978-
77979 return -EACCES;
77980 }
77981 EXPORT_SYMBOL(generic_permission);
77982@@ -502,7 +509,7 @@ struct nameidata {
77983 int last_type;
77984 unsigned depth;
77985 struct file *base;
77986- char *saved_names[MAX_NESTED_LINKS + 1];
77987+ const char *saved_names[MAX_NESTED_LINKS + 1];
77988 };
77989
77990 /*
77991@@ -713,13 +720,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
77992 nd->flags |= LOOKUP_JUMPED;
77993 }
77994
77995-void nd_set_link(struct nameidata *nd, char *path)
77996+void nd_set_link(struct nameidata *nd, const char *path)
77997 {
77998 nd->saved_names[nd->depth] = path;
77999 }
78000 EXPORT_SYMBOL(nd_set_link);
78001
78002-char *nd_get_link(struct nameidata *nd)
78003+const char *nd_get_link(const struct nameidata *nd)
78004 {
78005 return nd->saved_names[nd->depth];
78006 }
78007@@ -766,7 +773,7 @@ static inline int may_follow_link(struct path *link, struct nameidata *nd)
78008 return 0;
78009
78010 /* Allowed if parent directory not sticky and world-writable. */
78011- parent = nd->path.dentry->d_inode;
78012+ parent = nd->inode;
78013 if ((parent->i_mode & (S_ISVTX|S_IWOTH)) != (S_ISVTX|S_IWOTH))
78014 return 0;
78015
78016@@ -854,7 +861,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
78017 {
78018 struct dentry *dentry = link->dentry;
78019 int error;
78020- char *s;
78021+ const char *s;
78022
78023 BUG_ON(nd->flags & LOOKUP_RCU);
78024
78025@@ -875,6 +882,11 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
78026 if (error)
78027 goto out_put_nd_path;
78028
78029+ if (gr_handle_follow_link(dentry, nd->path.mnt)) {
78030+ error = -EACCES;
78031+ goto out_put_nd_path;
78032+ }
78033+
78034 nd->last_type = LAST_BIND;
78035 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
78036 error = PTR_ERR(*p);
78037@@ -1647,6 +1659,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
78038 if (res)
78039 break;
78040 res = walk_component(nd, path, LOOKUP_FOLLOW);
78041+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
78042+ res = -EACCES;
78043 put_link(nd, &link, cookie);
78044 } while (res > 0);
78045
78046@@ -1719,7 +1733,7 @@ EXPORT_SYMBOL(full_name_hash);
78047 static inline u64 hash_name(const char *name)
78048 {
78049 unsigned long a, b, adata, bdata, mask, hash, len;
78050- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78051+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78052
78053 hash = a = 0;
78054 len = -sizeof(unsigned long);
78055@@ -2015,6 +2029,8 @@ static int path_lookupat(int dfd, const struct filename *name,
78056 if (err)
78057 break;
78058 err = lookup_last(nd, &path);
78059+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
78060+ err = -EACCES;
78061 put_link(nd, &link, cookie);
78062 }
78063 }
78064@@ -2022,6 +2038,13 @@ static int path_lookupat(int dfd, const struct filename *name,
78065 if (!err)
78066 err = complete_walk(nd);
78067
78068+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
78069+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78070+ path_put(&nd->path);
78071+ err = -ENOENT;
78072+ }
78073+ }
78074+
78075 if (!err && nd->flags & LOOKUP_DIRECTORY) {
78076 if (!d_can_lookup(nd->path.dentry)) {
78077 path_put(&nd->path);
78078@@ -2042,8 +2065,15 @@ static int filename_lookup(int dfd, struct filename *name,
78079 if (unlikely(retval == -ESTALE))
78080 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
78081
78082- if (likely(!retval))
78083+ if (likely(!retval)) {
78084 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
78085+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
78086+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
78087+ path_put(&nd->path);
78088+ return -ENOENT;
78089+ }
78090+ }
78091+ }
78092 return retval;
78093 }
78094
78095@@ -2621,6 +2651,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
78096 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
78097 return -EPERM;
78098
78099+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
78100+ return -EPERM;
78101+ if (gr_handle_rawio(inode))
78102+ return -EPERM;
78103+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
78104+ return -EACCES;
78105+
78106 return 0;
78107 }
78108
78109@@ -2852,7 +2889,7 @@ looked_up:
78110 * cleared otherwise prior to returning.
78111 */
78112 static int lookup_open(struct nameidata *nd, struct path *path,
78113- struct file *file,
78114+ struct path *link, struct file *file,
78115 const struct open_flags *op,
78116 bool got_write, int *opened)
78117 {
78118@@ -2887,6 +2924,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78119 /* Negative dentry, just create the file */
78120 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
78121 umode_t mode = op->mode;
78122+
78123+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
78124+ error = -EACCES;
78125+ goto out_dput;
78126+ }
78127+
78128+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
78129+ error = -EACCES;
78130+ goto out_dput;
78131+ }
78132+
78133 if (!IS_POSIXACL(dir->d_inode))
78134 mode &= ~current_umask();
78135 /*
78136@@ -2908,6 +2956,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78137 nd->flags & LOOKUP_EXCL);
78138 if (error)
78139 goto out_dput;
78140+ else
78141+ gr_handle_create(dentry, nd->path.mnt);
78142 }
78143 out_no_open:
78144 path->dentry = dentry;
78145@@ -2922,7 +2972,7 @@ out_dput:
78146 /*
78147 * Handle the last step of open()
78148 */
78149-static int do_last(struct nameidata *nd, struct path *path,
78150+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
78151 struct file *file, const struct open_flags *op,
78152 int *opened, struct filename *name)
78153 {
78154@@ -2972,6 +3022,15 @@ static int do_last(struct nameidata *nd, struct path *path,
78155 if (error)
78156 return error;
78157
78158+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
78159+ error = -ENOENT;
78160+ goto out;
78161+ }
78162+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78163+ error = -EACCES;
78164+ goto out;
78165+ }
78166+
78167 audit_inode(name, dir, LOOKUP_PARENT);
78168 error = -EISDIR;
78169 /* trailing slashes? */
78170@@ -2991,7 +3050,7 @@ retry_lookup:
78171 */
78172 }
78173 mutex_lock(&dir->d_inode->i_mutex);
78174- error = lookup_open(nd, path, file, op, got_write, opened);
78175+ error = lookup_open(nd, path, link, file, op, got_write, opened);
78176 mutex_unlock(&dir->d_inode->i_mutex);
78177
78178 if (error <= 0) {
78179@@ -3015,11 +3074,28 @@ retry_lookup:
78180 goto finish_open_created;
78181 }
78182
78183+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
78184+ error = -ENOENT;
78185+ goto exit_dput;
78186+ }
78187+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
78188+ error = -EACCES;
78189+ goto exit_dput;
78190+ }
78191+
78192 /*
78193 * create/update audit record if it already exists.
78194 */
78195- if (d_is_positive(path->dentry))
78196+ if (d_is_positive(path->dentry)) {
78197+ /* only check if O_CREAT is specified, all other checks need to go
78198+ into may_open */
78199+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
78200+ error = -EACCES;
78201+ goto exit_dput;
78202+ }
78203+
78204 audit_inode(name, path->dentry, 0);
78205+ }
78206
78207 /*
78208 * If atomic_open() acquired write access it is dropped now due to
78209@@ -3060,6 +3136,11 @@ finish_lookup:
78210 }
78211 }
78212 BUG_ON(inode != path->dentry->d_inode);
78213+ /* if we're resolving a symlink to another symlink */
78214+ if (link && gr_handle_symlink_owner(link, inode)) {
78215+ error = -EACCES;
78216+ goto out;
78217+ }
78218 return 1;
78219 }
78220
78221@@ -3079,7 +3160,18 @@ finish_open:
78222 path_put(&save_parent);
78223 return error;
78224 }
78225+
78226+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78227+ error = -ENOENT;
78228+ goto out;
78229+ }
78230+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78231+ error = -EACCES;
78232+ goto out;
78233+ }
78234+
78235 audit_inode(name, nd->path.dentry, 0);
78236+
78237 error = -EISDIR;
78238 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
78239 goto out;
78240@@ -3240,7 +3332,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78241 if (unlikely(error))
78242 goto out;
78243
78244- error = do_last(nd, &path, file, op, &opened, pathname);
78245+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
78246 while (unlikely(error > 0)) { /* trailing symlink */
78247 struct path link = path;
78248 void *cookie;
78249@@ -3258,7 +3350,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78250 error = follow_link(&link, nd, &cookie);
78251 if (unlikely(error))
78252 break;
78253- error = do_last(nd, &path, file, op, &opened, pathname);
78254+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
78255 put_link(nd, &link, cookie);
78256 }
78257 out:
78258@@ -3361,9 +3453,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
78259 goto unlock;
78260
78261 error = -EEXIST;
78262- if (d_is_positive(dentry))
78263+ if (d_is_positive(dentry)) {
78264+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
78265+ error = -ENOENT;
78266 goto fail;
78267-
78268+ }
78269 /*
78270 * Special case - lookup gave negative, but... we had foo/bar/
78271 * From the vfs_mknod() POV we just have a negative dentry -
78272@@ -3428,6 +3522,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
78273 }
78274 EXPORT_SYMBOL(user_path_create);
78275
78276+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
78277+{
78278+ struct filename *tmp = getname(pathname);
78279+ struct dentry *res;
78280+ if (IS_ERR(tmp))
78281+ return ERR_CAST(tmp);
78282+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
78283+ if (IS_ERR(res))
78284+ putname(tmp);
78285+ else
78286+ *to = tmp;
78287+ return res;
78288+}
78289+
78290 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
78291 {
78292 int error = may_create(dir, dentry);
78293@@ -3491,6 +3599,17 @@ retry:
78294
78295 if (!IS_POSIXACL(path.dentry->d_inode))
78296 mode &= ~current_umask();
78297+
78298+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
78299+ error = -EPERM;
78300+ goto out;
78301+ }
78302+
78303+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
78304+ error = -EACCES;
78305+ goto out;
78306+ }
78307+
78308 error = security_path_mknod(&path, dentry, mode, dev);
78309 if (error)
78310 goto out;
78311@@ -3506,6 +3625,8 @@ retry:
78312 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
78313 break;
78314 }
78315+ if (!error)
78316+ gr_handle_create(dentry, path.mnt);
78317 out:
78318 done_path_create(&path, dentry);
78319 if (retry_estale(error, lookup_flags)) {
78320@@ -3560,9 +3681,16 @@ retry:
78321
78322 if (!IS_POSIXACL(path.dentry->d_inode))
78323 mode &= ~current_umask();
78324+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
78325+ error = -EACCES;
78326+ goto out;
78327+ }
78328 error = security_path_mkdir(&path, dentry, mode);
78329 if (!error)
78330 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
78331+ if (!error)
78332+ gr_handle_create(dentry, path.mnt);
78333+out:
78334 done_path_create(&path, dentry);
78335 if (retry_estale(error, lookup_flags)) {
78336 lookup_flags |= LOOKUP_REVAL;
78337@@ -3595,7 +3723,7 @@ void dentry_unhash(struct dentry *dentry)
78338 {
78339 shrink_dcache_parent(dentry);
78340 spin_lock(&dentry->d_lock);
78341- if (dentry->d_lockref.count == 1)
78342+ if (__lockref_read(&dentry->d_lockref) == 1)
78343 __d_drop(dentry);
78344 spin_unlock(&dentry->d_lock);
78345 }
78346@@ -3646,6 +3774,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
78347 struct filename *name;
78348 struct dentry *dentry;
78349 struct nameidata nd;
78350+ u64 saved_ino = 0;
78351+ dev_t saved_dev = 0;
78352 unsigned int lookup_flags = 0;
78353 retry:
78354 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78355@@ -3678,10 +3808,21 @@ retry:
78356 error = -ENOENT;
78357 goto exit3;
78358 }
78359+
78360+ saved_ino = gr_get_ino_from_dentry(dentry);
78361+ saved_dev = gr_get_dev_from_dentry(dentry);
78362+
78363+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
78364+ error = -EACCES;
78365+ goto exit3;
78366+ }
78367+
78368 error = security_path_rmdir(&nd.path, dentry);
78369 if (error)
78370 goto exit3;
78371 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
78372+ if (!error && (saved_dev || saved_ino))
78373+ gr_handle_delete(saved_ino, saved_dev);
78374 exit3:
78375 dput(dentry);
78376 exit2:
78377@@ -3774,6 +3915,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
78378 struct nameidata nd;
78379 struct inode *inode = NULL;
78380 struct inode *delegated_inode = NULL;
78381+ u64 saved_ino = 0;
78382+ dev_t saved_dev = 0;
78383 unsigned int lookup_flags = 0;
78384 retry:
78385 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78386@@ -3800,10 +3943,22 @@ retry_deleg:
78387 if (d_is_negative(dentry))
78388 goto slashes;
78389 ihold(inode);
78390+
78391+ if (inode->i_nlink <= 1) {
78392+ saved_ino = gr_get_ino_from_dentry(dentry);
78393+ saved_dev = gr_get_dev_from_dentry(dentry);
78394+ }
78395+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
78396+ error = -EACCES;
78397+ goto exit2;
78398+ }
78399+
78400 error = security_path_unlink(&nd.path, dentry);
78401 if (error)
78402 goto exit2;
78403 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
78404+ if (!error && (saved_ino || saved_dev))
78405+ gr_handle_delete(saved_ino, saved_dev);
78406 exit2:
78407 dput(dentry);
78408 }
78409@@ -3892,9 +4047,17 @@ retry:
78410 if (IS_ERR(dentry))
78411 goto out_putname;
78412
78413+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
78414+ error = -EACCES;
78415+ goto out;
78416+ }
78417+
78418 error = security_path_symlink(&path, dentry, from->name);
78419 if (!error)
78420 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
78421+ if (!error)
78422+ gr_handle_create(dentry, path.mnt);
78423+out:
78424 done_path_create(&path, dentry);
78425 if (retry_estale(error, lookup_flags)) {
78426 lookup_flags |= LOOKUP_REVAL;
78427@@ -3998,6 +4161,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
78428 struct dentry *new_dentry;
78429 struct path old_path, new_path;
78430 struct inode *delegated_inode = NULL;
78431+ struct filename *to = NULL;
78432 int how = 0;
78433 int error;
78434
78435@@ -4021,7 +4185,7 @@ retry:
78436 if (error)
78437 return error;
78438
78439- new_dentry = user_path_create(newdfd, newname, &new_path,
78440+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
78441 (how & LOOKUP_REVAL));
78442 error = PTR_ERR(new_dentry);
78443 if (IS_ERR(new_dentry))
78444@@ -4033,11 +4197,26 @@ retry:
78445 error = may_linkat(&old_path);
78446 if (unlikely(error))
78447 goto out_dput;
78448+
78449+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt, to)) {
78450+ error = -EACCES;
78451+ goto out_dput;
78452+ }
78453+
78454+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
78455+ old_path.dentry, old_path.mnt, to)) {
78456+ error = -EACCES;
78457+ goto out_dput;
78458+ }
78459+
78460 error = security_path_link(old_path.dentry, &new_path, new_dentry);
78461 if (error)
78462 goto out_dput;
78463 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
78464+ if (!error)
78465+ gr_handle_create(new_dentry, new_path.mnt);
78466 out_dput:
78467+ putname(to);
78468 done_path_create(&new_path, new_dentry);
78469 if (delegated_inode) {
78470 error = break_deleg_wait(&delegated_inode);
78471@@ -4353,6 +4532,20 @@ retry_deleg:
78472 if (new_dentry == trap)
78473 goto exit5;
78474
78475+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
78476+ /* use EXDEV error to cause 'mv' to switch to an alternative
78477+ * method for usability
78478+ */
78479+ error = -EXDEV;
78480+ goto exit5;
78481+ }
78482+
78483+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
78484+ old_dentry, d_backing_inode(old_dir), oldnd.path.mnt,
78485+ to, flags);
78486+ if (error)
78487+ goto exit5;
78488+
78489 error = security_path_rename(&oldnd.path, old_dentry,
78490 &newnd.path, new_dentry, flags);
78491 if (error)
78492@@ -4360,6 +4553,9 @@ retry_deleg:
78493 error = vfs_rename(old_dir->d_inode, old_dentry,
78494 new_dir->d_inode, new_dentry,
78495 &delegated_inode, flags);
78496+ if (!error)
78497+ gr_handle_rename(d_backing_inode(old_dir), d_backing_inode(new_dir), old_dentry,
78498+ new_dentry, oldnd.path.mnt, d_is_positive(new_dentry) ? 1 : 0, flags);
78499 exit5:
78500 dput(new_dentry);
78501 exit4:
78502@@ -4416,14 +4612,24 @@ EXPORT_SYMBOL(vfs_whiteout);
78503
78504 int readlink_copy(char __user *buffer, int buflen, const char *link)
78505 {
78506+ char tmpbuf[64];
78507+ const char *newlink;
78508 int len = PTR_ERR(link);
78509+
78510 if (IS_ERR(link))
78511 goto out;
78512
78513 len = strlen(link);
78514 if (len > (unsigned) buflen)
78515 len = buflen;
78516- if (copy_to_user(buffer, link, len))
78517+
78518+ if (len < sizeof(tmpbuf)) {
78519+ memcpy(tmpbuf, link, len);
78520+ newlink = tmpbuf;
78521+ } else
78522+ newlink = link;
78523+
78524+ if (copy_to_user(buffer, newlink, len))
78525 len = -EFAULT;
78526 out:
78527 return len;
78528diff --git a/fs/namespace.c b/fs/namespace.c
78529index fce3cc1..ac3626c 100644
78530--- a/fs/namespace.c
78531+++ b/fs/namespace.c
78532@@ -1505,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
78533 if (!(sb->s_flags & MS_RDONLY))
78534 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
78535 up_write(&sb->s_umount);
78536+
78537+ gr_log_remount(mnt->mnt_devname, retval);
78538+
78539 return retval;
78540 }
78541
78542@@ -1527,6 +1530,9 @@ static int do_umount(struct mount *mnt, int flags)
78543 }
78544 unlock_mount_hash();
78545 namespace_unlock();
78546+
78547+ gr_log_unmount(mnt->mnt_devname, retval);
78548+
78549 return retval;
78550 }
78551
78552@@ -1581,7 +1587,7 @@ static inline bool may_mount(void)
78553 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
78554 */
78555
78556-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
78557+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
78558 {
78559 struct path path;
78560 struct mount *mnt;
78561@@ -1626,7 +1632,7 @@ out:
78562 /*
78563 * The 2.0 compatible umount. No flags.
78564 */
78565-SYSCALL_DEFINE1(oldumount, char __user *, name)
78566+SYSCALL_DEFINE1(oldumount, const char __user *, name)
78567 {
78568 return sys_umount(name, 0);
78569 }
78570@@ -2701,6 +2707,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
78571 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
78572 MS_STRICTATIME);
78573
78574+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
78575+ retval = -EPERM;
78576+ goto dput_out;
78577+ }
78578+
78579+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
78580+ retval = -EPERM;
78581+ goto dput_out;
78582+ }
78583+
78584 if (flags & MS_REMOUNT)
78585 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
78586 data_page);
78587@@ -2714,7 +2730,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
78588 retval = do_new_mount(&path, type_page, flags, mnt_flags,
78589 dev_name, data_page);
78590 dput_out:
78591+ gr_log_mount(dev_name, &path, retval);
78592+
78593 path_put(&path);
78594+
78595 return retval;
78596 }
78597
78598@@ -2732,7 +2751,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
78599 * number incrementing at 10Ghz will take 12,427 years to wrap which
78600 * is effectively never, so we can ignore the possibility.
78601 */
78602-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
78603+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
78604
78605 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78606 {
78607@@ -2748,7 +2767,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78608 return ERR_PTR(ret);
78609 }
78610 new_ns->ns.ops = &mntns_operations;
78611- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
78612+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
78613 atomic_set(&new_ns->count, 1);
78614 new_ns->root = NULL;
78615 INIT_LIST_HEAD(&new_ns->list);
78616@@ -2758,7 +2777,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78617 return new_ns;
78618 }
78619
78620-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
78621+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
78622 struct user_namespace *user_ns, struct fs_struct *new_fs)
78623 {
78624 struct mnt_namespace *new_ns;
78625@@ -2879,8 +2898,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
78626 }
78627 EXPORT_SYMBOL(mount_subtree);
78628
78629-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
78630- char __user *, type, unsigned long, flags, void __user *, data)
78631+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
78632+ const char __user *, type, unsigned long, flags, void __user *, data)
78633 {
78634 int ret;
78635 char *kernel_type;
78636@@ -2986,6 +3005,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
78637 if (error)
78638 goto out2;
78639
78640+ if (gr_handle_chroot_pivot()) {
78641+ error = -EPERM;
78642+ goto out2;
78643+ }
78644+
78645 get_fs_root(current->fs, &root);
78646 old_mp = lock_mount(&old);
78647 error = PTR_ERR(old_mp);
78648@@ -3287,7 +3311,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
78649 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
78650 return -EPERM;
78651
78652- if (fs->users != 1)
78653+ if (atomic_read(&fs->users) != 1)
78654 return -EINVAL;
78655
78656 get_mnt_ns(mnt_ns);
78657diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
78658index 19ca95c..b28702c 100644
78659--- a/fs/nfs/callback_xdr.c
78660+++ b/fs/nfs/callback_xdr.c
78661@@ -51,7 +51,7 @@ struct callback_op {
78662 callback_decode_arg_t decode_args;
78663 callback_encode_res_t encode_res;
78664 long res_maxsize;
78665-};
78666+} __do_const;
78667
78668 static struct callback_op callback_ops[];
78669
78670diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
78671index 5d25b9d..765fc0f 100644
78672--- a/fs/nfs/inode.c
78673+++ b/fs/nfs/inode.c
78674@@ -1277,16 +1277,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
78675 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
78676 }
78677
78678-static atomic_long_t nfs_attr_generation_counter;
78679+static atomic_long_unchecked_t nfs_attr_generation_counter;
78680
78681 static unsigned long nfs_read_attr_generation_counter(void)
78682 {
78683- return atomic_long_read(&nfs_attr_generation_counter);
78684+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
78685 }
78686
78687 unsigned long nfs_inc_attr_generation_counter(void)
78688 {
78689- return atomic_long_inc_return(&nfs_attr_generation_counter);
78690+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
78691 }
78692 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
78693
78694diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
78695index 9e6475b..7970138 100644
78696--- a/fs/nfs/internal.h
78697+++ b/fs/nfs/internal.h
78698@@ -296,6 +296,22 @@ extern struct rpc_procinfo nfs4_procedures[];
78699
78700 #ifdef CONFIG_NFS_V4_SECURITY_LABEL
78701 extern struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags);
78702+static inline struct nfs4_label *
78703+nfs4_label_copy(struct nfs4_label *dst, struct nfs4_label *src)
78704+{
78705+ if (!dst || !src)
78706+ return NULL;
78707+
78708+ if (src->len > NFS4_MAXLABELLEN)
78709+ return NULL;
78710+
78711+ dst->lfs = src->lfs;
78712+ dst->pi = src->pi;
78713+ dst->len = src->len;
78714+ memcpy(dst->label, src->label, src->len);
78715+
78716+ return dst;
78717+}
78718 static inline void nfs4_label_free(struct nfs4_label *label)
78719 {
78720 if (label) {
78721@@ -316,6 +332,11 @@ static inline void nfs4_label_free(void *label) {}
78722 static inline void nfs_zap_label_cache_locked(struct nfs_inode *nfsi)
78723 {
78724 }
78725+static inline struct nfs4_label *
78726+nfs4_label_copy(struct nfs4_label *dst, struct nfs4_label *src)
78727+{
78728+ return NULL;
78729+}
78730 #endif /* CONFIG_NFS_V4_SECURITY_LABEL */
78731
78732 /* proc.c */
78733diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
78734index d3f2051..dd338dc 100644
78735--- a/fs/nfs/nfs4proc.c
78736+++ b/fs/nfs/nfs4proc.c
78737@@ -916,6 +916,7 @@ struct nfs4_opendata {
78738 struct nfs_open_confirmres c_res;
78739 struct nfs4_string owner_name;
78740 struct nfs4_string group_name;
78741+ struct nfs4_label *a_label;
78742 struct nfs_fattr f_attr;
78743 struct nfs4_label *f_label;
78744 struct dentry *dir;
78745@@ -1019,6 +1020,10 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
78746 if (IS_ERR(p->f_label))
78747 goto err_free_p;
78748
78749+ p->a_label = nfs4_label_alloc(server, gfp_mask);
78750+ if (IS_ERR(p->a_label))
78751+ goto err_free_f;
78752+
78753 alloc_seqid = server->nfs_client->cl_mvops->alloc_seqid;
78754 p->o_arg.seqid = alloc_seqid(&sp->so_seqid, gfp_mask);
78755 if (IS_ERR(p->o_arg.seqid))
78756@@ -1047,7 +1052,7 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
78757 p->o_arg.server = server;
78758 p->o_arg.bitmask = nfs4_bitmask(server, label);
78759 p->o_arg.open_bitmap = &nfs4_fattr_bitmap[0];
78760- p->o_arg.label = label;
78761+ p->o_arg.label = nfs4_label_copy(p->a_label, label);
78762 p->o_arg.claim = nfs4_map_atomic_open_claim(server, claim);
78763 switch (p->o_arg.claim) {
78764 case NFS4_OPEN_CLAIM_NULL:
78765@@ -1080,6 +1085,8 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
78766 return p;
78767
78768 err_free_label:
78769+ nfs4_label_free(p->a_label);
78770+err_free_f:
78771 nfs4_label_free(p->f_label);
78772 err_free_p:
78773 kfree(p);
78774@@ -1099,6 +1106,7 @@ static void nfs4_opendata_free(struct kref *kref)
78775 nfs4_put_open_state(p->state);
78776 nfs4_put_state_owner(p->owner);
78777
78778+ nfs4_label_free(p->a_label);
78779 nfs4_label_free(p->f_label);
78780
78781 dput(p->dir);
78782diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
78783index 864e200..357c255 100644
78784--- a/fs/nfsd/nfs4proc.c
78785+++ b/fs/nfsd/nfs4proc.c
78786@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
78787 nfsd4op_rsize op_rsize_bop;
78788 stateid_getter op_get_currentstateid;
78789 stateid_setter op_set_currentstateid;
78790-};
78791+} __do_const;
78792
78793 static struct nfsd4_operation nfsd4_ops[];
78794
78795diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
78796index d4d8445..36ae1a1 100644
78797--- a/fs/nfsd/nfs4xdr.c
78798+++ b/fs/nfsd/nfs4xdr.c
78799@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
78800
78801 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
78802
78803-static nfsd4_dec nfsd4_dec_ops[] = {
78804+static const nfsd4_dec nfsd4_dec_ops[] = {
78805 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
78806 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
78807 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
78808diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
78809index 46ec934..f384e41 100644
78810--- a/fs/nfsd/nfscache.c
78811+++ b/fs/nfsd/nfscache.c
78812@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
78813 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
78814 u32 hash;
78815 struct nfsd_drc_bucket *b;
78816- int len;
78817+ long len;
78818 size_t bufsize = 0;
78819
78820 if (!rp)
78821@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
78822 hash = nfsd_cache_hash(rp->c_xid);
78823 b = &drc_hashtbl[hash];
78824
78825- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
78826- len >>= 2;
78827+ if (statp) {
78828+ len = (char*)statp - (char*)resv->iov_base;
78829+ len = resv->iov_len - len;
78830+ len >>= 2;
78831+ }
78832
78833 /* Don't cache excessive amounts of data and XDR failures */
78834- if (!statp || len > (256 >> 2)) {
78835+ if (!statp || len > (256 >> 2) || len < 0) {
78836 nfsd_reply_cache_free(b, rp);
78837 return;
78838 }
78839@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
78840 switch (cachetype) {
78841 case RC_REPLSTAT:
78842 if (len != 1)
78843- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
78844+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
78845 rp->c_replstat = *statp;
78846 break;
78847 case RC_REPLBUFF:
78848diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
78849index 84d770b..929bc5e 100644
78850--- a/fs/nfsd/vfs.c
78851+++ b/fs/nfsd/vfs.c
78852@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
78853
78854 oldfs = get_fs();
78855 set_fs(KERNEL_DS);
78856- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
78857+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
78858 set_fs(oldfs);
78859 return nfsd_finish_read(file, count, host_err);
78860 }
78861@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
78862
78863 /* Write the data. */
78864 oldfs = get_fs(); set_fs(KERNEL_DS);
78865- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
78866+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
78867 set_fs(oldfs);
78868 if (host_err < 0)
78869 goto out_nfserr;
78870@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
78871 */
78872
78873 oldfs = get_fs(); set_fs(KERNEL_DS);
78874- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
78875+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
78876 set_fs(oldfs);
78877
78878 if (host_err < 0)
78879diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
78880index 52ccd34..7a6b202 100644
78881--- a/fs/nls/nls_base.c
78882+++ b/fs/nls/nls_base.c
78883@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
78884
78885 int __register_nls(struct nls_table *nls, struct module *owner)
78886 {
78887- struct nls_table ** tmp = &tables;
78888+ struct nls_table *tmp = tables;
78889
78890 if (nls->next)
78891 return -EBUSY;
78892
78893- nls->owner = owner;
78894+ pax_open_kernel();
78895+ *(void **)&nls->owner = owner;
78896+ pax_close_kernel();
78897 spin_lock(&nls_lock);
78898- while (*tmp) {
78899- if (nls == *tmp) {
78900+ while (tmp) {
78901+ if (nls == tmp) {
78902 spin_unlock(&nls_lock);
78903 return -EBUSY;
78904 }
78905- tmp = &(*tmp)->next;
78906+ tmp = tmp->next;
78907 }
78908- nls->next = tables;
78909+ pax_open_kernel();
78910+ *(struct nls_table **)&nls->next = tables;
78911+ pax_close_kernel();
78912 tables = nls;
78913 spin_unlock(&nls_lock);
78914 return 0;
78915@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
78916
78917 int unregister_nls(struct nls_table * nls)
78918 {
78919- struct nls_table ** tmp = &tables;
78920+ struct nls_table * const * tmp = &tables;
78921
78922 spin_lock(&nls_lock);
78923 while (*tmp) {
78924 if (nls == *tmp) {
78925- *tmp = nls->next;
78926+ pax_open_kernel();
78927+ *(struct nls_table **)tmp = nls->next;
78928+ pax_close_kernel();
78929 spin_unlock(&nls_lock);
78930 return 0;
78931 }
78932@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
78933 return -EINVAL;
78934 }
78935
78936-static struct nls_table *find_nls(char *charset)
78937+static struct nls_table *find_nls(const char *charset)
78938 {
78939 struct nls_table *nls;
78940 spin_lock(&nls_lock);
78941@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
78942 return nls;
78943 }
78944
78945-struct nls_table *load_nls(char *charset)
78946+struct nls_table *load_nls(const char *charset)
78947 {
78948 return try_then_request_module(find_nls(charset), "nls_%s", charset);
78949 }
78950diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
78951index 162b3f1..6076a7c 100644
78952--- a/fs/nls/nls_euc-jp.c
78953+++ b/fs/nls/nls_euc-jp.c
78954@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
78955 p_nls = load_nls("cp932");
78956
78957 if (p_nls) {
78958- table.charset2upper = p_nls->charset2upper;
78959- table.charset2lower = p_nls->charset2lower;
78960+ pax_open_kernel();
78961+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
78962+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
78963+ pax_close_kernel();
78964 return register_nls(&table);
78965 }
78966
78967diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
78968index a80a741..7b96e1b 100644
78969--- a/fs/nls/nls_koi8-ru.c
78970+++ b/fs/nls/nls_koi8-ru.c
78971@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
78972 p_nls = load_nls("koi8-u");
78973
78974 if (p_nls) {
78975- table.charset2upper = p_nls->charset2upper;
78976- table.charset2lower = p_nls->charset2lower;
78977+ pax_open_kernel();
78978+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
78979+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
78980+ pax_close_kernel();
78981 return register_nls(&table);
78982 }
78983
78984diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
78985index cf27550..6c70f29d 100644
78986--- a/fs/notify/fanotify/fanotify_user.c
78987+++ b/fs/notify/fanotify/fanotify_user.c
78988@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
78989
78990 fd = fanotify_event_metadata.fd;
78991 ret = -EFAULT;
78992- if (copy_to_user(buf, &fanotify_event_metadata,
78993- fanotify_event_metadata.event_len))
78994+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
78995+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
78996 goto out_close_fd;
78997
78998 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
78999diff --git a/fs/notify/notification.c b/fs/notify/notification.c
79000index a95d8e0..a91a5fd 100644
79001--- a/fs/notify/notification.c
79002+++ b/fs/notify/notification.c
79003@@ -48,7 +48,7 @@
79004 #include <linux/fsnotify_backend.h>
79005 #include "fsnotify.h"
79006
79007-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79008+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79009
79010 /**
79011 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
79012@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79013 */
79014 u32 fsnotify_get_cookie(void)
79015 {
79016- return atomic_inc_return(&fsnotify_sync_cookie);
79017+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
79018 }
79019 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
79020
79021diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
79022index 9e38daf..5727cae 100644
79023--- a/fs/ntfs/dir.c
79024+++ b/fs/ntfs/dir.c
79025@@ -1310,7 +1310,7 @@ find_next_index_buffer:
79026 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
79027 ~(s64)(ndir->itype.index.block_size - 1)));
79028 /* Bounds checks. */
79029- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79030+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79031 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
79032 "inode 0x%lx or driver bug.", vdir->i_ino);
79033 goto err_out;
79034diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
79035index 9e1e112..241a52a 100644
79036--- a/fs/ntfs/super.c
79037+++ b/fs/ntfs/super.c
79038@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79039 if (!silent)
79040 ntfs_error(sb, "Primary boot sector is invalid.");
79041 } else if (!silent)
79042- ntfs_error(sb, read_err_str, "primary");
79043+ ntfs_error(sb, read_err_str, "%s", "primary");
79044 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
79045 if (bh_primary)
79046 brelse(bh_primary);
79047@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79048 goto hotfix_primary_boot_sector;
79049 brelse(bh_backup);
79050 } else if (!silent)
79051- ntfs_error(sb, read_err_str, "backup");
79052+ ntfs_error(sb, read_err_str, "%s", "backup");
79053 /* Try to read NT3.51- backup boot sector. */
79054 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
79055 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
79056@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79057 "sector.");
79058 brelse(bh_backup);
79059 } else if (!silent)
79060- ntfs_error(sb, read_err_str, "backup");
79061+ ntfs_error(sb, read_err_str, "%s", "backup");
79062 /* We failed. Cleanup and return. */
79063 if (bh_primary)
79064 brelse(bh_primary);
79065diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
79066index 857bbbc..3c47d15 100644
79067--- a/fs/ocfs2/localalloc.c
79068+++ b/fs/ocfs2/localalloc.c
79069@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
79070 goto bail;
79071 }
79072
79073- atomic_inc(&osb->alloc_stats.moves);
79074+ atomic_inc_unchecked(&osb->alloc_stats.moves);
79075
79076 bail:
79077 if (handle)
79078diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
79079index 460c6c3..b4ef513 100644
79080--- a/fs/ocfs2/ocfs2.h
79081+++ b/fs/ocfs2/ocfs2.h
79082@@ -247,11 +247,11 @@ enum ocfs2_vol_state
79083
79084 struct ocfs2_alloc_stats
79085 {
79086- atomic_t moves;
79087- atomic_t local_data;
79088- atomic_t bitmap_data;
79089- atomic_t bg_allocs;
79090- atomic_t bg_extends;
79091+ atomic_unchecked_t moves;
79092+ atomic_unchecked_t local_data;
79093+ atomic_unchecked_t bitmap_data;
79094+ atomic_unchecked_t bg_allocs;
79095+ atomic_unchecked_t bg_extends;
79096 };
79097
79098 enum ocfs2_local_alloc_state
79099diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
79100index 4479029..5de740b 100644
79101--- a/fs/ocfs2/suballoc.c
79102+++ b/fs/ocfs2/suballoc.c
79103@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
79104 mlog_errno(status);
79105 goto bail;
79106 }
79107- atomic_inc(&osb->alloc_stats.bg_extends);
79108+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
79109
79110 /* You should never ask for this much metadata */
79111 BUG_ON(bits_wanted >
79112@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
79113 mlog_errno(status);
79114 goto bail;
79115 }
79116- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79117+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79118
79119 *suballoc_loc = res.sr_bg_blkno;
79120 *suballoc_bit_start = res.sr_bit_offset;
79121@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
79122 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
79123 res->sr_bits);
79124
79125- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79126+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79127
79128 BUG_ON(res->sr_bits != 1);
79129
79130@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
79131 mlog_errno(status);
79132 goto bail;
79133 }
79134- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79135+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79136
79137 BUG_ON(res.sr_bits != 1);
79138
79139@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79140 cluster_start,
79141 num_clusters);
79142 if (!status)
79143- atomic_inc(&osb->alloc_stats.local_data);
79144+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
79145 } else {
79146 if (min_clusters > (osb->bitmap_cpg - 1)) {
79147 /* The only paths asking for contiguousness
79148@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79149 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
79150 res.sr_bg_blkno,
79151 res.sr_bit_offset);
79152- atomic_inc(&osb->alloc_stats.bitmap_data);
79153+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
79154 *num_clusters = res.sr_bits;
79155 }
79156 }
79157diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
79158index 403c566..6525b35 100644
79159--- a/fs/ocfs2/super.c
79160+++ b/fs/ocfs2/super.c
79161@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
79162 "%10s => GlobalAllocs: %d LocalAllocs: %d "
79163 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
79164 "Stats",
79165- atomic_read(&osb->alloc_stats.bitmap_data),
79166- atomic_read(&osb->alloc_stats.local_data),
79167- atomic_read(&osb->alloc_stats.bg_allocs),
79168- atomic_read(&osb->alloc_stats.moves),
79169- atomic_read(&osb->alloc_stats.bg_extends));
79170+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
79171+ atomic_read_unchecked(&osb->alloc_stats.local_data),
79172+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
79173+ atomic_read_unchecked(&osb->alloc_stats.moves),
79174+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
79175
79176 out += snprintf(buf + out, len - out,
79177 "%10s => State: %u Descriptor: %llu Size: %u bits "
79178@@ -2095,11 +2095,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
79179
79180 mutex_init(&osb->system_file_mutex);
79181
79182- atomic_set(&osb->alloc_stats.moves, 0);
79183- atomic_set(&osb->alloc_stats.local_data, 0);
79184- atomic_set(&osb->alloc_stats.bitmap_data, 0);
79185- atomic_set(&osb->alloc_stats.bg_allocs, 0);
79186- atomic_set(&osb->alloc_stats.bg_extends, 0);
79187+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
79188+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
79189+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
79190+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
79191+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
79192
79193 /* Copy the blockcheck stats from the superblock probe */
79194 osb->osb_ecc_stats = *stats;
79195diff --git a/fs/open.c b/fs/open.c
79196index 98e5a52..8e77e14 100644
79197--- a/fs/open.c
79198+++ b/fs/open.c
79199@@ -32,6 +32,8 @@
79200 #include <linux/dnotify.h>
79201 #include <linux/compat.h>
79202
79203+#define CREATE_TRACE_POINTS
79204+#include <trace/events/fs.h>
79205 #include "internal.h"
79206
79207 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
79208@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
79209 error = locks_verify_truncate(inode, NULL, length);
79210 if (!error)
79211 error = security_path_truncate(path);
79212+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
79213+ error = -EACCES;
79214 if (!error)
79215 error = do_truncate(path->dentry, length, 0, NULL);
79216
79217@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
79218 error = locks_verify_truncate(inode, f.file, length);
79219 if (!error)
79220 error = security_path_truncate(&f.file->f_path);
79221+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
79222+ error = -EACCES;
79223 if (!error)
79224 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
79225 sb_end_write(inode->i_sb);
79226@@ -396,6 +402,9 @@ retry:
79227 if (__mnt_is_readonly(path.mnt))
79228 res = -EROFS;
79229
79230+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
79231+ res = -EACCES;
79232+
79233 out_path_release:
79234 path_put(&path);
79235 if (retry_estale(res, lookup_flags)) {
79236@@ -427,6 +436,8 @@ retry:
79237 if (error)
79238 goto dput_and_out;
79239
79240+ gr_log_chdir(path.dentry, path.mnt);
79241+
79242 set_fs_pwd(current->fs, &path);
79243
79244 dput_and_out:
79245@@ -456,6 +467,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
79246 goto out_putf;
79247
79248 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
79249+
79250+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
79251+ error = -EPERM;
79252+
79253+ if (!error)
79254+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
79255+
79256 if (!error)
79257 set_fs_pwd(current->fs, &f.file->f_path);
79258 out_putf:
79259@@ -485,7 +503,13 @@ retry:
79260 if (error)
79261 goto dput_and_out;
79262
79263+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
79264+ goto dput_and_out;
79265+
79266 set_fs_root(current->fs, &path);
79267+
79268+ gr_handle_chroot_chdir(&path);
79269+
79270 error = 0;
79271 dput_and_out:
79272 path_put(&path);
79273@@ -509,6 +533,16 @@ static int chmod_common(struct path *path, umode_t mode)
79274 return error;
79275 retry_deleg:
79276 mutex_lock(&inode->i_mutex);
79277+
79278+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
79279+ error = -EACCES;
79280+ goto out_unlock;
79281+ }
79282+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
79283+ error = -EACCES;
79284+ goto out_unlock;
79285+ }
79286+
79287 error = security_path_chmod(path, mode);
79288 if (error)
79289 goto out_unlock;
79290@@ -574,6 +608,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
79291 uid = make_kuid(current_user_ns(), user);
79292 gid = make_kgid(current_user_ns(), group);
79293
79294+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
79295+ return -EACCES;
79296+
79297 retry_deleg:
79298 newattrs.ia_valid = ATTR_CTIME;
79299 if (user != (uid_t) -1) {
79300@@ -1018,6 +1055,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
79301 } else {
79302 fsnotify_open(f);
79303 fd_install(fd, f);
79304+ trace_do_sys_open(tmp->name, flags, mode);
79305 }
79306 }
79307 putname(tmp);
79308diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
79309index 04f1248..60b3be1 100644
79310--- a/fs/overlayfs/inode.c
79311+++ b/fs/overlayfs/inode.c
79312@@ -344,6 +344,9 @@ static int ovl_dentry_open(struct dentry *dentry, struct file *file,
79313 enum ovl_path_type type;
79314 bool want_write = false;
79315
79316+ if (d_is_dir(dentry))
79317+ return d_backing_inode(dentry);
79318+
79319 type = ovl_path_real(dentry, &realpath);
79320 if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
79321 want_write = true;
79322diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
79323index bf8537c..c16ef7d 100644
79324--- a/fs/overlayfs/super.c
79325+++ b/fs/overlayfs/super.c
79326@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
79327 {
79328 struct ovl_entry *oe = dentry->d_fsdata;
79329
79330- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
79331+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
79332 }
79333
79334 int ovl_want_write(struct dentry *dentry)
79335@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
79336
79337 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
79338 {
79339- struct path upperpath = { NULL, NULL };
79340- struct path workpath = { NULL, NULL };
79341+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
79342+ struct path workpath = { .dentry = NULL, .mnt = NULL };
79343 struct dentry *root_dentry;
79344 struct ovl_entry *oe;
79345 struct ovl_fs *ufs;
79346diff --git a/fs/pipe.c b/fs/pipe.c
79347index 8865f79..bd2c79b 100644
79348--- a/fs/pipe.c
79349+++ b/fs/pipe.c
79350@@ -36,7 +36,7 @@ unsigned int pipe_max_size = 1048576;
79351 /*
79352 * Minimum pipe size, as required by POSIX
79353 */
79354-unsigned int pipe_min_size = PAGE_SIZE;
79355+unsigned int pipe_min_size __read_only = PAGE_SIZE;
79356
79357 /*
79358 * We use a start+len construction, which provides full use of the
79359@@ -55,7 +55,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
79360
79361 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
79362 {
79363- if (pipe->files)
79364+ if (atomic_read(&pipe->files))
79365 mutex_lock_nested(&pipe->mutex, subclass);
79366 }
79367
79368@@ -70,7 +70,7 @@ EXPORT_SYMBOL(pipe_lock);
79369
79370 void pipe_unlock(struct pipe_inode_info *pipe)
79371 {
79372- if (pipe->files)
79373+ if (atomic_read(&pipe->files))
79374 mutex_unlock(&pipe->mutex);
79375 }
79376 EXPORT_SYMBOL(pipe_unlock);
79377@@ -291,9 +291,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
79378 }
79379 if (bufs) /* More to do? */
79380 continue;
79381- if (!pipe->writers)
79382+ if (!atomic_read(&pipe->writers))
79383 break;
79384- if (!pipe->waiting_writers) {
79385+ if (!atomic_read(&pipe->waiting_writers)) {
79386 /* syscall merging: Usually we must not sleep
79387 * if O_NONBLOCK is set, or if we got some data.
79388 * But if a writer sleeps in kernel space, then
79389@@ -350,7 +350,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79390
79391 __pipe_lock(pipe);
79392
79393- if (!pipe->readers) {
79394+ if (!atomic_read(&pipe->readers)) {
79395 send_sig(SIGPIPE, current, 0);
79396 ret = -EPIPE;
79397 goto out;
79398@@ -386,7 +386,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79399 for (;;) {
79400 int bufs;
79401
79402- if (!pipe->readers) {
79403+ if (!atomic_read(&pipe->readers)) {
79404 send_sig(SIGPIPE, current, 0);
79405 if (!ret)
79406 ret = -EPIPE;
79407@@ -454,9 +454,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79408 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79409 do_wakeup = 0;
79410 }
79411- pipe->waiting_writers++;
79412+ atomic_inc(&pipe->waiting_writers);
79413 pipe_wait(pipe);
79414- pipe->waiting_writers--;
79415+ atomic_dec(&pipe->waiting_writers);
79416 }
79417 out:
79418 __pipe_unlock(pipe);
79419@@ -511,7 +511,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79420 mask = 0;
79421 if (filp->f_mode & FMODE_READ) {
79422 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
79423- if (!pipe->writers && filp->f_version != pipe->w_counter)
79424+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
79425 mask |= POLLHUP;
79426 }
79427
79428@@ -521,7 +521,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79429 * Most Unices do not set POLLERR for FIFOs but on Linux they
79430 * behave exactly like pipes for poll().
79431 */
79432- if (!pipe->readers)
79433+ if (!atomic_read(&pipe->readers))
79434 mask |= POLLERR;
79435 }
79436
79437@@ -533,7 +533,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
79438 int kill = 0;
79439
79440 spin_lock(&inode->i_lock);
79441- if (!--pipe->files) {
79442+ if (atomic_dec_and_test(&pipe->files)) {
79443 inode->i_pipe = NULL;
79444 kill = 1;
79445 }
79446@@ -550,11 +550,11 @@ pipe_release(struct inode *inode, struct file *file)
79447
79448 __pipe_lock(pipe);
79449 if (file->f_mode & FMODE_READ)
79450- pipe->readers--;
79451+ atomic_dec(&pipe->readers);
79452 if (file->f_mode & FMODE_WRITE)
79453- pipe->writers--;
79454+ atomic_dec(&pipe->writers);
79455
79456- if (pipe->readers || pipe->writers) {
79457+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
79458 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
79459 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79460 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
79461@@ -619,7 +619,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
79462 kfree(pipe);
79463 }
79464
79465-static struct vfsmount *pipe_mnt __read_mostly;
79466+struct vfsmount *pipe_mnt __read_mostly;
79467
79468 /*
79469 * pipefs_dname() is called from d_path().
79470@@ -649,8 +649,9 @@ static struct inode * get_pipe_inode(void)
79471 goto fail_iput;
79472
79473 inode->i_pipe = pipe;
79474- pipe->files = 2;
79475- pipe->readers = pipe->writers = 1;
79476+ atomic_set(&pipe->files, 2);
79477+ atomic_set(&pipe->readers, 1);
79478+ atomic_set(&pipe->writers, 1);
79479 inode->i_fop = &pipefifo_fops;
79480
79481 /*
79482@@ -829,17 +830,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
79483 spin_lock(&inode->i_lock);
79484 if (inode->i_pipe) {
79485 pipe = inode->i_pipe;
79486- pipe->files++;
79487+ atomic_inc(&pipe->files);
79488 spin_unlock(&inode->i_lock);
79489 } else {
79490 spin_unlock(&inode->i_lock);
79491 pipe = alloc_pipe_info();
79492 if (!pipe)
79493 return -ENOMEM;
79494- pipe->files = 1;
79495+ atomic_set(&pipe->files, 1);
79496 spin_lock(&inode->i_lock);
79497 if (unlikely(inode->i_pipe)) {
79498- inode->i_pipe->files++;
79499+ atomic_inc(&inode->i_pipe->files);
79500 spin_unlock(&inode->i_lock);
79501 free_pipe_info(pipe);
79502 pipe = inode->i_pipe;
79503@@ -864,10 +865,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
79504 * opened, even when there is no process writing the FIFO.
79505 */
79506 pipe->r_counter++;
79507- if (pipe->readers++ == 0)
79508+ if (atomic_inc_return(&pipe->readers) == 1)
79509 wake_up_partner(pipe);
79510
79511- if (!is_pipe && !pipe->writers) {
79512+ if (!is_pipe && !atomic_read(&pipe->writers)) {
79513 if ((filp->f_flags & O_NONBLOCK)) {
79514 /* suppress POLLHUP until we have
79515 * seen a writer */
79516@@ -886,14 +887,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
79517 * errno=ENXIO when there is no process reading the FIFO.
79518 */
79519 ret = -ENXIO;
79520- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
79521+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
79522 goto err;
79523
79524 pipe->w_counter++;
79525- if (!pipe->writers++)
79526+ if (atomic_inc_return(&pipe->writers) == 1)
79527 wake_up_partner(pipe);
79528
79529- if (!is_pipe && !pipe->readers) {
79530+ if (!is_pipe && !atomic_read(&pipe->readers)) {
79531 if (wait_for_partner(pipe, &pipe->r_counter))
79532 goto err_wr;
79533 }
79534@@ -907,11 +908,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
79535 * the process can at least talk to itself.
79536 */
79537
79538- pipe->readers++;
79539- pipe->writers++;
79540+ atomic_inc(&pipe->readers);
79541+ atomic_inc(&pipe->writers);
79542 pipe->r_counter++;
79543 pipe->w_counter++;
79544- if (pipe->readers == 1 || pipe->writers == 1)
79545+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
79546 wake_up_partner(pipe);
79547 break;
79548
79549@@ -925,13 +926,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
79550 return 0;
79551
79552 err_rd:
79553- if (!--pipe->readers)
79554+ if (atomic_dec_and_test(&pipe->readers))
79555 wake_up_interruptible(&pipe->wait);
79556 ret = -ERESTARTSYS;
79557 goto err;
79558
79559 err_wr:
79560- if (!--pipe->writers)
79561+ if (atomic_dec_and_test(&pipe->writers))
79562 wake_up_interruptible(&pipe->wait);
79563 ret = -ERESTARTSYS;
79564 goto err;
79565@@ -1007,7 +1008,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
79566 * Currently we rely on the pipe array holding a power-of-2 number
79567 * of pages.
79568 */
79569-static inline unsigned int round_pipe_size(unsigned int size)
79570+static inline unsigned long round_pipe_size(unsigned long size)
79571 {
79572 unsigned long nr_pages;
79573
79574@@ -1055,13 +1056,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
79575
79576 switch (cmd) {
79577 case F_SETPIPE_SZ: {
79578- unsigned int size, nr_pages;
79579+ unsigned long size, nr_pages;
79580+
79581+ ret = -EINVAL;
79582+ if (arg < pipe_min_size)
79583+ goto out;
79584
79585 size = round_pipe_size(arg);
79586 nr_pages = size >> PAGE_SHIFT;
79587
79588- ret = -EINVAL;
79589- if (!nr_pages)
79590+ if (size < pipe_min_size)
79591 goto out;
79592
79593 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
79594diff --git a/fs/posix_acl.c b/fs/posix_acl.c
79595index 84bb65b8..4270e47 100644
79596--- a/fs/posix_acl.c
79597+++ b/fs/posix_acl.c
79598@@ -20,6 +20,7 @@
79599 #include <linux/xattr.h>
79600 #include <linux/export.h>
79601 #include <linux/user_namespace.h>
79602+#include <linux/grsecurity.h>
79603
79604 struct posix_acl **acl_by_type(struct inode *inode, int type)
79605 {
79606@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
79607 }
79608 }
79609 if (mode_p)
79610- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79611+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79612 return not_equiv;
79613 }
79614 EXPORT_SYMBOL(posix_acl_equiv_mode);
79615@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
79616 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
79617 }
79618
79619- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79620+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79621 return not_equiv;
79622 }
79623
79624@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
79625 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
79626 int err = -ENOMEM;
79627 if (clone) {
79628+ *mode_p &= ~gr_acl_umask();
79629+
79630 err = posix_acl_create_masq(clone, mode_p);
79631 if (err < 0) {
79632 posix_acl_release(clone);
79633@@ -663,11 +666,12 @@ struct posix_acl *
79634 posix_acl_from_xattr(struct user_namespace *user_ns,
79635 const void *value, size_t size)
79636 {
79637- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
79638- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
79639+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
79640+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
79641 int count;
79642 struct posix_acl *acl;
79643 struct posix_acl_entry *acl_e;
79644+ umode_t umask = gr_acl_umask();
79645
79646 if (!value)
79647 return NULL;
79648@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
79649
79650 switch(acl_e->e_tag) {
79651 case ACL_USER_OBJ:
79652+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
79653+ break;
79654 case ACL_GROUP_OBJ:
79655 case ACL_MASK:
79656+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
79657+ break;
79658 case ACL_OTHER:
79659+ acl_e->e_perm &= ~(umask & S_IRWXO);
79660 break;
79661
79662 case ACL_USER:
79663+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
79664 acl_e->e_uid =
79665 make_kuid(user_ns,
79666 le32_to_cpu(entry->e_id));
79667@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
79668 goto fail;
79669 break;
79670 case ACL_GROUP:
79671+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
79672 acl_e->e_gid =
79673 make_kgid(user_ns,
79674 le32_to_cpu(entry->e_id));
79675diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
79676index 2183fcf..3c32a98 100644
79677--- a/fs/proc/Kconfig
79678+++ b/fs/proc/Kconfig
79679@@ -30,7 +30,7 @@ config PROC_FS
79680
79681 config PROC_KCORE
79682 bool "/proc/kcore support" if !ARM
79683- depends on PROC_FS && MMU
79684+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
79685 help
79686 Provides a virtual ELF core file of the live kernel. This can
79687 be read with gdb and other ELF tools. No modifications can be
79688@@ -38,8 +38,8 @@ config PROC_KCORE
79689
79690 config PROC_VMCORE
79691 bool "/proc/vmcore support"
79692- depends on PROC_FS && CRASH_DUMP
79693- default y
79694+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
79695+ default n
79696 help
79697 Exports the dump image of crashed kernel in ELF format.
79698
79699@@ -63,8 +63,8 @@ config PROC_SYSCTL
79700 limited in memory.
79701
79702 config PROC_PAGE_MONITOR
79703- default y
79704- depends on PROC_FS && MMU
79705+ default n
79706+ depends on PROC_FS && MMU && !GRKERNSEC
79707 bool "Enable /proc page monitoring" if EXPERT
79708 help
79709 Various /proc files exist to monitor process memory utilization:
79710diff --git a/fs/proc/array.c b/fs/proc/array.c
79711index fd02a9e..7bc9dff 100644
79712--- a/fs/proc/array.c
79713+++ b/fs/proc/array.c
79714@@ -60,6 +60,7 @@
79715 #include <linux/tty.h>
79716 #include <linux/string.h>
79717 #include <linux/mman.h>
79718+#include <linux/grsecurity.h>
79719 #include <linux/proc_fs.h>
79720 #include <linux/ioport.h>
79721 #include <linux/uaccess.h>
79722@@ -340,6 +341,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
79723 cpumask_pr_args(&task->cpus_allowed));
79724 }
79725
79726+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
79727+static inline void task_pax(struct seq_file *m, struct task_struct *p)
79728+{
79729+ if (p->mm)
79730+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
79731+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
79732+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
79733+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
79734+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
79735+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
79736+ else
79737+ seq_printf(m, "PaX:\t-----\n");
79738+}
79739+#endif
79740+
79741 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
79742 struct pid *pid, struct task_struct *task)
79743 {
79744@@ -358,9 +374,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
79745 task_cpus_allowed(m, task);
79746 cpuset_task_status_allowed(m, task);
79747 task_context_switch_counts(m, task);
79748+
79749+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
79750+ task_pax(m, task);
79751+#endif
79752+
79753+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
79754+ task_grsec_rbac(m, task);
79755+#endif
79756+
79757 return 0;
79758 }
79759
79760+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79761+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
79762+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
79763+ _mm->pax_flags & MF_PAX_SEGMEXEC))
79764+#endif
79765+
79766 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79767 struct pid *pid, struct task_struct *task, int whole)
79768 {
79769@@ -382,6 +413,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79770 char tcomm[sizeof(task->comm)];
79771 unsigned long flags;
79772
79773+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79774+ if (current->exec_id != m->exec_id) {
79775+ gr_log_badprocpid("stat");
79776+ return 0;
79777+ }
79778+#endif
79779+
79780 state = *get_task_state(task);
79781 vsize = eip = esp = 0;
79782 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
79783@@ -452,6 +490,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79784 gtime = task_gtime(task);
79785 }
79786
79787+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79788+ if (PAX_RAND_FLAGS(mm)) {
79789+ eip = 0;
79790+ esp = 0;
79791+ wchan = 0;
79792+ }
79793+#endif
79794+#ifdef CONFIG_GRKERNSEC_HIDESYM
79795+ wchan = 0;
79796+ eip =0;
79797+ esp =0;
79798+#endif
79799+
79800 /* scale priority and nice values from timeslices to -20..20 */
79801 /* to make it look like a "normal" Unix priority/nice value */
79802 priority = task_prio(task);
79803@@ -483,9 +534,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79804 seq_put_decimal_ull(m, ' ', vsize);
79805 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
79806 seq_put_decimal_ull(m, ' ', rsslim);
79807+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79808+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
79809+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
79810+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
79811+#else
79812 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
79813 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
79814 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
79815+#endif
79816 seq_put_decimal_ull(m, ' ', esp);
79817 seq_put_decimal_ull(m, ' ', eip);
79818 /* The signal information here is obsolete.
79819@@ -507,7 +564,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79820 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
79821 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
79822
79823- if (mm && permitted) {
79824+ if (mm && permitted
79825+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79826+ && !PAX_RAND_FLAGS(mm)
79827+#endif
79828+ ) {
79829 seq_put_decimal_ull(m, ' ', mm->start_data);
79830 seq_put_decimal_ull(m, ' ', mm->end_data);
79831 seq_put_decimal_ull(m, ' ', mm->start_brk);
79832@@ -545,8 +606,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
79833 struct pid *pid, struct task_struct *task)
79834 {
79835 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
79836- struct mm_struct *mm = get_task_mm(task);
79837+ struct mm_struct *mm;
79838
79839+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79840+ if (current->exec_id != m->exec_id) {
79841+ gr_log_badprocpid("statm");
79842+ return 0;
79843+ }
79844+#endif
79845+ mm = get_task_mm(task);
79846 if (mm) {
79847 size = task_statm(mm, &shared, &text, &data, &resident);
79848 mmput(mm);
79849@@ -569,6 +637,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
79850 return 0;
79851 }
79852
79853+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
79854+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
79855+{
79856+ unsigned long flags;
79857+ u32 curr_ip = 0;
79858+
79859+ if (lock_task_sighand(task, &flags)) {
79860+ curr_ip = task->signal->curr_ip;
79861+ unlock_task_sighand(task, &flags);
79862+ }
79863+ return seq_printf(m, "%pI4\n", &curr_ip);
79864+}
79865+#endif
79866+
79867 #ifdef CONFIG_CHECKPOINT_RESTORE
79868 static struct pid *
79869 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
79870diff --git a/fs/proc/base.c b/fs/proc/base.c
79871index 093ca14..322f097 100644
79872--- a/fs/proc/base.c
79873+++ b/fs/proc/base.c
79874@@ -113,6 +113,14 @@ struct pid_entry {
79875 union proc_op op;
79876 };
79877
79878+struct getdents_callback {
79879+ struct linux_dirent __user * current_dir;
79880+ struct linux_dirent __user * previous;
79881+ struct file * file;
79882+ int count;
79883+ int error;
79884+};
79885+
79886 #define NOD(NAME, MODE, IOP, FOP, OP) { \
79887 .name = (NAME), \
79888 .len = sizeof(NAME) - 1, \
79889@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
79890 return 0;
79891 }
79892
79893+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79894+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
79895+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
79896+ _mm->pax_flags & MF_PAX_SEGMEXEC))
79897+#endif
79898+
79899 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
79900 struct pid *pid, struct task_struct *task)
79901 {
79902 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
79903 if (mm && !IS_ERR(mm)) {
79904 unsigned int nwords = 0;
79905+
79906+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79907+ /* allow if we're currently ptracing this task */
79908+ if (PAX_RAND_FLAGS(mm) &&
79909+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
79910+ mmput(mm);
79911+ return 0;
79912+ }
79913+#endif
79914+
79915 do {
79916 nwords += 2;
79917 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
79918@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
79919 }
79920
79921
79922-#ifdef CONFIG_KALLSYMS
79923+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
79924 /*
79925 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
79926 * Returns the resolved symbol. If that fails, simply return the address.
79927@@ -267,7 +291,7 @@ static void unlock_trace(struct task_struct *task)
79928 mutex_unlock(&task->signal->cred_guard_mutex);
79929 }
79930
79931-#ifdef CONFIG_STACKTRACE
79932+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
79933
79934 #define MAX_STACK_TRACE_DEPTH 64
79935
79936@@ -462,7 +486,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
79937 return 0;
79938 }
79939
79940-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
79941+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
79942 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
79943 struct pid *pid, struct task_struct *task)
79944 {
79945@@ -495,7 +519,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
79946 /************************************************************************/
79947
79948 /* permission checks */
79949-static int proc_fd_access_allowed(struct inode *inode)
79950+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
79951 {
79952 struct task_struct *task;
79953 int allowed = 0;
79954@@ -505,7 +529,10 @@ static int proc_fd_access_allowed(struct inode *inode)
79955 */
79956 task = get_proc_task(inode);
79957 if (task) {
79958- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
79959+ if (log)
79960+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
79961+ else
79962+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
79963 put_task_struct(task);
79964 }
79965 return allowed;
79966@@ -536,10 +563,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
79967 struct task_struct *task,
79968 int hide_pid_min)
79969 {
79970+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
79971+ return false;
79972+
79973+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
79974+ rcu_read_lock();
79975+ {
79976+ const struct cred *tmpcred = current_cred();
79977+ const struct cred *cred = __task_cred(task);
79978+
79979+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
79980+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
79981+ || in_group_p(grsec_proc_gid)
79982+#endif
79983+ ) {
79984+ rcu_read_unlock();
79985+ return true;
79986+ }
79987+ }
79988+ rcu_read_unlock();
79989+
79990+ if (!pid->hide_pid)
79991+ return false;
79992+#endif
79993+
79994 if (pid->hide_pid < hide_pid_min)
79995 return true;
79996 if (in_group_p(pid->pid_gid))
79997 return true;
79998+
79999 return ptrace_may_access(task, PTRACE_MODE_READ);
80000 }
80001
80002@@ -557,7 +609,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
80003 put_task_struct(task);
80004
80005 if (!has_perms) {
80006+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80007+ {
80008+#else
80009 if (pid->hide_pid == 2) {
80010+#endif
80011 /*
80012 * Let's make getdents(), stat(), and open()
80013 * consistent with each other. If a process
80014@@ -618,6 +674,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
80015
80016 if (task) {
80017 mm = mm_access(task, mode);
80018+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
80019+ mmput(mm);
80020+ mm = ERR_PTR(-EPERM);
80021+ }
80022 put_task_struct(task);
80023
80024 if (!IS_ERR_OR_NULL(mm)) {
80025@@ -639,6 +699,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
80026 return PTR_ERR(mm);
80027
80028 file->private_data = mm;
80029+
80030+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80031+ file->f_version = current->exec_id;
80032+#endif
80033+
80034 return 0;
80035 }
80036
80037@@ -660,6 +725,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80038 ssize_t copied;
80039 char *page;
80040
80041+#ifdef CONFIG_GRKERNSEC
80042+ if (write)
80043+ return -EPERM;
80044+#endif
80045+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80046+ if (file->f_version != current->exec_id) {
80047+ gr_log_badprocpid("mem");
80048+ return 0;
80049+ }
80050+#endif
80051+
80052 if (!mm)
80053 return 0;
80054
80055@@ -672,7 +748,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80056 goto free;
80057
80058 while (count > 0) {
80059- int this_len = min_t(int, count, PAGE_SIZE);
80060+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
80061
80062 if (write && copy_from_user(page, buf, this_len)) {
80063 copied = -EFAULT;
80064@@ -764,6 +840,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80065 if (!mm)
80066 return 0;
80067
80068+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80069+ if (file->f_version != current->exec_id) {
80070+ gr_log_badprocpid("environ");
80071+ return 0;
80072+ }
80073+#endif
80074+
80075 page = (char *)__get_free_page(GFP_TEMPORARY);
80076 if (!page)
80077 return -ENOMEM;
80078@@ -773,7 +856,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80079 goto free;
80080 while (count > 0) {
80081 size_t this_len, max_len;
80082- int retval;
80083+ ssize_t retval;
80084
80085 if (src >= (mm->env_end - mm->env_start))
80086 break;
80087@@ -1387,7 +1470,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
80088 int error = -EACCES;
80089
80090 /* Are we allowed to snoop on the tasks file descriptors? */
80091- if (!proc_fd_access_allowed(inode))
80092+ if (!proc_fd_access_allowed(inode, 0))
80093 goto out;
80094
80095 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80096@@ -1431,8 +1514,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
80097 struct path path;
80098
80099 /* Are we allowed to snoop on the tasks file descriptors? */
80100- if (!proc_fd_access_allowed(inode))
80101- goto out;
80102+ /* logging this is needed for learning on chromium to work properly,
80103+ but we don't want to flood the logs from 'ps' which does a readlink
80104+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
80105+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
80106+ */
80107+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
80108+ if (!proc_fd_access_allowed(inode,0))
80109+ goto out;
80110+ } else {
80111+ if (!proc_fd_access_allowed(inode,1))
80112+ goto out;
80113+ }
80114
80115 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80116 if (error)
80117@@ -1482,7 +1575,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
80118 rcu_read_lock();
80119 cred = __task_cred(task);
80120 inode->i_uid = cred->euid;
80121+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80122+ inode->i_gid = grsec_proc_gid;
80123+#else
80124 inode->i_gid = cred->egid;
80125+#endif
80126 rcu_read_unlock();
80127 }
80128 security_task_to_inode(task, inode);
80129@@ -1518,10 +1615,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
80130 return -ENOENT;
80131 }
80132 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80133+#ifdef CONFIG_GRKERNSEC_PROC_USER
80134+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80135+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80136+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80137+#endif
80138 task_dumpable(task)) {
80139 cred = __task_cred(task);
80140 stat->uid = cred->euid;
80141+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80142+ stat->gid = grsec_proc_gid;
80143+#else
80144 stat->gid = cred->egid;
80145+#endif
80146 }
80147 }
80148 rcu_read_unlock();
80149@@ -1559,11 +1665,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
80150
80151 if (task) {
80152 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80153+#ifdef CONFIG_GRKERNSEC_PROC_USER
80154+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80155+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80156+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80157+#endif
80158 task_dumpable(task)) {
80159 rcu_read_lock();
80160 cred = __task_cred(task);
80161 inode->i_uid = cred->euid;
80162+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80163+ inode->i_gid = grsec_proc_gid;
80164+#else
80165 inode->i_gid = cred->egid;
80166+#endif
80167 rcu_read_unlock();
80168 } else {
80169 inode->i_uid = GLOBAL_ROOT_UID;
80170@@ -2095,6 +2210,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
80171 if (!task)
80172 goto out_no_task;
80173
80174+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80175+ goto out;
80176+
80177 /*
80178 * Yes, it does not scale. And it should not. Don't add
80179 * new entries into /proc/<tgid>/ without very good reasons.
80180@@ -2125,6 +2243,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
80181 if (!task)
80182 return -ENOENT;
80183
80184+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80185+ goto out;
80186+
80187 if (!dir_emit_dots(file, ctx))
80188 goto out;
80189
80190@@ -2569,7 +2690,7 @@ static const struct pid_entry tgid_base_stuff[] = {
80191 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
80192 #endif
80193 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80194-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80195+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80196 ONE("syscall", S_IRUSR, proc_pid_syscall),
80197 #endif
80198 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80199@@ -2594,10 +2715,10 @@ static const struct pid_entry tgid_base_stuff[] = {
80200 #ifdef CONFIG_SECURITY
80201 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80202 #endif
80203-#ifdef CONFIG_KALLSYMS
80204+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80205 ONE("wchan", S_IRUGO, proc_pid_wchan),
80206 #endif
80207-#ifdef CONFIG_STACKTRACE
80208+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80209 ONE("stack", S_IRUSR, proc_pid_stack),
80210 #endif
80211 #ifdef CONFIG_SCHEDSTATS
80212@@ -2631,6 +2752,9 @@ static const struct pid_entry tgid_base_stuff[] = {
80213 #ifdef CONFIG_HARDWALL
80214 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
80215 #endif
80216+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80217+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
80218+#endif
80219 #ifdef CONFIG_USER_NS
80220 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
80221 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
80222@@ -2763,7 +2887,14 @@ static int proc_pid_instantiate(struct inode *dir,
80223 if (!inode)
80224 goto out;
80225
80226+#ifdef CONFIG_GRKERNSEC_PROC_USER
80227+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
80228+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80229+ inode->i_gid = grsec_proc_gid;
80230+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
80231+#else
80232 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
80233+#endif
80234 inode->i_op = &proc_tgid_base_inode_operations;
80235 inode->i_fop = &proc_tgid_base_operations;
80236 inode->i_flags|=S_IMMUTABLE;
80237@@ -2801,7 +2932,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
80238 if (!task)
80239 goto out;
80240
80241+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80242+ goto out_put_task;
80243+
80244 result = proc_pid_instantiate(dir, dentry, task, NULL);
80245+out_put_task:
80246 put_task_struct(task);
80247 out:
80248 return ERR_PTR(result);
80249@@ -2915,7 +3050,7 @@ static const struct pid_entry tid_base_stuff[] = {
80250 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
80251 #endif
80252 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80253-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80254+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80255 ONE("syscall", S_IRUSR, proc_pid_syscall),
80256 #endif
80257 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80258@@ -2942,10 +3077,10 @@ static const struct pid_entry tid_base_stuff[] = {
80259 #ifdef CONFIG_SECURITY
80260 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80261 #endif
80262-#ifdef CONFIG_KALLSYMS
80263+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80264 ONE("wchan", S_IRUGO, proc_pid_wchan),
80265 #endif
80266-#ifdef CONFIG_STACKTRACE
80267+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80268 ONE("stack", S_IRUSR, proc_pid_stack),
80269 #endif
80270 #ifdef CONFIG_SCHEDSTATS
80271diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
80272index cbd82df..c0407d2 100644
80273--- a/fs/proc/cmdline.c
80274+++ b/fs/proc/cmdline.c
80275@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
80276
80277 static int __init proc_cmdline_init(void)
80278 {
80279+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80280+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
80281+#else
80282 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
80283+#endif
80284 return 0;
80285 }
80286 fs_initcall(proc_cmdline_init);
80287diff --git a/fs/proc/devices.c b/fs/proc/devices.c
80288index 50493ed..248166b 100644
80289--- a/fs/proc/devices.c
80290+++ b/fs/proc/devices.c
80291@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
80292
80293 static int __init proc_devices_init(void)
80294 {
80295+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80296+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
80297+#else
80298 proc_create("devices", 0, NULL, &proc_devinfo_operations);
80299+#endif
80300 return 0;
80301 }
80302 fs_initcall(proc_devices_init);
80303diff --git a/fs/proc/fd.c b/fs/proc/fd.c
80304index 6e5fcd0..06ea074 100644
80305--- a/fs/proc/fd.c
80306+++ b/fs/proc/fd.c
80307@@ -27,7 +27,8 @@ static int seq_show(struct seq_file *m, void *v)
80308 if (!task)
80309 return -ENOENT;
80310
80311- files = get_files_struct(task);
80312+ if (!gr_acl_handle_procpidmem(task))
80313+ files = get_files_struct(task);
80314 put_task_struct(task);
80315
80316 if (files) {
80317@@ -291,11 +292,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
80318 */
80319 int proc_fd_permission(struct inode *inode, int mask)
80320 {
80321+ struct task_struct *task;
80322 int rv = generic_permission(inode, mask);
80323- if (rv == 0)
80324- return 0;
80325+
80326 if (task_tgid(current) == proc_pid(inode))
80327 rv = 0;
80328+
80329+ task = get_proc_task(inode);
80330+ if (task == NULL)
80331+ return rv;
80332+
80333+ if (gr_acl_handle_procpidmem(task))
80334+ rv = -EACCES;
80335+
80336+ put_task_struct(task);
80337+
80338 return rv;
80339 }
80340
80341diff --git a/fs/proc/generic.c b/fs/proc/generic.c
80342index e5dee5c..dafe21b 100644
80343--- a/fs/proc/generic.c
80344+++ b/fs/proc/generic.c
80345@@ -22,6 +22,7 @@
80346 #include <linux/bitops.h>
80347 #include <linux/spinlock.h>
80348 #include <linux/completion.h>
80349+#include <linux/grsecurity.h>
80350 #include <asm/uaccess.h>
80351
80352 #include "internal.h"
80353@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
80354 return proc_lookup_de(PDE(dir), dir, dentry);
80355 }
80356
80357+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
80358+ unsigned int flags)
80359+{
80360+ if (gr_proc_is_restricted())
80361+ return ERR_PTR(-EACCES);
80362+
80363+ return proc_lookup_de(PDE(dir), dir, dentry);
80364+}
80365+
80366 /*
80367 * This returns non-zero if at EOF, so that the /proc
80368 * root directory can use this and check if it should
80369@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
80370 return proc_readdir_de(PDE(inode), file, ctx);
80371 }
80372
80373+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
80374+{
80375+ struct inode *inode = file_inode(file);
80376+
80377+ if (gr_proc_is_restricted())
80378+ return -EACCES;
80379+
80380+ return proc_readdir_de(PDE(inode), file, ctx);
80381+}
80382+
80383 /*
80384 * These are the generic /proc directory operations. They
80385 * use the in-memory "struct proc_dir_entry" tree to parse
80386@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
80387 .iterate = proc_readdir,
80388 };
80389
80390+static const struct file_operations proc_dir_restricted_operations = {
80391+ .llseek = generic_file_llseek,
80392+ .read = generic_read_dir,
80393+ .iterate = proc_readdir_restrict,
80394+};
80395+
80396 /*
80397 * proc directories can do almost nothing..
80398 */
80399@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
80400 .setattr = proc_notify_change,
80401 };
80402
80403+static const struct inode_operations proc_dir_restricted_inode_operations = {
80404+ .lookup = proc_lookup_restrict,
80405+ .getattr = proc_getattr,
80406+ .setattr = proc_notify_change,
80407+};
80408+
80409 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
80410 {
80411 int ret;
80412@@ -445,6 +477,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
80413 }
80414 EXPORT_SYMBOL_GPL(proc_mkdir_data);
80415
80416+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
80417+ struct proc_dir_entry *parent, void *data)
80418+{
80419+ struct proc_dir_entry *ent;
80420+
80421+ if (mode == 0)
80422+ mode = S_IRUGO | S_IXUGO;
80423+
80424+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
80425+ if (ent) {
80426+ ent->data = data;
80427+ ent->restricted = 1;
80428+ ent->proc_fops = &proc_dir_restricted_operations;
80429+ ent->proc_iops = &proc_dir_restricted_inode_operations;
80430+ parent->nlink++;
80431+ if (proc_register(parent, ent) < 0) {
80432+ kfree(ent);
80433+ parent->nlink--;
80434+ ent = NULL;
80435+ }
80436+ }
80437+ return ent;
80438+}
80439+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
80440+
80441 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
80442 struct proc_dir_entry *parent)
80443 {
80444@@ -459,6 +516,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
80445 }
80446 EXPORT_SYMBOL(proc_mkdir);
80447
80448+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
80449+ struct proc_dir_entry *parent)
80450+{
80451+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
80452+}
80453+EXPORT_SYMBOL(proc_mkdir_restrict);
80454+
80455 struct proc_dir_entry *proc_create_mount_point(const char *name)
80456 {
80457 umode_t mode = S_IFDIR | S_IRUGO | S_IXUGO;
80458diff --git a/fs/proc/inode.c b/fs/proc/inode.c
80459index e3eb552..bcb0f25 100644
80460--- a/fs/proc/inode.c
80461+++ b/fs/proc/inode.c
80462@@ -24,11 +24,17 @@
80463 #include <linux/mount.h>
80464 #include <linux/magic.h>
80465 #include <linux/namei.h>
80466+#include <linux/grsecurity.h>
80467
80468 #include <asm/uaccess.h>
80469
80470 #include "internal.h"
80471
80472+#ifdef CONFIG_PROC_SYSCTL
80473+extern const struct inode_operations proc_sys_inode_operations;
80474+extern const struct inode_operations proc_sys_dir_operations;
80475+#endif
80476+
80477 static void proc_evict_inode(struct inode *inode)
80478 {
80479 struct proc_dir_entry *de;
80480@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
80481 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
80482 sysctl_head_put(head);
80483 }
80484+
80485+#ifdef CONFIG_PROC_SYSCTL
80486+ if (inode->i_op == &proc_sys_inode_operations ||
80487+ inode->i_op == &proc_sys_dir_operations)
80488+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
80489+#endif
80490+
80491 }
80492
80493 static struct kmem_cache * proc_inode_cachep;
80494@@ -430,7 +443,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
80495 if (de->mode) {
80496 inode->i_mode = de->mode;
80497 inode->i_uid = de->uid;
80498+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80499+ inode->i_gid = grsec_proc_gid;
80500+#else
80501 inode->i_gid = de->gid;
80502+#endif
80503 }
80504 if (de->size)
80505 inode->i_size = de->size;
80506diff --git a/fs/proc/internal.h b/fs/proc/internal.h
80507index aa27810..9f2d3b2 100644
80508--- a/fs/proc/internal.h
80509+++ b/fs/proc/internal.h
80510@@ -47,9 +47,10 @@ struct proc_dir_entry {
80511 struct completion *pde_unload_completion;
80512 struct list_head pde_openers; /* who did ->open, but not ->release */
80513 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
80514+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
80515 u8 namelen;
80516 char name[];
80517-};
80518+} __randomize_layout;
80519
80520 union proc_op {
80521 int (*proc_get_link)(struct dentry *, struct path *);
80522@@ -67,7 +68,7 @@ struct proc_inode {
80523 struct ctl_table *sysctl_entry;
80524 const struct proc_ns_operations *ns_ops;
80525 struct inode vfs_inode;
80526-};
80527+} __randomize_layout;
80528
80529 /*
80530 * General functions
80531@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
80532 struct pid *, struct task_struct *);
80533 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
80534 struct pid *, struct task_struct *);
80535+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80536+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
80537+ struct pid *, struct task_struct *);
80538+#endif
80539
80540 /*
80541 * base.c
80542@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
80543 * generic.c
80544 */
80545 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
80546+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
80547 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
80548 struct dentry *);
80549 extern int proc_readdir(struct file *, struct dir_context *);
80550+extern int proc_readdir_restrict(struct file *, struct dir_context *);
80551 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
80552
80553 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
80554diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
80555index a352d57..cb94a5c 100644
80556--- a/fs/proc/interrupts.c
80557+++ b/fs/proc/interrupts.c
80558@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
80559
80560 static int __init proc_interrupts_init(void)
80561 {
80562+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80563+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
80564+#else
80565 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
80566+#endif
80567 return 0;
80568 }
80569 fs_initcall(proc_interrupts_init);
80570diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
80571index 91a4e64..14bf8fa 100644
80572--- a/fs/proc/kcore.c
80573+++ b/fs/proc/kcore.c
80574@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80575 * the addresses in the elf_phdr on our list.
80576 */
80577 start = kc_offset_to_vaddr(*fpos - elf_buflen);
80578- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
80579+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
80580+ if (tsz > buflen)
80581 tsz = buflen;
80582-
80583+
80584 while (buflen) {
80585 struct kcore_list *m;
80586
80587@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80588 } else {
80589 if (kern_addr_valid(start)) {
80590 unsigned long n;
80591+ char *elf_buf;
80592+ mm_segment_t oldfs;
80593
80594- n = copy_to_user(buffer, (char *)start, tsz);
80595- /*
80596- * We cannot distinguish between fault on source
80597- * and fault on destination. When this happens
80598- * we clear too and hope it will trigger the
80599- * EFAULT again.
80600- */
80601- if (n) {
80602- if (clear_user(buffer + tsz - n,
80603- n))
80604- return -EFAULT;
80605- }
80606+ elf_buf = kzalloc(tsz, GFP_KERNEL);
80607+ if (!elf_buf)
80608+ return -ENOMEM;
80609+ oldfs = get_fs();
80610+ set_fs(KERNEL_DS);
80611+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
80612+ set_fs(oldfs);
80613+ n = copy_to_user(buffer, elf_buf, tsz);
80614+ kfree(elf_buf);
80615+ if (n)
80616+ return -EFAULT;
80617 } else {
80618 if (clear_user(buffer, tsz))
80619 return -EFAULT;
80620@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80621
80622 static int open_kcore(struct inode *inode, struct file *filp)
80623 {
80624+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
80625+ return -EPERM;
80626+#endif
80627 if (!capable(CAP_SYS_RAWIO))
80628 return -EPERM;
80629 if (kcore_need_update)
80630@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
80631 return NOTIFY_OK;
80632 }
80633
80634-static struct notifier_block kcore_callback_nb __meminitdata = {
80635+static struct notifier_block kcore_callback_nb __meminitconst = {
80636 .notifier_call = kcore_callback,
80637 .priority = 0,
80638 };
80639diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
80640index d3ebf2e..6ad42d1 100644
80641--- a/fs/proc/meminfo.c
80642+++ b/fs/proc/meminfo.c
80643@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
80644 vmi.used >> 10,
80645 vmi.largest_chunk >> 10
80646 #ifdef CONFIG_MEMORY_FAILURE
80647- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80648+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80649 #endif
80650 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
80651 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
80652diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
80653index d4a3574..b421ce9 100644
80654--- a/fs/proc/nommu.c
80655+++ b/fs/proc/nommu.c
80656@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
80657
80658 if (file) {
80659 seq_pad(m, ' ');
80660- seq_path(m, &file->f_path, "");
80661+ seq_path(m, &file->f_path, "\n\\");
80662 }
80663
80664 seq_putc(m, '\n');
80665diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
80666index 350984a..0fb02a9 100644
80667--- a/fs/proc/proc_net.c
80668+++ b/fs/proc/proc_net.c
80669@@ -23,9 +23,27 @@
80670 #include <linux/nsproxy.h>
80671 #include <net/net_namespace.h>
80672 #include <linux/seq_file.h>
80673+#include <linux/grsecurity.h>
80674
80675 #include "internal.h"
80676
80677+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
80678+static struct seq_operations *ipv6_seq_ops_addr;
80679+
80680+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
80681+{
80682+ ipv6_seq_ops_addr = addr;
80683+}
80684+
80685+void unregister_ipv6_seq_ops_addr(void)
80686+{
80687+ ipv6_seq_ops_addr = NULL;
80688+}
80689+
80690+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
80691+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
80692+#endif
80693+
80694 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
80695 {
80696 return pde->parent->data;
80697@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
80698 return maybe_get_net(PDE_NET(PDE(inode)));
80699 }
80700
80701+extern const struct seq_operations dev_seq_ops;
80702+
80703 int seq_open_net(struct inode *ino, struct file *f,
80704 const struct seq_operations *ops, int size)
80705 {
80706@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
80707
80708 BUG_ON(size < sizeof(*p));
80709
80710+ /* only permit access to /proc/net/dev */
80711+ if (
80712+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
80713+ ops != ipv6_seq_ops_addr &&
80714+#endif
80715+ ops != &dev_seq_ops && gr_proc_is_restricted())
80716+ return -EACCES;
80717+
80718 net = get_proc_net(ino);
80719 if (net == NULL)
80720 return -ENXIO;
80721@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
80722 int err;
80723 struct net *net;
80724
80725+ if (gr_proc_is_restricted())
80726+ return -EACCES;
80727+
80728 err = -ENXIO;
80729 net = get_proc_net(inode);
80730 if (net == NULL)
80731diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
80732index fdda62e..cd7c75f 100644
80733--- a/fs/proc/proc_sysctl.c
80734+++ b/fs/proc/proc_sysctl.c
80735@@ -11,13 +11,21 @@
80736 #include <linux/namei.h>
80737 #include <linux/mm.h>
80738 #include <linux/module.h>
80739+#include <linux/nsproxy.h>
80740+#ifdef CONFIG_GRKERNSEC
80741+#include <net/net_namespace.h>
80742+#endif
80743 #include "internal.h"
80744
80745+extern int gr_handle_chroot_sysctl(const int op);
80746+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
80747+ const int op);
80748+
80749 static const struct dentry_operations proc_sys_dentry_operations;
80750 static const struct file_operations proc_sys_file_operations;
80751-static const struct inode_operations proc_sys_inode_operations;
80752+const struct inode_operations proc_sys_inode_operations;
80753 static const struct file_operations proc_sys_dir_file_operations;
80754-static const struct inode_operations proc_sys_dir_operations;
80755+const struct inode_operations proc_sys_dir_operations;
80756
80757 /* Support for permanently empty directories */
80758
80759@@ -32,13 +40,17 @@ static bool is_empty_dir(struct ctl_table_header *head)
80760
80761 static void set_empty_dir(struct ctl_dir *dir)
80762 {
80763- dir->header.ctl_table[0].child = sysctl_mount_point;
80764+ pax_open_kernel();
80765+ *(const void **)&dir->header.ctl_table[0].child = sysctl_mount_point;
80766+ pax_close_kernel();
80767 }
80768
80769 static void clear_empty_dir(struct ctl_dir *dir)
80770
80771 {
80772- dir->header.ctl_table[0].child = NULL;
80773+ pax_open_kernel();
80774+ *(void **)&dir->header.ctl_table[0].child = NULL;
80775+ pax_close_kernel();
80776 }
80777
80778 void proc_sys_poll_notify(struct ctl_table_poll *poll)
80779@@ -504,6 +516,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
80780
80781 err = NULL;
80782 d_set_d_op(dentry, &proc_sys_dentry_operations);
80783+
80784+ gr_handle_proc_create(dentry, inode);
80785+
80786 d_add(dentry, inode);
80787
80788 out:
80789@@ -519,6 +534,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
80790 struct inode *inode = file_inode(filp);
80791 struct ctl_table_header *head = grab_header(inode);
80792 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
80793+ int op = write ? MAY_WRITE : MAY_READ;
80794 ssize_t error;
80795 size_t res;
80796
80797@@ -530,7 +546,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
80798 * and won't be until we finish.
80799 */
80800 error = -EPERM;
80801- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
80802+ if (sysctl_perm(head, table, op))
80803 goto out;
80804
80805 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
80806@@ -538,6 +554,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
80807 if (!table->proc_handler)
80808 goto out;
80809
80810+#ifdef CONFIG_GRKERNSEC
80811+ error = -EPERM;
80812+ if (gr_handle_chroot_sysctl(op))
80813+ goto out;
80814+ dget(filp->f_path.dentry);
80815+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
80816+ dput(filp->f_path.dentry);
80817+ goto out;
80818+ }
80819+ dput(filp->f_path.dentry);
80820+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
80821+ goto out;
80822+ if (write) {
80823+ if (current->nsproxy->net_ns != table->extra2) {
80824+ if (!capable(CAP_SYS_ADMIN))
80825+ goto out;
80826+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
80827+ goto out;
80828+ }
80829+#endif
80830+
80831 /* careful: calling conventions are nasty here */
80832 res = count;
80833 error = table->proc_handler(table, write, buf, &res, ppos);
80834@@ -635,6 +672,9 @@ static bool proc_sys_fill_cache(struct file *file,
80835 return false;
80836 } else {
80837 d_set_d_op(child, &proc_sys_dentry_operations);
80838+
80839+ gr_handle_proc_create(child, inode);
80840+
80841 d_add(child, inode);
80842 }
80843 } else {
80844@@ -678,6 +718,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
80845 if ((*pos)++ < ctx->pos)
80846 return true;
80847
80848+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
80849+ return 0;
80850+
80851 if (unlikely(S_ISLNK(table->mode)))
80852 res = proc_sys_link_fill_cache(file, ctx, head, table);
80853 else
80854@@ -771,6 +814,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
80855 if (IS_ERR(head))
80856 return PTR_ERR(head);
80857
80858+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
80859+ return -ENOENT;
80860+
80861 generic_fillattr(inode, stat);
80862 if (table)
80863 stat->mode = (stat->mode & S_IFMT) | table->mode;
80864@@ -793,13 +839,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
80865 .llseek = generic_file_llseek,
80866 };
80867
80868-static const struct inode_operations proc_sys_inode_operations = {
80869+const struct inode_operations proc_sys_inode_operations = {
80870 .permission = proc_sys_permission,
80871 .setattr = proc_sys_setattr,
80872 .getattr = proc_sys_getattr,
80873 };
80874
80875-static const struct inode_operations proc_sys_dir_operations = {
80876+const struct inode_operations proc_sys_dir_operations = {
80877 .lookup = proc_sys_lookup,
80878 .permission = proc_sys_permission,
80879 .setattr = proc_sys_setattr,
80880@@ -876,7 +922,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
80881 static struct ctl_dir *new_dir(struct ctl_table_set *set,
80882 const char *name, int namelen)
80883 {
80884- struct ctl_table *table;
80885+ ctl_table_no_const *table;
80886 struct ctl_dir *new;
80887 struct ctl_node *node;
80888 char *new_name;
80889@@ -888,7 +934,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
80890 return NULL;
80891
80892 node = (struct ctl_node *)(new + 1);
80893- table = (struct ctl_table *)(node + 1);
80894+ table = (ctl_table_no_const *)(node + 1);
80895 new_name = (char *)(table + 2);
80896 memcpy(new_name, name, namelen);
80897 new_name[namelen] = '\0';
80898@@ -1057,7 +1103,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
80899 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
80900 struct ctl_table_root *link_root)
80901 {
80902- struct ctl_table *link_table, *entry, *link;
80903+ ctl_table_no_const *link_table, *link;
80904+ struct ctl_table *entry;
80905 struct ctl_table_header *links;
80906 struct ctl_node *node;
80907 char *link_name;
80908@@ -1080,7 +1127,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
80909 return NULL;
80910
80911 node = (struct ctl_node *)(links + 1);
80912- link_table = (struct ctl_table *)(node + nr_entries);
80913+ link_table = (ctl_table_no_const *)(node + nr_entries);
80914 link_name = (char *)&link_table[nr_entries + 1];
80915
80916 for (link = link_table, entry = table; entry->procname; link++, entry++) {
80917@@ -1328,8 +1375,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
80918 struct ctl_table_header ***subheader, struct ctl_table_set *set,
80919 struct ctl_table *table)
80920 {
80921- struct ctl_table *ctl_table_arg = NULL;
80922- struct ctl_table *entry, *files;
80923+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
80924+ struct ctl_table *entry;
80925 int nr_files = 0;
80926 int nr_dirs = 0;
80927 int err = -ENOMEM;
80928@@ -1341,10 +1388,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
80929 nr_files++;
80930 }
80931
80932- files = table;
80933 /* If there are mixed files and directories we need a new table */
80934 if (nr_dirs && nr_files) {
80935- struct ctl_table *new;
80936+ ctl_table_no_const *new;
80937 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
80938 GFP_KERNEL);
80939 if (!files)
80940@@ -1362,7 +1408,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
80941 /* Register everything except a directory full of subdirectories */
80942 if (nr_files || !nr_dirs) {
80943 struct ctl_table_header *header;
80944- header = __register_sysctl_table(set, path, files);
80945+ header = __register_sysctl_table(set, path, files ? files : table);
80946 if (!header) {
80947 kfree(ctl_table_arg);
80948 goto out;
80949diff --git a/fs/proc/root.c b/fs/proc/root.c
80950index 68feb0f..2c04780 100644
80951--- a/fs/proc/root.c
80952+++ b/fs/proc/root.c
80953@@ -185,7 +185,15 @@ void __init proc_root_init(void)
80954 proc_create_mount_point("openprom");
80955 #endif
80956 proc_tty_init();
80957+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80958+#ifdef CONFIG_GRKERNSEC_PROC_USER
80959+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
80960+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80961+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
80962+#endif
80963+#else
80964 proc_mkdir("bus", NULL);
80965+#endif
80966 proc_sys_init();
80967 }
80968
80969diff --git a/fs/proc/stat.c b/fs/proc/stat.c
80970index 510413eb..34d9a8c 100644
80971--- a/fs/proc/stat.c
80972+++ b/fs/proc/stat.c
80973@@ -11,6 +11,7 @@
80974 #include <linux/irqnr.h>
80975 #include <linux/cputime.h>
80976 #include <linux/tick.h>
80977+#include <linux/grsecurity.h>
80978
80979 #ifndef arch_irq_stat_cpu
80980 #define arch_irq_stat_cpu(cpu) 0
80981@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
80982 u64 sum_softirq = 0;
80983 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
80984 struct timespec boottime;
80985+ int unrestricted = 1;
80986+
80987+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80988+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80989+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
80990+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80991+ && !in_group_p(grsec_proc_gid)
80992+#endif
80993+ )
80994+ unrestricted = 0;
80995+#endif
80996+#endif
80997
80998 user = nice = system = idle = iowait =
80999 irq = softirq = steal = 0;
81000@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
81001 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
81002 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
81003 idle += get_idle_time(i);
81004- iowait += get_iowait_time(i);
81005- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81006- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81007- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81008- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81009- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81010- sum += kstat_cpu_irqs_sum(i);
81011- sum += arch_irq_stat_cpu(i);
81012+ if (unrestricted) {
81013+ iowait += get_iowait_time(i);
81014+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81015+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81016+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81017+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81018+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81019+ sum += kstat_cpu_irqs_sum(i);
81020+ sum += arch_irq_stat_cpu(i);
81021+ for (j = 0; j < NR_SOFTIRQS; j++) {
81022+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
81023
81024- for (j = 0; j < NR_SOFTIRQS; j++) {
81025- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
81026-
81027- per_softirq_sums[j] += softirq_stat;
81028- sum_softirq += softirq_stat;
81029+ per_softirq_sums[j] += softirq_stat;
81030+ sum_softirq += softirq_stat;
81031+ }
81032 }
81033 }
81034- sum += arch_irq_stat();
81035+ if (unrestricted)
81036+ sum += arch_irq_stat();
81037
81038 seq_puts(p, "cpu ");
81039 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81040@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
81041 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
81042 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
81043 idle = get_idle_time(i);
81044- iowait = get_iowait_time(i);
81045- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81046- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81047- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81048- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81049- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81050+ if (unrestricted) {
81051+ iowait = get_iowait_time(i);
81052+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81053+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81054+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81055+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81056+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81057+ }
81058 seq_printf(p, "cpu%d", i);
81059 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81060 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
81061@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
81062
81063 /* sum again ? it could be updated? */
81064 for_each_irq_nr(j)
81065- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
81066+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
81067
81068 seq_printf(p,
81069 "\nctxt %llu\n"
81070@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
81071 "processes %lu\n"
81072 "procs_running %lu\n"
81073 "procs_blocked %lu\n",
81074- nr_context_switches(),
81075+ unrestricted ? nr_context_switches() : 0ULL,
81076 (unsigned long)jif,
81077- total_forks,
81078- nr_running(),
81079- nr_iowait());
81080+ unrestricted ? total_forks : 0UL,
81081+ unrestricted ? nr_running() : 0UL,
81082+ unrestricted ? nr_iowait() : 0UL);
81083
81084 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
81085
81086diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
81087index 6dee68d..1b4add0 100644
81088--- a/fs/proc/task_mmu.c
81089+++ b/fs/proc/task_mmu.c
81090@@ -13,12 +13,19 @@
81091 #include <linux/swap.h>
81092 #include <linux/swapops.h>
81093 #include <linux/mmu_notifier.h>
81094+#include <linux/grsecurity.h>
81095
81096 #include <asm/elf.h>
81097 #include <asm/uaccess.h>
81098 #include <asm/tlbflush.h>
81099 #include "internal.h"
81100
81101+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81102+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
81103+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
81104+ _mm->pax_flags & MF_PAX_SEGMEXEC))
81105+#endif
81106+
81107 void task_mem(struct seq_file *m, struct mm_struct *mm)
81108 {
81109 unsigned long data, text, lib, swap, ptes, pmds;
81110@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81111 "VmLib:\t%8lu kB\n"
81112 "VmPTE:\t%8lu kB\n"
81113 "VmPMD:\t%8lu kB\n"
81114- "VmSwap:\t%8lu kB\n",
81115- hiwater_vm << (PAGE_SHIFT-10),
81116+ "VmSwap:\t%8lu kB\n"
81117+
81118+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81119+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
81120+#endif
81121+
81122+ ,hiwater_vm << (PAGE_SHIFT-10),
81123 total_vm << (PAGE_SHIFT-10),
81124 mm->locked_vm << (PAGE_SHIFT-10),
81125 mm->pinned_vm << (PAGE_SHIFT-10),
81126@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81127 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
81128 ptes >> 10,
81129 pmds >> 10,
81130- swap << (PAGE_SHIFT-10));
81131+ swap << (PAGE_SHIFT-10)
81132+
81133+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81134+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81135+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
81136+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
81137+#else
81138+ , mm->context.user_cs_base
81139+ , mm->context.user_cs_limit
81140+#endif
81141+#endif
81142+
81143+ );
81144 }
81145
81146 unsigned long task_vsize(struct mm_struct *mm)
81147@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81148 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
81149 }
81150
81151- /* We don't show the stack guard page in /proc/maps */
81152+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81153+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
81154+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
81155+#else
81156 start = vma->vm_start;
81157- if (stack_guard_page_start(vma, start))
81158- start += PAGE_SIZE;
81159 end = vma->vm_end;
81160- if (stack_guard_page_end(vma, end))
81161- end -= PAGE_SIZE;
81162+#endif
81163
81164 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
81165 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
81166@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81167 flags & VM_WRITE ? 'w' : '-',
81168 flags & VM_EXEC ? 'x' : '-',
81169 flags & VM_MAYSHARE ? 's' : 'p',
81170+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81171+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
81172+#else
81173 pgoff,
81174+#endif
81175 MAJOR(dev), MINOR(dev), ino);
81176
81177 /*
81178@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81179 */
81180 if (file) {
81181 seq_pad(m, ' ');
81182- seq_path(m, &file->f_path, "\n");
81183+ seq_path(m, &file->f_path, "\n\\");
81184 goto done;
81185 }
81186
81187@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81188 * Thread stack in /proc/PID/task/TID/maps or
81189 * the main process stack.
81190 */
81191- if (!is_pid || (vma->vm_start <= mm->start_stack &&
81192- vma->vm_end >= mm->start_stack)) {
81193+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
81194+ (vma->vm_start <= mm->start_stack &&
81195+ vma->vm_end >= mm->start_stack)) {
81196 name = "[stack]";
81197 } else {
81198 /* Thread stack in /proc/PID/maps */
81199@@ -362,6 +391,12 @@ done:
81200
81201 static int show_map(struct seq_file *m, void *v, int is_pid)
81202 {
81203+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81204+ if (current->exec_id != m->exec_id) {
81205+ gr_log_badprocpid("maps");
81206+ return 0;
81207+ }
81208+#endif
81209 show_map_vma(m, v, is_pid);
81210 m_cache_vma(m, v);
81211 return 0;
81212@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81213 .private = &mss,
81214 };
81215
81216+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81217+ if (current->exec_id != m->exec_id) {
81218+ gr_log_badprocpid("smaps");
81219+ return 0;
81220+ }
81221+#endif
81222 memset(&mss, 0, sizeof mss);
81223- /* mmap_sem is held in m_start */
81224- walk_page_vma(vma, &smaps_walk);
81225+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81226+ if (!PAX_RAND_FLAGS(vma->vm_mm))
81227+#endif
81228+ /* mmap_sem is held in m_start */
81229+ walk_page_vma(vma, &smaps_walk);
81230
81231 show_map_vma(m, vma, is_pid);
81232
81233@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81234 "KernelPageSize: %8lu kB\n"
81235 "MMUPageSize: %8lu kB\n"
81236 "Locked: %8lu kB\n",
81237+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81238+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
81239+#else
81240 (vma->vm_end - vma->vm_start) >> 10,
81241+#endif
81242 mss.resident >> 10,
81243 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
81244 mss.shared_clean >> 10,
81245@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81246 char buffer[64];
81247 int nid;
81248
81249+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81250+ if (current->exec_id != m->exec_id) {
81251+ gr_log_badprocpid("numa_maps");
81252+ return 0;
81253+ }
81254+#endif
81255+
81256 if (!mm)
81257 return 0;
81258
81259@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81260 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
81261 }
81262
81263+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81264+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
81265+#else
81266 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
81267+#endif
81268
81269 if (file) {
81270 seq_puts(m, " file=");
81271- seq_path(m, &file->f_path, "\n\t= ");
81272+ seq_path(m, &file->f_path, "\n\t\\= ");
81273 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
81274 seq_puts(m, " heap");
81275 } else {
81276diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
81277index 599ec2e..f1413ae 100644
81278--- a/fs/proc/task_nommu.c
81279+++ b/fs/proc/task_nommu.c
81280@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81281 else
81282 bytes += kobjsize(mm);
81283
81284- if (current->fs && current->fs->users > 1)
81285+ if (current->fs && atomic_read(&current->fs->users) > 1)
81286 sbytes += kobjsize(current->fs);
81287 else
81288 bytes += kobjsize(current->fs);
81289@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
81290
81291 if (file) {
81292 seq_pad(m, ' ');
81293- seq_path(m, &file->f_path, "");
81294+ seq_path(m, &file->f_path, "\n\\");
81295 } else if (mm) {
81296 pid_t tid = pid_of_stack(priv, vma, is_pid);
81297
81298diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
81299index 4e61388..1a2523d 100644
81300--- a/fs/proc/vmcore.c
81301+++ b/fs/proc/vmcore.c
81302@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
81303 nr_bytes = count;
81304
81305 /* If pfn is not ram, return zeros for sparse dump files */
81306- if (pfn_is_ram(pfn) == 0)
81307- memset(buf, 0, nr_bytes);
81308- else {
81309+ if (pfn_is_ram(pfn) == 0) {
81310+ if (userbuf) {
81311+ if (clear_user((char __force_user *)buf, nr_bytes))
81312+ return -EFAULT;
81313+ } else
81314+ memset(buf, 0, nr_bytes);
81315+ } else {
81316 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
81317 offset, userbuf);
81318 if (tmp < 0)
81319@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
81320 static int copy_to(void *target, void *src, size_t size, int userbuf)
81321 {
81322 if (userbuf) {
81323- if (copy_to_user((char __user *) target, src, size))
81324+ if (copy_to_user((char __force_user *) target, src, size))
81325 return -EFAULT;
81326 } else {
81327 memcpy(target, src, size);
81328@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81329 if (*fpos < m->offset + m->size) {
81330 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
81331 start = m->paddr + *fpos - m->offset;
81332- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
81333+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
81334 if (tmp < 0)
81335 return tmp;
81336 buflen -= tsz;
81337@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81338 static ssize_t read_vmcore(struct file *file, char __user *buffer,
81339 size_t buflen, loff_t *fpos)
81340 {
81341- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
81342+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
81343 }
81344
81345 /*
81346diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
81347index d3fb2b6..43a8140 100644
81348--- a/fs/qnx6/qnx6.h
81349+++ b/fs/qnx6/qnx6.h
81350@@ -74,7 +74,7 @@ enum {
81351 BYTESEX_BE,
81352 };
81353
81354-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81355+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81356 {
81357 if (sbi->s_bytesex == BYTESEX_LE)
81358 return le64_to_cpu((__force __le64)n);
81359@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
81360 return (__force __fs64)cpu_to_be64(n);
81361 }
81362
81363-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81364+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81365 {
81366 if (sbi->s_bytesex == BYTESEX_LE)
81367 return le32_to_cpu((__force __le32)n);
81368diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
81369index bb2869f..d34ada8 100644
81370--- a/fs/quota/netlink.c
81371+++ b/fs/quota/netlink.c
81372@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
81373 void quota_send_warning(struct kqid qid, dev_t dev,
81374 const char warntype)
81375 {
81376- static atomic_t seq;
81377+ static atomic_unchecked_t seq;
81378 struct sk_buff *skb;
81379 void *msg_head;
81380 int ret;
81381@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
81382 "VFS: Not enough memory to send quota warning.\n");
81383 return;
81384 }
81385- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
81386+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
81387 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
81388 if (!msg_head) {
81389 printk(KERN_ERR
81390diff --git a/fs/read_write.c b/fs/read_write.c
81391index 819ef3f..f07222d 100644
81392--- a/fs/read_write.c
81393+++ b/fs/read_write.c
81394@@ -505,7 +505,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
81395
81396 old_fs = get_fs();
81397 set_fs(get_ds());
81398- p = (__force const char __user *)buf;
81399+ p = (const char __force_user *)buf;
81400 if (count > MAX_RW_COUNT)
81401 count = MAX_RW_COUNT;
81402 ret = __vfs_write(file, p, count, pos);
81403diff --git a/fs/readdir.c b/fs/readdir.c
81404index ced6791..936687b 100644
81405--- a/fs/readdir.c
81406+++ b/fs/readdir.c
81407@@ -18,6 +18,7 @@
81408 #include <linux/security.h>
81409 #include <linux/syscalls.h>
81410 #include <linux/unistd.h>
81411+#include <linux/namei.h>
81412
81413 #include <asm/uaccess.h>
81414
81415@@ -71,6 +72,7 @@ struct old_linux_dirent {
81416 struct readdir_callback {
81417 struct dir_context ctx;
81418 struct old_linux_dirent __user * dirent;
81419+ struct file * file;
81420 int result;
81421 };
81422
81423@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
81424 buf->result = -EOVERFLOW;
81425 return -EOVERFLOW;
81426 }
81427+
81428+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81429+ return 0;
81430+
81431 buf->result++;
81432 dirent = buf->dirent;
81433 if (!access_ok(VERIFY_WRITE, dirent,
81434@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
81435 if (!f.file)
81436 return -EBADF;
81437
81438+ buf.file = f.file;
81439 error = iterate_dir(f.file, &buf.ctx);
81440 if (buf.result)
81441 error = buf.result;
81442@@ -145,6 +152,7 @@ struct getdents_callback {
81443 struct dir_context ctx;
81444 struct linux_dirent __user * current_dir;
81445 struct linux_dirent __user * previous;
81446+ struct file * file;
81447 int count;
81448 int error;
81449 };
81450@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
81451 buf->error = -EOVERFLOW;
81452 return -EOVERFLOW;
81453 }
81454+
81455+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81456+ return 0;
81457+
81458 dirent = buf->previous;
81459 if (dirent) {
81460 if (__put_user(offset, &dirent->d_off))
81461@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
81462 if (!f.file)
81463 return -EBADF;
81464
81465+ buf.file = f.file;
81466 error = iterate_dir(f.file, &buf.ctx);
81467 if (error >= 0)
81468 error = buf.error;
81469@@ -230,6 +243,7 @@ struct getdents_callback64 {
81470 struct dir_context ctx;
81471 struct linux_dirent64 __user * current_dir;
81472 struct linux_dirent64 __user * previous;
81473+ struct file *file;
81474 int count;
81475 int error;
81476 };
81477@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
81478 buf->error = -EINVAL; /* only used if we fail.. */
81479 if (reclen > buf->count)
81480 return -EINVAL;
81481+
81482+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81483+ return 0;
81484+
81485 dirent = buf->previous;
81486 if (dirent) {
81487 if (__put_user(offset, &dirent->d_off))
81488@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
81489 if (!f.file)
81490 return -EBADF;
81491
81492+ buf.file = f.file;
81493 error = iterate_dir(f.file, &buf.ctx);
81494 if (error >= 0)
81495 error = buf.error;
81496diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
81497index 9c02d96..6562c10 100644
81498--- a/fs/reiserfs/do_balan.c
81499+++ b/fs/reiserfs/do_balan.c
81500@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
81501 return;
81502 }
81503
81504- atomic_inc(&fs_generation(tb->tb_sb));
81505+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
81506 do_balance_starts(tb);
81507
81508 /*
81509diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
81510index aca73dd..e3c558d 100644
81511--- a/fs/reiserfs/item_ops.c
81512+++ b/fs/reiserfs/item_ops.c
81513@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
81514 }
81515
81516 static struct item_operations errcatch_ops = {
81517- errcatch_bytes_number,
81518- errcatch_decrement_key,
81519- errcatch_is_left_mergeable,
81520- errcatch_print_item,
81521- errcatch_check_item,
81522+ .bytes_number = errcatch_bytes_number,
81523+ .decrement_key = errcatch_decrement_key,
81524+ .is_left_mergeable = errcatch_is_left_mergeable,
81525+ .print_item = errcatch_print_item,
81526+ .check_item = errcatch_check_item,
81527
81528- errcatch_create_vi,
81529- errcatch_check_left,
81530- errcatch_check_right,
81531- errcatch_part_size,
81532- errcatch_unit_num,
81533- errcatch_print_vi
81534+ .create_vi = errcatch_create_vi,
81535+ .check_left = errcatch_check_left,
81536+ .check_right = errcatch_check_right,
81537+ .part_size = errcatch_part_size,
81538+ .unit_num = errcatch_unit_num,
81539+ .print_vi = errcatch_print_vi
81540 };
81541
81542 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
81543diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
81544index 621b9f3..af527fd 100644
81545--- a/fs/reiserfs/procfs.c
81546+++ b/fs/reiserfs/procfs.c
81547@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
81548 "SMALL_TAILS " : "NO_TAILS ",
81549 replay_only(sb) ? "REPLAY_ONLY " : "",
81550 convert_reiserfs(sb) ? "CONV " : "",
81551- atomic_read(&r->s_generation_counter),
81552+ atomic_read_unchecked(&r->s_generation_counter),
81553 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
81554 SF(s_do_balance), SF(s_unneeded_left_neighbor),
81555 SF(s_good_search_by_key_reada), SF(s_bmaps),
81556diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
81557index 2adcde1..7d27bc8 100644
81558--- a/fs/reiserfs/reiserfs.h
81559+++ b/fs/reiserfs/reiserfs.h
81560@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
81561 /* Comment? -Hans */
81562 wait_queue_head_t s_wait;
81563 /* increased by one every time the tree gets re-balanced */
81564- atomic_t s_generation_counter;
81565+ atomic_unchecked_t s_generation_counter;
81566
81567 /* File system properties. Currently holds on-disk FS format */
81568 unsigned long s_properties;
81569@@ -2300,7 +2300,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
81570 #define REISERFS_USER_MEM 1 /* user memory mode */
81571
81572 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
81573-#define get_generation(s) atomic_read (&fs_generation(s))
81574+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
81575 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
81576 #define __fs_changed(gen,s) (gen != get_generation (s))
81577 #define fs_changed(gen,s) \
81578diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
81579index 0111ad0..00f4749 100644
81580--- a/fs/reiserfs/super.c
81581+++ b/fs/reiserfs/super.c
81582@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
81583 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
81584 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
81585 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
81586+#ifdef CONFIG_REISERFS_FS_XATTR
81587+ /* turn on user xattrs by default */
81588+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
81589+#endif
81590 /* no preallocation minimum, be smart in reiserfs_file_write instead */
81591 sbi->s_alloc_options.preallocmin = 0;
81592 /* Preallocate by 16 blocks (17-1) at once */
81593diff --git a/fs/select.c b/fs/select.c
81594index f684c75..4117611 100644
81595--- a/fs/select.c
81596+++ b/fs/select.c
81597@@ -20,6 +20,7 @@
81598 #include <linux/export.h>
81599 #include <linux/slab.h>
81600 #include <linux/poll.h>
81601+#include <linux/security.h>
81602 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
81603 #include <linux/file.h>
81604 #include <linux/fdtable.h>
81605@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
81606 struct poll_list *walk = head;
81607 unsigned long todo = nfds;
81608
81609+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
81610 if (nfds > rlimit(RLIMIT_NOFILE))
81611 return -EINVAL;
81612
81613diff --git a/fs/seq_file.c b/fs/seq_file.c
81614index 555f821..02a990b 100644
81615--- a/fs/seq_file.c
81616+++ b/fs/seq_file.c
81617@@ -12,6 +12,8 @@
81618 #include <linux/slab.h>
81619 #include <linux/cred.h>
81620 #include <linux/mm.h>
81621+#include <linux/sched.h>
81622+#include <linux/grsecurity.h>
81623
81624 #include <asm/uaccess.h>
81625 #include <asm/page.h>
81626@@ -29,9 +31,9 @@ static void *seq_buf_alloc(unsigned long size)
81627 * __GFP_NORETRY to avoid oom-killings with high-order allocations -
81628 * it's better to fall back to vmalloc() than to kill things.
81629 */
81630- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
81631+ buf = kmalloc(size, GFP_KERNEL | GFP_USERCOPY | __GFP_NORETRY | __GFP_NOWARN);
81632 if (!buf && size > PAGE_SIZE)
81633- buf = vmalloc(size);
81634+ buf = vmalloc_usercopy(size);
81635 return buf;
81636 }
81637
81638@@ -65,6 +67,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
81639 #ifdef CONFIG_USER_NS
81640 p->user_ns = file->f_cred->user_ns;
81641 #endif
81642+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81643+ p->exec_id = current->exec_id;
81644+#endif
81645
81646 /*
81647 * Wrappers around seq_open(e.g. swaps_open) need to be
81648@@ -87,6 +92,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
81649 }
81650 EXPORT_SYMBOL(seq_open);
81651
81652+
81653+int seq_open_restrict(struct file *file, const struct seq_operations *op)
81654+{
81655+ if (gr_proc_is_restricted())
81656+ return -EACCES;
81657+
81658+ return seq_open(file, op);
81659+}
81660+EXPORT_SYMBOL(seq_open_restrict);
81661+
81662 static int traverse(struct seq_file *m, loff_t offset)
81663 {
81664 loff_t pos = 0, index;
81665@@ -158,7 +173,7 @@ Eoverflow:
81666 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
81667 {
81668 struct seq_file *m = file->private_data;
81669- size_t copied = 0;
81670+ ssize_t copied = 0;
81671 loff_t pos;
81672 size_t n;
81673 void *p;
81674@@ -557,7 +572,7 @@ static void single_stop(struct seq_file *p, void *v)
81675 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
81676 void *data)
81677 {
81678- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
81679+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
81680 int res = -ENOMEM;
81681
81682 if (op) {
81683@@ -593,6 +608,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
81684 }
81685 EXPORT_SYMBOL(single_open_size);
81686
81687+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
81688+ void *data)
81689+{
81690+ if (gr_proc_is_restricted())
81691+ return -EACCES;
81692+
81693+ return single_open(file, show, data);
81694+}
81695+EXPORT_SYMBOL(single_open_restrict);
81696+
81697+
81698 int single_release(struct inode *inode, struct file *file)
81699 {
81700 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
81701diff --git a/fs/splice.c b/fs/splice.c
81702index bfe62ae..a84920d 100644
81703--- a/fs/splice.c
81704+++ b/fs/splice.c
81705@@ -192,7 +192,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81706 pipe_lock(pipe);
81707
81708 for (;;) {
81709- if (!pipe->readers) {
81710+ if (!atomic_read(&pipe->readers)) {
81711 send_sig(SIGPIPE, current, 0);
81712 if (!ret)
81713 ret = -EPIPE;
81714@@ -215,7 +215,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81715 page_nr++;
81716 ret += buf->len;
81717
81718- if (pipe->files)
81719+ if (atomic_read(&pipe->files))
81720 do_wakeup = 1;
81721
81722 if (!--spd->nr_pages)
81723@@ -246,9 +246,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81724 do_wakeup = 0;
81725 }
81726
81727- pipe->waiting_writers++;
81728+ atomic_inc(&pipe->waiting_writers);
81729 pipe_wait(pipe);
81730- pipe->waiting_writers--;
81731+ atomic_dec(&pipe->waiting_writers);
81732 }
81733
81734 pipe_unlock(pipe);
81735@@ -578,7 +578,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
81736 old_fs = get_fs();
81737 set_fs(get_ds());
81738 /* The cast to a user pointer is valid due to the set_fs() */
81739- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
81740+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
81741 set_fs(old_fs);
81742
81743 return res;
81744@@ -593,7 +593,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
81745 old_fs = get_fs();
81746 set_fs(get_ds());
81747 /* The cast to a user pointer is valid due to the set_fs() */
81748- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
81749+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
81750 set_fs(old_fs);
81751
81752 return res;
81753@@ -646,7 +646,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
81754 goto err;
81755
81756 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
81757- vec[i].iov_base = (void __user *) page_address(page);
81758+ vec[i].iov_base = (void __force_user *) page_address(page);
81759 vec[i].iov_len = this_len;
81760 spd.pages[i] = page;
81761 spd.nr_pages++;
81762@@ -785,7 +785,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
81763 ops->release(pipe, buf);
81764 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
81765 pipe->nrbufs--;
81766- if (pipe->files)
81767+ if (atomic_read(&pipe->files))
81768 sd->need_wakeup = true;
81769 }
81770
81771@@ -809,10 +809,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
81772 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
81773 {
81774 while (!pipe->nrbufs) {
81775- if (!pipe->writers)
81776+ if (!atomic_read(&pipe->writers))
81777 return 0;
81778
81779- if (!pipe->waiting_writers && sd->num_spliced)
81780+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
81781 return 0;
81782
81783 if (sd->flags & SPLICE_F_NONBLOCK)
81784@@ -1027,7 +1027,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
81785 ops->release(pipe, buf);
81786 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
81787 pipe->nrbufs--;
81788- if (pipe->files)
81789+ if (atomic_read(&pipe->files))
81790 sd.need_wakeup = true;
81791 } else {
81792 buf->offset += ret;
81793@@ -1187,7 +1187,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
81794 * out of the pipe right after the splice_to_pipe(). So set
81795 * PIPE_READERS appropriately.
81796 */
81797- pipe->readers = 1;
81798+ atomic_set(&pipe->readers, 1);
81799
81800 current->splice_pipe = pipe;
81801 }
81802@@ -1494,6 +1494,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
81803
81804 partial[buffers].offset = off;
81805 partial[buffers].len = plen;
81806+ partial[buffers].private = 0;
81807
81808 off = 0;
81809 len -= plen;
81810@@ -1725,9 +1726,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
81811 ret = -ERESTARTSYS;
81812 break;
81813 }
81814- if (!pipe->writers)
81815+ if (!atomic_read(&pipe->writers))
81816 break;
81817- if (!pipe->waiting_writers) {
81818+ if (!atomic_read(&pipe->waiting_writers)) {
81819 if (flags & SPLICE_F_NONBLOCK) {
81820 ret = -EAGAIN;
81821 break;
81822@@ -1759,7 +1760,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
81823 pipe_lock(pipe);
81824
81825 while (pipe->nrbufs >= pipe->buffers) {
81826- if (!pipe->readers) {
81827+ if (!atomic_read(&pipe->readers)) {
81828 send_sig(SIGPIPE, current, 0);
81829 ret = -EPIPE;
81830 break;
81831@@ -1772,9 +1773,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
81832 ret = -ERESTARTSYS;
81833 break;
81834 }
81835- pipe->waiting_writers++;
81836+ atomic_inc(&pipe->waiting_writers);
81837 pipe_wait(pipe);
81838- pipe->waiting_writers--;
81839+ atomic_dec(&pipe->waiting_writers);
81840 }
81841
81842 pipe_unlock(pipe);
81843@@ -1810,14 +1811,14 @@ retry:
81844 pipe_double_lock(ipipe, opipe);
81845
81846 do {
81847- if (!opipe->readers) {
81848+ if (!atomic_read(&opipe->readers)) {
81849 send_sig(SIGPIPE, current, 0);
81850 if (!ret)
81851 ret = -EPIPE;
81852 break;
81853 }
81854
81855- if (!ipipe->nrbufs && !ipipe->writers)
81856+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
81857 break;
81858
81859 /*
81860@@ -1914,7 +1915,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
81861 pipe_double_lock(ipipe, opipe);
81862
81863 do {
81864- if (!opipe->readers) {
81865+ if (!atomic_read(&opipe->readers)) {
81866 send_sig(SIGPIPE, current, 0);
81867 if (!ret)
81868 ret = -EPIPE;
81869@@ -1959,7 +1960,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
81870 * return EAGAIN if we have the potential of some data in the
81871 * future, otherwise just return 0
81872 */
81873- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
81874+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
81875 ret = -EAGAIN;
81876
81877 pipe_unlock(ipipe);
81878diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
81879index e5e0ddf..09598c4 100644
81880--- a/fs/squashfs/xattr.c
81881+++ b/fs/squashfs/xattr.c
81882@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81883 + msblk->xattr_table;
81884 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
81885 int count = squashfs_i(inode)->xattr_count;
81886- size_t rest = buffer_size;
81887- int err;
81888+ size_t used = 0;
81889+ ssize_t err;
81890
81891 /* check that the file system has xattrs */
81892 if (msblk->xattr_id_table == NULL)
81893@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81894 name_size = le16_to_cpu(entry.size);
81895 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
81896 if (handler)
81897- prefix_size = handler->list(d, buffer, rest, NULL,
81898+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
81899 name_size, handler->flags);
81900 if (prefix_size) {
81901 if (buffer) {
81902- if (prefix_size + name_size + 1 > rest) {
81903+ if (prefix_size + name_size + 1 > buffer_size - used) {
81904 err = -ERANGE;
81905 goto failed;
81906 }
81907@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81908 buffer[name_size] = '\0';
81909 buffer += name_size + 1;
81910 }
81911- rest -= prefix_size + name_size + 1;
81912+ used += prefix_size + name_size + 1;
81913 } else {
81914 /* no handler or insuffficient privileges, so skip */
81915 err = squashfs_read_metadata(sb, NULL, &start,
81916@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81917 if (err < 0)
81918 goto failed;
81919 }
81920- err = buffer_size - rest;
81921+ err = used;
81922
81923 failed:
81924 return err;
81925diff --git a/fs/stat.c b/fs/stat.c
81926index cccc1aa..7fe8951 100644
81927--- a/fs/stat.c
81928+++ b/fs/stat.c
81929@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
81930 stat->gid = inode->i_gid;
81931 stat->rdev = inode->i_rdev;
81932 stat->size = i_size_read(inode);
81933- stat->atime = inode->i_atime;
81934- stat->mtime = inode->i_mtime;
81935+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
81936+ stat->atime = inode->i_ctime;
81937+ stat->mtime = inode->i_ctime;
81938+ } else {
81939+ stat->atime = inode->i_atime;
81940+ stat->mtime = inode->i_mtime;
81941+ }
81942 stat->ctime = inode->i_ctime;
81943 stat->blksize = (1 << inode->i_blkbits);
81944 stat->blocks = inode->i_blocks;
81945@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
81946 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
81947 {
81948 struct inode *inode = d_backing_inode(path->dentry);
81949+ int retval;
81950
81951- if (inode->i_op->getattr)
81952- return inode->i_op->getattr(path->mnt, path->dentry, stat);
81953+ if (inode->i_op->getattr) {
81954+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
81955+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
81956+ stat->atime = stat->ctime;
81957+ stat->mtime = stat->ctime;
81958+ }
81959+ return retval;
81960+ }
81961
81962 generic_fillattr(inode, stat);
81963 return 0;
81964diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
81965index 94374e4..b5da3a1 100644
81966--- a/fs/sysfs/dir.c
81967+++ b/fs/sysfs/dir.c
81968@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
81969 kfree(buf);
81970 }
81971
81972+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
81973+extern int grsec_enable_sysfs_restrict;
81974+#endif
81975+
81976 /**
81977 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
81978 * @kobj: object we're creating directory for
81979@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
81980 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
81981 {
81982 struct kernfs_node *parent, *kn;
81983+ const char *name;
81984+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
81985+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
81986+ const char *parent_name;
81987+#endif
81988
81989 BUG_ON(!kobj);
81990
81991+ name = kobject_name(kobj);
81992+
81993 if (kobj->parent)
81994 parent = kobj->parent->sd;
81995 else
81996@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
81997 if (!parent)
81998 return -ENOENT;
81999
82000- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
82001- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
82002+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82003+ parent_name = parent->name;
82004+ mode = S_IRWXU;
82005+
82006+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
82007+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
82008+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
82009+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
82010+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
82011+ if (!grsec_enable_sysfs_restrict)
82012+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
82013+#endif
82014+
82015+ kn = kernfs_create_dir_ns(parent, name,
82016+ mode, kobj, ns);
82017 if (IS_ERR(kn)) {
82018 if (PTR_ERR(kn) == -EEXIST)
82019- sysfs_warn_dup(parent, kobject_name(kobj));
82020+ sysfs_warn_dup(parent, name);
82021 return PTR_ERR(kn);
82022 }
82023
82024diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
82025index 69d4889..a810bd4 100644
82026--- a/fs/sysv/sysv.h
82027+++ b/fs/sysv/sysv.h
82028@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
82029 #endif
82030 }
82031
82032-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82033+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82034 {
82035 if (sbi->s_bytesex == BYTESEX_PDP)
82036 return PDP_swab((__force __u32)n);
82037diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
82038index a43df11..c368e71 100644
82039--- a/fs/tracefs/inode.c
82040+++ b/fs/tracefs/inode.c
82041@@ -53,7 +53,7 @@ static const struct file_operations tracefs_file_operations = {
82042 static struct tracefs_dir_ops {
82043 int (*mkdir)(const char *name);
82044 int (*rmdir)(const char *name);
82045-} tracefs_ops;
82046+} __no_const tracefs_ops __read_only;
82047
82048 static char *get_dname(struct dentry *dentry)
82049 {
82050@@ -490,8 +490,10 @@ struct dentry *tracefs_create_instance_dir(const char *name, struct dentry *pare
82051 if (!dentry)
82052 return NULL;
82053
82054- tracefs_ops.mkdir = mkdir;
82055- tracefs_ops.rmdir = rmdir;
82056+ pax_open_kernel();
82057+ *(void **)&tracefs_ops.mkdir = mkdir;
82058+ *(void **)&tracefs_ops.rmdir = rmdir;
82059+ pax_close_kernel();
82060
82061 return dentry;
82062 }
82063diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
82064index 97be412..974b37f 100644
82065--- a/fs/ubifs/io.c
82066+++ b/fs/ubifs/io.c
82067@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
82068 return err;
82069 }
82070
82071-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82072+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82073 {
82074 int err;
82075
82076diff --git a/fs/udf/misc.c b/fs/udf/misc.c
82077index 71d1c25..084e2ad 100644
82078--- a/fs/udf/misc.c
82079+++ b/fs/udf/misc.c
82080@@ -288,7 +288,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
82081
82082 u8 udf_tag_checksum(const struct tag *t)
82083 {
82084- u8 *data = (u8 *)t;
82085+ const u8 *data = (const u8 *)t;
82086 u8 checksum = 0;
82087 int i;
82088 for (i = 0; i < sizeof(struct tag); ++i)
82089diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
82090index 8d974c4..b82f6ec 100644
82091--- a/fs/ufs/swab.h
82092+++ b/fs/ufs/swab.h
82093@@ -22,7 +22,7 @@ enum {
82094 BYTESEX_BE
82095 };
82096
82097-static inline u64
82098+static inline u64 __intentional_overflow(-1)
82099 fs64_to_cpu(struct super_block *sbp, __fs64 n)
82100 {
82101 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82102@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
82103 return (__force __fs64)cpu_to_be64(n);
82104 }
82105
82106-static inline u32
82107+static inline u32 __intentional_overflow(-1)
82108 fs32_to_cpu(struct super_block *sbp, __fs32 n)
82109 {
82110 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82111diff --git a/fs/utimes.c b/fs/utimes.c
82112index aa138d6..5f3a811 100644
82113--- a/fs/utimes.c
82114+++ b/fs/utimes.c
82115@@ -1,6 +1,7 @@
82116 #include <linux/compiler.h>
82117 #include <linux/file.h>
82118 #include <linux/fs.h>
82119+#include <linux/security.h>
82120 #include <linux/linkage.h>
82121 #include <linux/mount.h>
82122 #include <linux/namei.h>
82123@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
82124 }
82125 }
82126 retry_deleg:
82127+
82128+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
82129+ error = -EACCES;
82130+ goto mnt_drop_write_and_out;
82131+ }
82132+
82133 mutex_lock(&inode->i_mutex);
82134 error = notify_change(path->dentry, &newattrs, &delegated_inode);
82135 mutex_unlock(&inode->i_mutex);
82136diff --git a/fs/xattr.c b/fs/xattr.c
82137index 4ef6985..a6cd6567 100644
82138--- a/fs/xattr.c
82139+++ b/fs/xattr.c
82140@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
82141 return rc;
82142 }
82143
82144+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
82145+ssize_t
82146+pax_getxattr(struct dentry *dentry, void *value, size_t size)
82147+{
82148+ struct inode *inode = dentry->d_inode;
82149+ ssize_t error;
82150+
82151+ error = inode_permission(inode, MAY_EXEC);
82152+ if (error)
82153+ return error;
82154+
82155+ if (inode->i_op->getxattr)
82156+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
82157+ else
82158+ error = -EOPNOTSUPP;
82159+
82160+ return error;
82161+}
82162+EXPORT_SYMBOL(pax_getxattr);
82163+#endif
82164+
82165 ssize_t
82166 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
82167 {
82168@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
82169 * Extended attribute SET operations
82170 */
82171 static long
82172-setxattr(struct dentry *d, const char __user *name, const void __user *value,
82173+setxattr(struct path *path, const char __user *name, const void __user *value,
82174 size_t size, int flags)
82175 {
82176 int error;
82177@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
82178 posix_acl_fix_xattr_from_user(kvalue, size);
82179 }
82180
82181- error = vfs_setxattr(d, kname, kvalue, size, flags);
82182+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
82183+ error = -EACCES;
82184+ goto out;
82185+ }
82186+
82187+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
82188 out:
82189 if (vvalue)
82190 vfree(vvalue);
82191@@ -376,7 +402,7 @@ retry:
82192 return error;
82193 error = mnt_want_write(path.mnt);
82194 if (!error) {
82195- error = setxattr(path.dentry, name, value, size, flags);
82196+ error = setxattr(&path, name, value, size, flags);
82197 mnt_drop_write(path.mnt);
82198 }
82199 path_put(&path);
82200@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
82201 audit_file(f.file);
82202 error = mnt_want_write_file(f.file);
82203 if (!error) {
82204- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
82205+ error = setxattr(&f.file->f_path, name, value, size, flags);
82206 mnt_drop_write_file(f.file);
82207 }
82208 fdput(f);
82209@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
82210 * Extended attribute REMOVE operations
82211 */
82212 static long
82213-removexattr(struct dentry *d, const char __user *name)
82214+removexattr(struct path *path, const char __user *name)
82215 {
82216 int error;
82217 char kname[XATTR_NAME_MAX + 1];
82218@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
82219 if (error < 0)
82220 return error;
82221
82222- return vfs_removexattr(d, kname);
82223+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
82224+ return -EACCES;
82225+
82226+ return vfs_removexattr(path->dentry, kname);
82227 }
82228
82229 static int path_removexattr(const char __user *pathname,
82230@@ -623,7 +652,7 @@ retry:
82231 return error;
82232 error = mnt_want_write(path.mnt);
82233 if (!error) {
82234- error = removexattr(path.dentry, name);
82235+ error = removexattr(&path, name);
82236 mnt_drop_write(path.mnt);
82237 }
82238 path_put(&path);
82239@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
82240 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
82241 {
82242 struct fd f = fdget(fd);
82243+ struct path *path;
82244 int error = -EBADF;
82245
82246 if (!f.file)
82247 return error;
82248+ path = &f.file->f_path;
82249 audit_file(f.file);
82250 error = mnt_want_write_file(f.file);
82251 if (!error) {
82252- error = removexattr(f.file->f_path.dentry, name);
82253+ error = removexattr(path, name);
82254 mnt_drop_write_file(f.file);
82255 }
82256 fdput(f);
82257diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
82258index f1026e8..a0fbe4f 100644
82259--- a/fs/xfs/libxfs/xfs_bmap.c
82260+++ b/fs/xfs/libxfs/xfs_bmap.c
82261@@ -554,7 +554,7 @@ xfs_bmap_validate_ret(
82262
82263 #else
82264 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
82265-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
82266+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
82267 #endif /* DEBUG */
82268
82269 /*
82270diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
82271index 098cd78..724d3f8 100644
82272--- a/fs/xfs/xfs_dir2_readdir.c
82273+++ b/fs/xfs/xfs_dir2_readdir.c
82274@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
82275 ino = dp->d_ops->sf_get_ino(sfp, sfep);
82276 filetype = dp->d_ops->sf_get_ftype(sfep);
82277 ctx->pos = off & 0x7fffffff;
82278- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82279+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
82280+ char name[sfep->namelen];
82281+ memcpy(name, sfep->name, sfep->namelen);
82282+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
82283+ return 0;
82284+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82285 xfs_dir3_get_dtype(dp->i_mount, filetype)))
82286 return 0;
82287 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
82288diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
82289index 87f67c6..7e335bf 100644
82290--- a/fs/xfs/xfs_ioctl.c
82291+++ b/fs/xfs/xfs_ioctl.c
82292@@ -120,7 +120,7 @@ xfs_find_handle(
82293 }
82294
82295 error = -EFAULT;
82296- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
82297+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
82298 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
82299 goto out_put;
82300
82301diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
82302index 7c7842c..ce15222 100644
82303--- a/fs/xfs/xfs_linux.h
82304+++ b/fs/xfs/xfs_linux.h
82305@@ -225,7 +225,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
82306 * of the compiler which do not like us using do_div in the middle
82307 * of large functions.
82308 */
82309-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82310+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82311 {
82312 __u32 mod;
82313
82314@@ -281,7 +281,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
82315 return 0;
82316 }
82317 #else
82318-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82319+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82320 {
82321 __u32 mod;
82322
82323diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
82324new file mode 100644
82325index 0000000..31f8fe4
82326--- /dev/null
82327+++ b/grsecurity/Kconfig
82328@@ -0,0 +1,1182 @@
82329+#
82330+# grecurity configuration
82331+#
82332+menu "Memory Protections"
82333+depends on GRKERNSEC
82334+
82335+config GRKERNSEC_KMEM
82336+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
82337+ default y if GRKERNSEC_CONFIG_AUTO
82338+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
82339+ help
82340+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
82341+ be written to or read from to modify or leak the contents of the running
82342+ kernel. /dev/port will also not be allowed to be opened, writing to
82343+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
82344+ If you have module support disabled, enabling this will close up several
82345+ ways that are currently used to insert malicious code into the running
82346+ kernel.
82347+
82348+ Even with this feature enabled, we still highly recommend that
82349+ you use the RBAC system, as it is still possible for an attacker to
82350+ modify the running kernel through other more obscure methods.
82351+
82352+ It is highly recommended that you say Y here if you meet all the
82353+ conditions above.
82354+
82355+config GRKERNSEC_VM86
82356+ bool "Restrict VM86 mode"
82357+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82358+ depends on X86_32
82359+
82360+ help
82361+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
82362+ make use of a special execution mode on 32bit x86 processors called
82363+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
82364+ video cards and will still work with this option enabled. The purpose
82365+ of the option is to prevent exploitation of emulation errors in
82366+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
82367+ Nearly all users should be able to enable this option.
82368+
82369+config GRKERNSEC_IO
82370+ bool "Disable privileged I/O"
82371+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82372+ depends on X86
82373+ select RTC_CLASS
82374+ select RTC_INTF_DEV
82375+ select RTC_DRV_CMOS
82376+
82377+ help
82378+ If you say Y here, all ioperm and iopl calls will return an error.
82379+ Ioperm and iopl can be used to modify the running kernel.
82380+ Unfortunately, some programs need this access to operate properly,
82381+ the most notable of which are XFree86 and hwclock. hwclock can be
82382+ remedied by having RTC support in the kernel, so real-time
82383+ clock support is enabled if this option is enabled, to ensure
82384+ that hwclock operates correctly. If hwclock still does not work,
82385+ either update udev or symlink /dev/rtc to /dev/rtc0.
82386+
82387+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
82388+ you may not be able to boot into a graphical environment with this
82389+ option enabled. In this case, you should use the RBAC system instead.
82390+
82391+config GRKERNSEC_BPF_HARDEN
82392+ bool "Harden BPF interpreter"
82393+ default y if GRKERNSEC_CONFIG_AUTO
82394+ help
82395+ Unlike previous versions of grsecurity that hardened both the BPF
82396+ interpreted code against corruption at rest as well as the JIT code
82397+ against JIT-spray attacks and attacker-controlled immediate values
82398+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
82399+ and will ensure the interpreted code is read-only at rest. This feature
82400+ may be removed at a later time when eBPF stabilizes to entirely revert
82401+ back to the more secure pre-3.16 BPF interpreter/JIT.
82402+
82403+ If you're using KERNEXEC, it's recommended that you enable this option
82404+ to supplement the hardening of the kernel.
82405+
82406+config GRKERNSEC_PERF_HARDEN
82407+ bool "Disable unprivileged PERF_EVENTS usage by default"
82408+ default y if GRKERNSEC_CONFIG_AUTO
82409+ depends on PERF_EVENTS
82410+ help
82411+ If you say Y here, the range of acceptable values for the
82412+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
82413+ default to a new value: 3. When the sysctl is set to this value, no
82414+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
82415+
82416+ Though PERF_EVENTS can be used legitimately for performance monitoring
82417+ and low-level application profiling, it is forced on regardless of
82418+ configuration, has been at fault for several vulnerabilities, and
82419+ creates new opportunities for side channels and other information leaks.
82420+
82421+ This feature puts PERF_EVENTS into a secure default state and permits
82422+ the administrator to change out of it temporarily if unprivileged
82423+ application profiling is needed.
82424+
82425+config GRKERNSEC_RAND_THREADSTACK
82426+ bool "Insert random gaps between thread stacks"
82427+ default y if GRKERNSEC_CONFIG_AUTO
82428+ depends on PAX_RANDMMAP && !PPC
82429+ help
82430+ If you say Y here, a random-sized gap will be enforced between allocated
82431+ thread stacks. Glibc's NPTL and other threading libraries that
82432+ pass MAP_STACK to the kernel for thread stack allocation are supported.
82433+ The implementation currently provides 8 bits of entropy for the gap.
82434+
82435+ Many distributions do not compile threaded remote services with the
82436+ -fstack-check argument to GCC, causing the variable-sized stack-based
82437+ allocator, alloca(), to not probe the stack on allocation. This
82438+ permits an unbounded alloca() to skip over any guard page and potentially
82439+ modify another thread's stack reliably. An enforced random gap
82440+ reduces the reliability of such an attack and increases the chance
82441+ that such a read/write to another thread's stack instead lands in
82442+ an unmapped area, causing a crash and triggering grsecurity's
82443+ anti-bruteforcing logic.
82444+
82445+config GRKERNSEC_PROC_MEMMAP
82446+ bool "Harden ASLR against information leaks and entropy reduction"
82447+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
82448+ depends on PAX_NOEXEC || PAX_ASLR
82449+ help
82450+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
82451+ give no information about the addresses of its mappings if
82452+ PaX features that rely on random addresses are enabled on the task.
82453+ In addition to sanitizing this information and disabling other
82454+ dangerous sources of information, this option causes reads of sensitive
82455+ /proc/<pid> entries where the file descriptor was opened in a different
82456+ task than the one performing the read. Such attempts are logged.
82457+ This option also limits argv/env strings for suid/sgid binaries
82458+ to 512KB to prevent a complete exhaustion of the stack entropy provided
82459+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
82460+ binaries to prevent alternative mmap layouts from being abused.
82461+
82462+ If you use PaX it is essential that you say Y here as it closes up
82463+ several holes that make full ASLR useless locally.
82464+
82465+
82466+config GRKERNSEC_KSTACKOVERFLOW
82467+ bool "Prevent kernel stack overflows"
82468+ default y if GRKERNSEC_CONFIG_AUTO
82469+ depends on !IA64 && 64BIT
82470+ help
82471+ If you say Y here, the kernel's process stacks will be allocated
82472+ with vmalloc instead of the kernel's default allocator. This
82473+ introduces guard pages that in combination with the alloca checking
82474+ of the STACKLEAK feature prevents all forms of kernel process stack
82475+ overflow abuse. Note that this is different from kernel stack
82476+ buffer overflows.
82477+
82478+config GRKERNSEC_BRUTE
82479+ bool "Deter exploit bruteforcing"
82480+ default y if GRKERNSEC_CONFIG_AUTO
82481+ help
82482+ If you say Y here, attempts to bruteforce exploits against forking
82483+ daemons such as apache or sshd, as well as against suid/sgid binaries
82484+ will be deterred. When a child of a forking daemon is killed by PaX
82485+ or crashes due to an illegal instruction or other suspicious signal,
82486+ the parent process will be delayed 30 seconds upon every subsequent
82487+ fork until the administrator is able to assess the situation and
82488+ restart the daemon.
82489+ In the suid/sgid case, the attempt is logged, the user has all their
82490+ existing instances of the suid/sgid binary terminated and will
82491+ be unable to execute any suid/sgid binaries for 15 minutes.
82492+
82493+ It is recommended that you also enable signal logging in the auditing
82494+ section so that logs are generated when a process triggers a suspicious
82495+ signal.
82496+ If the sysctl option is enabled, a sysctl option with name
82497+ "deter_bruteforce" is created.
82498+
82499+config GRKERNSEC_MODHARDEN
82500+ bool "Harden module auto-loading"
82501+ default y if GRKERNSEC_CONFIG_AUTO
82502+ depends on MODULES
82503+ help
82504+ If you say Y here, module auto-loading in response to use of some
82505+ feature implemented by an unloaded module will be restricted to
82506+ root users. Enabling this option helps defend against attacks
82507+ by unprivileged users who abuse the auto-loading behavior to
82508+ cause a vulnerable module to load that is then exploited.
82509+
82510+ If this option prevents a legitimate use of auto-loading for a
82511+ non-root user, the administrator can execute modprobe manually
82512+ with the exact name of the module mentioned in the alert log.
82513+ Alternatively, the administrator can add the module to the list
82514+ of modules loaded at boot by modifying init scripts.
82515+
82516+ Modification of init scripts will most likely be needed on
82517+ Ubuntu servers with encrypted home directory support enabled,
82518+ as the first non-root user logging in will cause the ecb(aes),
82519+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
82520+
82521+config GRKERNSEC_HIDESYM
82522+ bool "Hide kernel symbols"
82523+ default y if GRKERNSEC_CONFIG_AUTO
82524+ select PAX_USERCOPY_SLABS
82525+ help
82526+ If you say Y here, getting information on loaded modules, and
82527+ displaying all kernel symbols through a syscall will be restricted
82528+ to users with CAP_SYS_MODULE. For software compatibility reasons,
82529+ /proc/kallsyms will be restricted to the root user. The RBAC
82530+ system can hide that entry even from root.
82531+
82532+ This option also prevents leaking of kernel addresses through
82533+ several /proc entries.
82534+
82535+ Note that this option is only effective provided the following
82536+ conditions are met:
82537+ 1) The kernel using grsecurity is not precompiled by some distribution
82538+ 2) You have also enabled GRKERNSEC_DMESG
82539+ 3) You are using the RBAC system and hiding other files such as your
82540+ kernel image and System.map. Alternatively, enabling this option
82541+ causes the permissions on /boot, /lib/modules, and the kernel
82542+ source directory to change at compile time to prevent
82543+ reading by non-root users.
82544+ If the above conditions are met, this option will aid in providing a
82545+ useful protection against local kernel exploitation of overflows
82546+ and arbitrary read/write vulnerabilities.
82547+
82548+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
82549+ in addition to this feature.
82550+
82551+config GRKERNSEC_RANDSTRUCT
82552+ bool "Randomize layout of sensitive kernel structures"
82553+ default y if GRKERNSEC_CONFIG_AUTO
82554+ select GRKERNSEC_HIDESYM
82555+ select MODVERSIONS if MODULES
82556+ help
82557+ If you say Y here, the layouts of a number of sensitive kernel
82558+ structures (task, fs, cred, etc) and all structures composed entirely
82559+ of function pointers (aka "ops" structs) will be randomized at compile-time.
82560+ This can introduce the requirement of an additional infoleak
82561+ vulnerability for exploits targeting these structure types.
82562+
82563+ Enabling this feature will introduce some performance impact, slightly
82564+ increase memory usage, and prevent the use of forensic tools like
82565+ Volatility against the system (unless the kernel source tree isn't
82566+ cleaned after kernel installation).
82567+
82568+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
82569+ It remains after a make clean to allow for external modules to be compiled
82570+ with the existing seed and will be removed by a make mrproper or
82571+ make distclean.
82572+
82573+ Note that the implementation requires gcc 4.6.4. or newer. You may need
82574+ to install the supporting headers explicitly in addition to the normal
82575+ gcc package.
82576+
82577+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
82578+ bool "Use cacheline-aware structure randomization"
82579+ depends on GRKERNSEC_RANDSTRUCT
82580+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
82581+ help
82582+ If you say Y here, the RANDSTRUCT randomization will make a best effort
82583+ at restricting randomization to cacheline-sized groups of elements. It
82584+ will further not randomize bitfields in structures. This reduces the
82585+ performance hit of RANDSTRUCT at the cost of weakened randomization.
82586+
82587+config GRKERNSEC_KERN_LOCKOUT
82588+ bool "Active kernel exploit response"
82589+ default y if GRKERNSEC_CONFIG_AUTO
82590+ depends on X86 || ARM || PPC || SPARC
82591+ help
82592+ If you say Y here, when a PaX alert is triggered due to suspicious
82593+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
82594+ or an OOPS occurs due to bad memory accesses, instead of just
82595+ terminating the offending process (and potentially allowing
82596+ a subsequent exploit from the same user), we will take one of two
82597+ actions:
82598+ If the user was root, we will panic the system
82599+ If the user was non-root, we will log the attempt, terminate
82600+ all processes owned by the user, then prevent them from creating
82601+ any new processes until the system is restarted
82602+ This deters repeated kernel exploitation/bruteforcing attempts
82603+ and is useful for later forensics.
82604+
82605+config GRKERNSEC_OLD_ARM_USERLAND
82606+ bool "Old ARM userland compatibility"
82607+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
82608+ help
82609+ If you say Y here, stubs of executable code to perform such operations
82610+ as "compare-exchange" will be placed at fixed locations in the ARM vector
82611+ table. This is unfortunately needed for old ARM userland meant to run
82612+ across a wide range of processors. Without this option enabled,
82613+ the get_tls and data memory barrier stubs will be emulated by the kernel,
82614+ which is enough for Linaro userlands or other userlands designed for v6
82615+ and newer ARM CPUs. It's recommended that you try without this option enabled
82616+ first, and only enable it if your userland does not boot (it will likely fail
82617+ at init time).
82618+
82619+endmenu
82620+menu "Role Based Access Control Options"
82621+depends on GRKERNSEC
82622+
82623+config GRKERNSEC_RBAC_DEBUG
82624+ bool
82625+
82626+config GRKERNSEC_NO_RBAC
82627+ bool "Disable RBAC system"
82628+ help
82629+ If you say Y here, the /dev/grsec device will be removed from the kernel,
82630+ preventing the RBAC system from being enabled. You should only say Y
82631+ here if you have no intention of using the RBAC system, so as to prevent
82632+ an attacker with root access from misusing the RBAC system to hide files
82633+ and processes when loadable module support and /dev/[k]mem have been
82634+ locked down.
82635+
82636+config GRKERNSEC_ACL_HIDEKERN
82637+ bool "Hide kernel processes"
82638+ help
82639+ If you say Y here, all kernel threads will be hidden to all
82640+ processes but those whose subject has the "view hidden processes"
82641+ flag.
82642+
82643+config GRKERNSEC_ACL_MAXTRIES
82644+ int "Maximum tries before password lockout"
82645+ default 3
82646+ help
82647+ This option enforces the maximum number of times a user can attempt
82648+ to authorize themselves with the grsecurity RBAC system before being
82649+ denied the ability to attempt authorization again for a specified time.
82650+ The lower the number, the harder it will be to brute-force a password.
82651+
82652+config GRKERNSEC_ACL_TIMEOUT
82653+ int "Time to wait after max password tries, in seconds"
82654+ default 30
82655+ help
82656+ This option specifies the time the user must wait after attempting to
82657+ authorize to the RBAC system with the maximum number of invalid
82658+ passwords. The higher the number, the harder it will be to brute-force
82659+ a password.
82660+
82661+endmenu
82662+menu "Filesystem Protections"
82663+depends on GRKERNSEC
82664+
82665+config GRKERNSEC_PROC
82666+ bool "Proc restrictions"
82667+ default y if GRKERNSEC_CONFIG_AUTO
82668+ help
82669+ If you say Y here, the permissions of the /proc filesystem
82670+ will be altered to enhance system security and privacy. You MUST
82671+ choose either a user only restriction or a user and group restriction.
82672+ Depending upon the option you choose, you can either restrict users to
82673+ see only the processes they themselves run, or choose a group that can
82674+ view all processes and files normally restricted to root if you choose
82675+ the "restrict to user only" option. NOTE: If you're running identd or
82676+ ntpd as a non-root user, you will have to run it as the group you
82677+ specify here.
82678+
82679+config GRKERNSEC_PROC_USER
82680+ bool "Restrict /proc to user only"
82681+ depends on GRKERNSEC_PROC
82682+ help
82683+ If you say Y here, non-root users will only be able to view their own
82684+ processes, and restricts them from viewing network-related information,
82685+ and viewing kernel symbol and module information.
82686+
82687+config GRKERNSEC_PROC_USERGROUP
82688+ bool "Allow special group"
82689+ default y if GRKERNSEC_CONFIG_AUTO
82690+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
82691+ help
82692+ If you say Y here, you will be able to select a group that will be
82693+ able to view all processes and network-related information. If you've
82694+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
82695+ remain hidden. This option is useful if you want to run identd as
82696+ a non-root user. The group you select may also be chosen at boot time
82697+ via "grsec_proc_gid=" on the kernel commandline.
82698+
82699+config GRKERNSEC_PROC_GID
82700+ int "GID for special group"
82701+ depends on GRKERNSEC_PROC_USERGROUP
82702+ default 1001
82703+
82704+config GRKERNSEC_PROC_ADD
82705+ bool "Additional restrictions"
82706+ default y if GRKERNSEC_CONFIG_AUTO
82707+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
82708+ help
82709+ If you say Y here, additional restrictions will be placed on
82710+ /proc that keep normal users from viewing device information and
82711+ slabinfo information that could be useful for exploits.
82712+
82713+config GRKERNSEC_LINK
82714+ bool "Linking restrictions"
82715+ default y if GRKERNSEC_CONFIG_AUTO
82716+ help
82717+ If you say Y here, /tmp race exploits will be prevented, since users
82718+ will no longer be able to follow symlinks owned by other users in
82719+ world-writable +t directories (e.g. /tmp), unless the owner of the
82720+ symlink is the owner of the directory. users will also not be
82721+ able to hardlink to files they do not own. If the sysctl option is
82722+ enabled, a sysctl option with name "linking_restrictions" is created.
82723+
82724+config GRKERNSEC_SYMLINKOWN
82725+ bool "Kernel-enforced SymlinksIfOwnerMatch"
82726+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
82727+ help
82728+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
82729+ that prevents it from being used as a security feature. As Apache
82730+ verifies the symlink by performing a stat() against the target of
82731+ the symlink before it is followed, an attacker can setup a symlink
82732+ to point to a same-owned file, then replace the symlink with one
82733+ that targets another user's file just after Apache "validates" the
82734+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
82735+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
82736+ will be in place for the group you specify. If the sysctl option
82737+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
82738+ created.
82739+
82740+config GRKERNSEC_SYMLINKOWN_GID
82741+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
82742+ depends on GRKERNSEC_SYMLINKOWN
82743+ default 1006
82744+ help
82745+ Setting this GID determines what group kernel-enforced
82746+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
82747+ is enabled, a sysctl option with name "symlinkown_gid" is created.
82748+
82749+config GRKERNSEC_FIFO
82750+ bool "FIFO restrictions"
82751+ default y if GRKERNSEC_CONFIG_AUTO
82752+ help
82753+ If you say Y here, users will not be able to write to FIFOs they don't
82754+ own in world-writable +t directories (e.g. /tmp), unless the owner of
82755+ the FIFO is the same owner of the directory it's held in. If the sysctl
82756+ option is enabled, a sysctl option with name "fifo_restrictions" is
82757+ created.
82758+
82759+config GRKERNSEC_SYSFS_RESTRICT
82760+ bool "Sysfs/debugfs restriction"
82761+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82762+ depends on SYSFS
82763+ help
82764+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
82765+ any filesystem normally mounted under it (e.g. debugfs) will be
82766+ mostly accessible only by root. These filesystems generally provide access
82767+ to hardware and debug information that isn't appropriate for unprivileged
82768+ users of the system. Sysfs and debugfs have also become a large source
82769+ of new vulnerabilities, ranging from infoleaks to local compromise.
82770+ There has been very little oversight with an eye toward security involved
82771+ in adding new exporters of information to these filesystems, so their
82772+ use is discouraged.
82773+ For reasons of compatibility, a few directories have been whitelisted
82774+ for access by non-root users:
82775+ /sys/fs/selinux
82776+ /sys/fs/fuse
82777+ /sys/devices/system/cpu
82778+
82779+config GRKERNSEC_ROFS
82780+ bool "Runtime read-only mount protection"
82781+ depends on SYSCTL
82782+ help
82783+ If you say Y here, a sysctl option with name "romount_protect" will
82784+ be created. By setting this option to 1 at runtime, filesystems
82785+ will be protected in the following ways:
82786+ * No new writable mounts will be allowed
82787+ * Existing read-only mounts won't be able to be remounted read/write
82788+ * Write operations will be denied on all block devices
82789+ This option acts independently of grsec_lock: once it is set to 1,
82790+ it cannot be turned off. Therefore, please be mindful of the resulting
82791+ behavior if this option is enabled in an init script on a read-only
82792+ filesystem.
82793+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
82794+ and GRKERNSEC_IO should be enabled and module loading disabled via
82795+ config or at runtime.
82796+ This feature is mainly intended for secure embedded systems.
82797+
82798+
82799+config GRKERNSEC_DEVICE_SIDECHANNEL
82800+ bool "Eliminate stat/notify-based device sidechannels"
82801+ default y if GRKERNSEC_CONFIG_AUTO
82802+ help
82803+ If you say Y here, timing analyses on block or character
82804+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
82805+ will be thwarted for unprivileged users. If a process without
82806+ CAP_MKNOD stats such a device, the last access and last modify times
82807+ will match the device's create time. No access or modify events
82808+ will be triggered through inotify/dnotify/fanotify for such devices.
82809+ This feature will prevent attacks that may at a minimum
82810+ allow an attacker to determine the administrator's password length.
82811+
82812+config GRKERNSEC_CHROOT
82813+ bool "Chroot jail restrictions"
82814+ default y if GRKERNSEC_CONFIG_AUTO
82815+ help
82816+ If you say Y here, you will be able to choose several options that will
82817+ make breaking out of a chrooted jail much more difficult. If you
82818+ encounter no software incompatibilities with the following options, it
82819+ is recommended that you enable each one.
82820+
82821+ Note that the chroot restrictions are not intended to apply to "chroots"
82822+ to directories that are simple bind mounts of the global root filesystem.
82823+ For several other reasons, a user shouldn't expect any significant
82824+ security by performing such a chroot.
82825+
82826+config GRKERNSEC_CHROOT_MOUNT
82827+ bool "Deny mounts"
82828+ default y if GRKERNSEC_CONFIG_AUTO
82829+ depends on GRKERNSEC_CHROOT
82830+ help
82831+ If you say Y here, processes inside a chroot will not be able to
82832+ mount or remount filesystems. If the sysctl option is enabled, a
82833+ sysctl option with name "chroot_deny_mount" is created.
82834+
82835+config GRKERNSEC_CHROOT_DOUBLE
82836+ bool "Deny double-chroots"
82837+ default y if GRKERNSEC_CONFIG_AUTO
82838+ depends on GRKERNSEC_CHROOT
82839+ help
82840+ If you say Y here, processes inside a chroot will not be able to chroot
82841+ again outside the chroot. This is a widely used method of breaking
82842+ out of a chroot jail and should not be allowed. If the sysctl
82843+ option is enabled, a sysctl option with name
82844+ "chroot_deny_chroot" is created.
82845+
82846+config GRKERNSEC_CHROOT_PIVOT
82847+ bool "Deny pivot_root in chroot"
82848+ default y if GRKERNSEC_CONFIG_AUTO
82849+ depends on GRKERNSEC_CHROOT
82850+ help
82851+ If you say Y here, processes inside a chroot will not be able to use
82852+ a function called pivot_root() that was introduced in Linux 2.3.41. It
82853+ works similar to chroot in that it changes the root filesystem. This
82854+ function could be misused in a chrooted process to attempt to break out
82855+ of the chroot, and therefore should not be allowed. If the sysctl
82856+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
82857+ created.
82858+
82859+config GRKERNSEC_CHROOT_CHDIR
82860+ bool "Enforce chdir(\"/\") on all chroots"
82861+ default y if GRKERNSEC_CONFIG_AUTO
82862+ depends on GRKERNSEC_CHROOT
82863+ help
82864+ If you say Y here, the current working directory of all newly-chrooted
82865+ applications will be set to the the root directory of the chroot.
82866+ The man page on chroot(2) states:
82867+ Note that this call does not change the current working
82868+ directory, so that `.' can be outside the tree rooted at
82869+ `/'. In particular, the super-user can escape from a
82870+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
82871+
82872+ It is recommended that you say Y here, since it's not known to break
82873+ any software. If the sysctl option is enabled, a sysctl option with
82874+ name "chroot_enforce_chdir" is created.
82875+
82876+config GRKERNSEC_CHROOT_CHMOD
82877+ bool "Deny (f)chmod +s"
82878+ default y if GRKERNSEC_CONFIG_AUTO
82879+ depends on GRKERNSEC_CHROOT
82880+ help
82881+ If you say Y here, processes inside a chroot will not be able to chmod
82882+ or fchmod files to make them have suid or sgid bits. This protects
82883+ against another published method of breaking a chroot. If the sysctl
82884+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
82885+ created.
82886+
82887+config GRKERNSEC_CHROOT_FCHDIR
82888+ bool "Deny fchdir and fhandle out of chroot"
82889+ default y if GRKERNSEC_CONFIG_AUTO
82890+ depends on GRKERNSEC_CHROOT
82891+ help
82892+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
82893+ to a file descriptor of the chrooting process that points to a directory
82894+ outside the filesystem will be stopped. Additionally, this option prevents
82895+ use of the recently-created syscall for opening files by a guessable "file
82896+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
82897+ with name "chroot_deny_fchdir" is created.
82898+
82899+config GRKERNSEC_CHROOT_MKNOD
82900+ bool "Deny mknod"
82901+ default y if GRKERNSEC_CONFIG_AUTO
82902+ depends on GRKERNSEC_CHROOT
82903+ help
82904+ If you say Y here, processes inside a chroot will not be allowed to
82905+ mknod. The problem with using mknod inside a chroot is that it
82906+ would allow an attacker to create a device entry that is the same
82907+ as one on the physical root of your system, which could range from
82908+ anything from the console device to a device for your harddrive (which
82909+ they could then use to wipe the drive or steal data). It is recommended
82910+ that you say Y here, unless you run into software incompatibilities.
82911+ If the sysctl option is enabled, a sysctl option with name
82912+ "chroot_deny_mknod" is created.
82913+
82914+config GRKERNSEC_CHROOT_SHMAT
82915+ bool "Deny shmat() out of chroot"
82916+ default y if GRKERNSEC_CONFIG_AUTO
82917+ depends on GRKERNSEC_CHROOT
82918+ help
82919+ If you say Y here, processes inside a chroot will not be able to attach
82920+ to shared memory segments that were created outside of the chroot jail.
82921+ It is recommended that you say Y here. If the sysctl option is enabled,
82922+ a sysctl option with name "chroot_deny_shmat" is created.
82923+
82924+config GRKERNSEC_CHROOT_UNIX
82925+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
82926+ default y if GRKERNSEC_CONFIG_AUTO
82927+ depends on GRKERNSEC_CHROOT
82928+ help
82929+ If you say Y here, processes inside a chroot will not be able to
82930+ connect to abstract (meaning not belonging to a filesystem) Unix
82931+ domain sockets that were bound outside of a chroot. It is recommended
82932+ that you say Y here. If the sysctl option is enabled, a sysctl option
82933+ with name "chroot_deny_unix" is created.
82934+
82935+config GRKERNSEC_CHROOT_FINDTASK
82936+ bool "Protect outside processes"
82937+ default y if GRKERNSEC_CONFIG_AUTO
82938+ depends on GRKERNSEC_CHROOT
82939+ help
82940+ If you say Y here, processes inside a chroot will not be able to
82941+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
82942+ getsid, or view any process outside of the chroot. If the sysctl
82943+ option is enabled, a sysctl option with name "chroot_findtask" is
82944+ created.
82945+
82946+config GRKERNSEC_CHROOT_NICE
82947+ bool "Restrict priority changes"
82948+ default y if GRKERNSEC_CONFIG_AUTO
82949+ depends on GRKERNSEC_CHROOT
82950+ help
82951+ If you say Y here, processes inside a chroot will not be able to raise
82952+ the priority of processes in the chroot, or alter the priority of
82953+ processes outside the chroot. This provides more security than simply
82954+ removing CAP_SYS_NICE from the process' capability set. If the
82955+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
82956+ is created.
82957+
82958+config GRKERNSEC_CHROOT_SYSCTL
82959+ bool "Deny sysctl writes"
82960+ default y if GRKERNSEC_CONFIG_AUTO
82961+ depends on GRKERNSEC_CHROOT
82962+ help
82963+ If you say Y here, an attacker in a chroot will not be able to
82964+ write to sysctl entries, either by sysctl(2) or through a /proc
82965+ interface. It is strongly recommended that you say Y here. If the
82966+ sysctl option is enabled, a sysctl option with name
82967+ "chroot_deny_sysctl" is created.
82968+
82969+config GRKERNSEC_CHROOT_RENAME
82970+ bool "Deny bad renames"
82971+ default y if GRKERNSEC_CONFIG_AUTO
82972+ depends on GRKERNSEC_CHROOT
82973+ help
82974+ If you say Y here, an attacker in a chroot will not be able to
82975+ abuse the ability to create double chroots to break out of the
82976+ chroot by exploiting a race condition between a rename of a directory
82977+ within a chroot against an open of a symlink with relative path
82978+ components. This feature will likewise prevent an accomplice outside
82979+ a chroot from enabling a user inside the chroot to break out and make
82980+ use of their credentials on the global filesystem. Enabling this
82981+ feature is essential to prevent root users from breaking out of a
82982+ chroot. If the sysctl option is enabled, a sysctl option with name
82983+ "chroot_deny_bad_rename" is created.
82984+
82985+config GRKERNSEC_CHROOT_CAPS
82986+ bool "Capability restrictions"
82987+ default y if GRKERNSEC_CONFIG_AUTO
82988+ depends on GRKERNSEC_CHROOT
82989+ help
82990+ If you say Y here, the capabilities on all processes within a
82991+ chroot jail will be lowered to stop module insertion, raw i/o,
82992+ system and net admin tasks, rebooting the system, modifying immutable
82993+ files, modifying IPC owned by another, and changing the system time.
82994+ This is left an option because it can break some apps. Disable this
82995+ if your chrooted apps are having problems performing those kinds of
82996+ tasks. If the sysctl option is enabled, a sysctl option with
82997+ name "chroot_caps" is created.
82998+
82999+config GRKERNSEC_CHROOT_INITRD
83000+ bool "Exempt initrd tasks from restrictions"
83001+ default y if GRKERNSEC_CONFIG_AUTO
83002+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
83003+ help
83004+ If you say Y here, tasks started prior to init will be exempted from
83005+ grsecurity's chroot restrictions. This option is mainly meant to
83006+ resolve Plymouth's performing privileged operations unnecessarily
83007+ in a chroot.
83008+
83009+endmenu
83010+menu "Kernel Auditing"
83011+depends on GRKERNSEC
83012+
83013+config GRKERNSEC_AUDIT_GROUP
83014+ bool "Single group for auditing"
83015+ help
83016+ If you say Y here, the exec and chdir logging features will only operate
83017+ on a group you specify. This option is recommended if you only want to
83018+ watch certain users instead of having a large amount of logs from the
83019+ entire system. If the sysctl option is enabled, a sysctl option with
83020+ name "audit_group" is created.
83021+
83022+config GRKERNSEC_AUDIT_GID
83023+ int "GID for auditing"
83024+ depends on GRKERNSEC_AUDIT_GROUP
83025+ default 1007
83026+
83027+config GRKERNSEC_EXECLOG
83028+ bool "Exec logging"
83029+ help
83030+ If you say Y here, all execve() calls will be logged (since the
83031+ other exec*() calls are frontends to execve(), all execution
83032+ will be logged). Useful for shell-servers that like to keep track
83033+ of their users. If the sysctl option is enabled, a sysctl option with
83034+ name "exec_logging" is created.
83035+ WARNING: This option when enabled will produce a LOT of logs, especially
83036+ on an active system.
83037+
83038+config GRKERNSEC_RESLOG
83039+ bool "Resource logging"
83040+ default y if GRKERNSEC_CONFIG_AUTO
83041+ help
83042+ If you say Y here, all attempts to overstep resource limits will
83043+ be logged with the resource name, the requested size, and the current
83044+ limit. It is highly recommended that you say Y here. If the sysctl
83045+ option is enabled, a sysctl option with name "resource_logging" is
83046+ created. If the RBAC system is enabled, the sysctl value is ignored.
83047+
83048+config GRKERNSEC_CHROOT_EXECLOG
83049+ bool "Log execs within chroot"
83050+ help
83051+ If you say Y here, all executions inside a chroot jail will be logged
83052+ to syslog. This can cause a large amount of logs if certain
83053+ applications (eg. djb's daemontools) are installed on the system, and
83054+ is therefore left as an option. If the sysctl option is enabled, a
83055+ sysctl option with name "chroot_execlog" is created.
83056+
83057+config GRKERNSEC_AUDIT_PTRACE
83058+ bool "Ptrace logging"
83059+ help
83060+ If you say Y here, all attempts to attach to a process via ptrace
83061+ will be logged. If the sysctl option is enabled, a sysctl option
83062+ with name "audit_ptrace" is created.
83063+
83064+config GRKERNSEC_AUDIT_CHDIR
83065+ bool "Chdir logging"
83066+ help
83067+ If you say Y here, all chdir() calls will be logged. If the sysctl
83068+ option is enabled, a sysctl option with name "audit_chdir" is created.
83069+
83070+config GRKERNSEC_AUDIT_MOUNT
83071+ bool "(Un)Mount logging"
83072+ help
83073+ If you say Y here, all mounts and unmounts will be logged. If the
83074+ sysctl option is enabled, a sysctl option with name "audit_mount" is
83075+ created.
83076+
83077+config GRKERNSEC_SIGNAL
83078+ bool "Signal logging"
83079+ default y if GRKERNSEC_CONFIG_AUTO
83080+ help
83081+ If you say Y here, certain important signals will be logged, such as
83082+ SIGSEGV, which will as a result inform you of when a error in a program
83083+ occurred, which in some cases could mean a possible exploit attempt.
83084+ If the sysctl option is enabled, a sysctl option with name
83085+ "signal_logging" is created.
83086+
83087+config GRKERNSEC_FORKFAIL
83088+ bool "Fork failure logging"
83089+ help
83090+ If you say Y here, all failed fork() attempts will be logged.
83091+ This could suggest a fork bomb, or someone attempting to overstep
83092+ their process limit. If the sysctl option is enabled, a sysctl option
83093+ with name "forkfail_logging" is created.
83094+
83095+config GRKERNSEC_TIME
83096+ bool "Time change logging"
83097+ default y if GRKERNSEC_CONFIG_AUTO
83098+ help
83099+ If you say Y here, any changes of the system clock will be logged.
83100+ If the sysctl option is enabled, a sysctl option with name
83101+ "timechange_logging" is created.
83102+
83103+config GRKERNSEC_PROC_IPADDR
83104+ bool "/proc/<pid>/ipaddr support"
83105+ default y if GRKERNSEC_CONFIG_AUTO
83106+ help
83107+ If you say Y here, a new entry will be added to each /proc/<pid>
83108+ directory that contains the IP address of the person using the task.
83109+ The IP is carried across local TCP and AF_UNIX stream sockets.
83110+ This information can be useful for IDS/IPSes to perform remote response
83111+ to a local attack. The entry is readable by only the owner of the
83112+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
83113+ the RBAC system), and thus does not create privacy concerns.
83114+
83115+config GRKERNSEC_RWXMAP_LOG
83116+ bool 'Denied RWX mmap/mprotect logging'
83117+ default y if GRKERNSEC_CONFIG_AUTO
83118+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
83119+ help
83120+ If you say Y here, calls to mmap() and mprotect() with explicit
83121+ usage of PROT_WRITE and PROT_EXEC together will be logged when
83122+ denied by the PAX_MPROTECT feature. This feature will also
83123+ log other problematic scenarios that can occur when PAX_MPROTECT
83124+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
83125+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
83126+ is created.
83127+
83128+endmenu
83129+
83130+menu "Executable Protections"
83131+depends on GRKERNSEC
83132+
83133+config GRKERNSEC_DMESG
83134+ bool "Dmesg(8) restriction"
83135+ default y if GRKERNSEC_CONFIG_AUTO
83136+ help
83137+ If you say Y here, non-root users will not be able to use dmesg(8)
83138+ to view the contents of the kernel's circular log buffer.
83139+ The kernel's log buffer often contains kernel addresses and other
83140+ identifying information useful to an attacker in fingerprinting a
83141+ system for a targeted exploit.
83142+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
83143+ created.
83144+
83145+config GRKERNSEC_HARDEN_PTRACE
83146+ bool "Deter ptrace-based process snooping"
83147+ default y if GRKERNSEC_CONFIG_AUTO
83148+ help
83149+ If you say Y here, TTY sniffers and other malicious monitoring
83150+ programs implemented through ptrace will be defeated. If you
83151+ have been using the RBAC system, this option has already been
83152+ enabled for several years for all users, with the ability to make
83153+ fine-grained exceptions.
83154+
83155+ This option only affects the ability of non-root users to ptrace
83156+ processes that are not a descendent of the ptracing process.
83157+ This means that strace ./binary and gdb ./binary will still work,
83158+ but attaching to arbitrary processes will not. If the sysctl
83159+ option is enabled, a sysctl option with name "harden_ptrace" is
83160+ created.
83161+
83162+config GRKERNSEC_PTRACE_READEXEC
83163+ bool "Require read access to ptrace sensitive binaries"
83164+ default y if GRKERNSEC_CONFIG_AUTO
83165+ help
83166+ If you say Y here, unprivileged users will not be able to ptrace unreadable
83167+ binaries. This option is useful in environments that
83168+ remove the read bits (e.g. file mode 4711) from suid binaries to
83169+ prevent infoleaking of their contents. This option adds
83170+ consistency to the use of that file mode, as the binary could normally
83171+ be read out when run without privileges while ptracing.
83172+
83173+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
83174+ is created.
83175+
83176+config GRKERNSEC_SETXID
83177+ bool "Enforce consistent multithreaded privileges"
83178+ default y if GRKERNSEC_CONFIG_AUTO
83179+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
83180+ help
83181+ If you say Y here, a change from a root uid to a non-root uid
83182+ in a multithreaded application will cause the resulting uids,
83183+ gids, supplementary groups, and capabilities in that thread
83184+ to be propagated to the other threads of the process. In most
83185+ cases this is unnecessary, as glibc will emulate this behavior
83186+ on behalf of the application. Other libcs do not act in the
83187+ same way, allowing the other threads of the process to continue
83188+ running with root privileges. If the sysctl option is enabled,
83189+ a sysctl option with name "consistent_setxid" is created.
83190+
83191+config GRKERNSEC_HARDEN_IPC
83192+ bool "Disallow access to overly-permissive IPC objects"
83193+ default y if GRKERNSEC_CONFIG_AUTO
83194+ depends on SYSVIPC
83195+ help
83196+ If you say Y here, access to overly-permissive IPC objects (shared
83197+ memory, message queues, and semaphores) will be denied for processes
83198+ given the following criteria beyond normal permission checks:
83199+ 1) If the IPC object is world-accessible and the euid doesn't match
83200+ that of the creator or current uid for the IPC object
83201+ 2) If the IPC object is group-accessible and the egid doesn't
83202+ match that of the creator or current gid for the IPC object
83203+ It's a common error to grant too much permission to these objects,
83204+ with impact ranging from denial of service and information leaking to
83205+ privilege escalation. This feature was developed in response to
83206+ research by Tim Brown:
83207+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
83208+ who found hundreds of such insecure usages. Processes with
83209+ CAP_IPC_OWNER are still permitted to access these IPC objects.
83210+ If the sysctl option is enabled, a sysctl option with name
83211+ "harden_ipc" is created.
83212+
83213+config GRKERNSEC_TPE
83214+ bool "Trusted Path Execution (TPE)"
83215+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
83216+ help
83217+ If you say Y here, you will be able to choose a gid to add to the
83218+ supplementary groups of users you want to mark as "untrusted."
83219+ These users will not be able to execute any files that are not in
83220+ root-owned directories writable only by root. If the sysctl option
83221+ is enabled, a sysctl option with name "tpe" is created.
83222+
83223+config GRKERNSEC_TPE_ALL
83224+ bool "Partially restrict all non-root users"
83225+ depends on GRKERNSEC_TPE
83226+ help
83227+ If you say Y here, all non-root users will be covered under
83228+ a weaker TPE restriction. This is separate from, and in addition to,
83229+ the main TPE options that you have selected elsewhere. Thus, if a
83230+ "trusted" GID is chosen, this restriction applies to even that GID.
83231+ Under this restriction, all non-root users will only be allowed to
83232+ execute files in directories they own that are not group or
83233+ world-writable, or in directories owned by root and writable only by
83234+ root. If the sysctl option is enabled, a sysctl option with name
83235+ "tpe_restrict_all" is created.
83236+
83237+config GRKERNSEC_TPE_INVERT
83238+ bool "Invert GID option"
83239+ depends on GRKERNSEC_TPE
83240+ help
83241+ If you say Y here, the group you specify in the TPE configuration will
83242+ decide what group TPE restrictions will be *disabled* for. This
83243+ option is useful if you want TPE restrictions to be applied to most
83244+ users on the system. If the sysctl option is enabled, a sysctl option
83245+ with name "tpe_invert" is created. Unlike other sysctl options, this
83246+ entry will default to on for backward-compatibility.
83247+
83248+config GRKERNSEC_TPE_GID
83249+ int
83250+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
83251+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
83252+
83253+config GRKERNSEC_TPE_UNTRUSTED_GID
83254+ int "GID for TPE-untrusted users"
83255+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
83256+ default 1005
83257+ help
83258+ Setting this GID determines what group TPE restrictions will be
83259+ *enabled* for. If the sysctl option is enabled, a sysctl option
83260+ with name "tpe_gid" is created.
83261+
83262+config GRKERNSEC_TPE_TRUSTED_GID
83263+ int "GID for TPE-trusted users"
83264+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
83265+ default 1005
83266+ help
83267+ Setting this GID determines what group TPE restrictions will be
83268+ *disabled* for. If the sysctl option is enabled, a sysctl option
83269+ with name "tpe_gid" is created.
83270+
83271+endmenu
83272+menu "Network Protections"
83273+depends on GRKERNSEC
83274+
83275+config GRKERNSEC_BLACKHOLE
83276+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
83277+ default y if GRKERNSEC_CONFIG_AUTO
83278+ depends on NET
83279+ help
83280+ If you say Y here, neither TCP resets nor ICMP
83281+ destination-unreachable packets will be sent in response to packets
83282+ sent to ports for which no associated listening process exists.
83283+ It will also prevent the sending of ICMP protocol unreachable packets
83284+ in response to packets with unknown protocols.
83285+ This feature supports both IPV4 and IPV6 and exempts the
83286+ loopback interface from blackholing. Enabling this feature
83287+ makes a host more resilient to DoS attacks and reduces network
83288+ visibility against scanners.
83289+
83290+ The blackhole feature as-implemented is equivalent to the FreeBSD
83291+ blackhole feature, as it prevents RST responses to all packets, not
83292+ just SYNs. Under most application behavior this causes no
83293+ problems, but applications (like haproxy) may not close certain
83294+ connections in a way that cleanly terminates them on the remote
83295+ end, leaving the remote host in LAST_ACK state. Because of this
83296+ side-effect and to prevent intentional LAST_ACK DoSes, this
83297+ feature also adds automatic mitigation against such attacks.
83298+ The mitigation drastically reduces the amount of time a socket
83299+ can spend in LAST_ACK state. If you're using haproxy and not
83300+ all servers it connects to have this option enabled, consider
83301+ disabling this feature on the haproxy host.
83302+
83303+ If the sysctl option is enabled, two sysctl options with names
83304+ "ip_blackhole" and "lastack_retries" will be created.
83305+ While "ip_blackhole" takes the standard zero/non-zero on/off
83306+ toggle, "lastack_retries" uses the same kinds of values as
83307+ "tcp_retries1" and "tcp_retries2". The default value of 4
83308+ prevents a socket from lasting more than 45 seconds in LAST_ACK
83309+ state.
83310+
83311+config GRKERNSEC_NO_SIMULT_CONNECT
83312+ bool "Disable TCP Simultaneous Connect"
83313+ default y if GRKERNSEC_CONFIG_AUTO
83314+ depends on NET
83315+ help
83316+ If you say Y here, a feature by Willy Tarreau will be enabled that
83317+ removes a weakness in Linux's strict implementation of TCP that
83318+ allows two clients to connect to each other without either entering
83319+ a listening state. The weakness allows an attacker to easily prevent
83320+ a client from connecting to a known server provided the source port
83321+ for the connection is guessed correctly.
83322+
83323+ As the weakness could be used to prevent an antivirus or IPS from
83324+ fetching updates, or prevent an SSL gateway from fetching a CRL,
83325+ it should be eliminated by enabling this option. Though Linux is
83326+ one of few operating systems supporting simultaneous connect, it
83327+ has no legitimate use in practice and is rarely supported by firewalls.
83328+
83329+config GRKERNSEC_SOCKET
83330+ bool "Socket restrictions"
83331+ depends on NET
83332+ help
83333+ If you say Y here, you will be able to choose from several options.
83334+ If you assign a GID on your system and add it to the supplementary
83335+ groups of users you want to restrict socket access to, this patch
83336+ will perform up to three things, based on the option(s) you choose.
83337+
83338+config GRKERNSEC_SOCKET_ALL
83339+ bool "Deny any sockets to group"
83340+ depends on GRKERNSEC_SOCKET
83341+ help
83342+ If you say Y here, you will be able to choose a GID of whose users will
83343+ be unable to connect to other hosts from your machine or run server
83344+ applications from your machine. If the sysctl option is enabled, a
83345+ sysctl option with name "socket_all" is created.
83346+
83347+config GRKERNSEC_SOCKET_ALL_GID
83348+ int "GID to deny all sockets for"
83349+ depends on GRKERNSEC_SOCKET_ALL
83350+ default 1004
83351+ help
83352+ Here you can choose the GID to disable socket access for. Remember to
83353+ add the users you want socket access disabled for to the GID
83354+ specified here. If the sysctl option is enabled, a sysctl option
83355+ with name "socket_all_gid" is created.
83356+
83357+config GRKERNSEC_SOCKET_CLIENT
83358+ bool "Deny client sockets to group"
83359+ depends on GRKERNSEC_SOCKET
83360+ help
83361+ If you say Y here, you will be able to choose a GID of whose users will
83362+ be unable to connect to other hosts from your machine, but will be
83363+ able to run servers. If this option is enabled, all users in the group
83364+ you specify will have to use passive mode when initiating ftp transfers
83365+ from the shell on your machine. If the sysctl option is enabled, a
83366+ sysctl option with name "socket_client" is created.
83367+
83368+config GRKERNSEC_SOCKET_CLIENT_GID
83369+ int "GID to deny client sockets for"
83370+ depends on GRKERNSEC_SOCKET_CLIENT
83371+ default 1003
83372+ help
83373+ Here you can choose the GID to disable client socket access for.
83374+ Remember to add the users you want client socket access disabled for to
83375+ the GID specified here. If the sysctl option is enabled, a sysctl
83376+ option with name "socket_client_gid" is created.
83377+
83378+config GRKERNSEC_SOCKET_SERVER
83379+ bool "Deny server sockets to group"
83380+ depends on GRKERNSEC_SOCKET
83381+ help
83382+ If you say Y here, you will be able to choose a GID of whose users will
83383+ be unable to run server applications from your machine. If the sysctl
83384+ option is enabled, a sysctl option with name "socket_server" is created.
83385+
83386+config GRKERNSEC_SOCKET_SERVER_GID
83387+ int "GID to deny server sockets for"
83388+ depends on GRKERNSEC_SOCKET_SERVER
83389+ default 1002
83390+ help
83391+ Here you can choose the GID to disable server socket access for.
83392+ Remember to add the users you want server socket access disabled for to
83393+ the GID specified here. If the sysctl option is enabled, a sysctl
83394+ option with name "socket_server_gid" is created.
83395+
83396+endmenu
83397+
83398+menu "Physical Protections"
83399+depends on GRKERNSEC
83400+
83401+config GRKERNSEC_DENYUSB
83402+ bool "Deny new USB connections after toggle"
83403+ default y if GRKERNSEC_CONFIG_AUTO
83404+ depends on SYSCTL && USB_SUPPORT
83405+ help
83406+ If you say Y here, a new sysctl option with name "deny_new_usb"
83407+ will be created. Setting its value to 1 will prevent any new
83408+ USB devices from being recognized by the OS. Any attempted USB
83409+ device insertion will be logged. This option is intended to be
83410+ used against custom USB devices designed to exploit vulnerabilities
83411+ in various USB device drivers.
83412+
83413+ For greatest effectiveness, this sysctl should be set after any
83414+ relevant init scripts. This option is safe to enable in distros
83415+ as each user can choose whether or not to toggle the sysctl.
83416+
83417+config GRKERNSEC_DENYUSB_FORCE
83418+ bool "Reject all USB devices not connected at boot"
83419+ select USB
83420+ depends on GRKERNSEC_DENYUSB
83421+ help
83422+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
83423+ that doesn't involve a sysctl entry. This option should only be
83424+ enabled if you're sure you want to deny all new USB connections
83425+ at runtime and don't want to modify init scripts. This should not
83426+ be enabled by distros. It forces the core USB code to be built
83427+ into the kernel image so that all devices connected at boot time
83428+ can be recognized and new USB device connections can be prevented
83429+ prior to init running.
83430+
83431+endmenu
83432+
83433+menu "Sysctl Support"
83434+depends on GRKERNSEC && SYSCTL
83435+
83436+config GRKERNSEC_SYSCTL
83437+ bool "Sysctl support"
83438+ default y if GRKERNSEC_CONFIG_AUTO
83439+ help
83440+ If you say Y here, you will be able to change the options that
83441+ grsecurity runs with at bootup, without having to recompile your
83442+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
83443+ to enable (1) or disable (0) various features. All the sysctl entries
83444+ are mutable until the "grsec_lock" entry is set to a non-zero value.
83445+ All features enabled in the kernel configuration are disabled at boot
83446+ if you do not say Y to the "Turn on features by default" option.
83447+ All options should be set at startup, and the grsec_lock entry should
83448+ be set to a non-zero value after all the options are set.
83449+ *THIS IS EXTREMELY IMPORTANT*
83450+
83451+config GRKERNSEC_SYSCTL_DISTRO
83452+ bool "Extra sysctl support for distro makers (READ HELP)"
83453+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
83454+ help
83455+ If you say Y here, additional sysctl options will be created
83456+ for features that affect processes running as root. Therefore,
83457+ it is critical when using this option that the grsec_lock entry be
83458+ enabled after boot. Only distros with prebuilt kernel packages
83459+ with this option enabled that can ensure grsec_lock is enabled
83460+ after boot should use this option.
83461+ *Failure to set grsec_lock after boot makes all grsec features
83462+ this option covers useless*
83463+
83464+ Currently this option creates the following sysctl entries:
83465+ "Disable Privileged I/O": "disable_priv_io"
83466+
83467+config GRKERNSEC_SYSCTL_ON
83468+ bool "Turn on features by default"
83469+ default y if GRKERNSEC_CONFIG_AUTO
83470+ depends on GRKERNSEC_SYSCTL
83471+ help
83472+ If you say Y here, instead of having all features enabled in the
83473+ kernel configuration disabled at boot time, the features will be
83474+ enabled at boot time. It is recommended you say Y here unless
83475+ there is some reason you would want all sysctl-tunable features to
83476+ be disabled by default. As mentioned elsewhere, it is important
83477+ to enable the grsec_lock entry once you have finished modifying
83478+ the sysctl entries.
83479+
83480+endmenu
83481+menu "Logging Options"
83482+depends on GRKERNSEC
83483+
83484+config GRKERNSEC_FLOODTIME
83485+ int "Seconds in between log messages (minimum)"
83486+ default 10
83487+ help
83488+ This option allows you to enforce the number of seconds between
83489+ grsecurity log messages. The default should be suitable for most
83490+ people, however, if you choose to change it, choose a value small enough
83491+ to allow informative logs to be produced, but large enough to
83492+ prevent flooding.
83493+
83494+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
83495+ any rate limiting on grsecurity log messages.
83496+
83497+config GRKERNSEC_FLOODBURST
83498+ int "Number of messages in a burst (maximum)"
83499+ default 6
83500+ help
83501+ This option allows you to choose the maximum number of messages allowed
83502+ within the flood time interval you chose in a separate option. The
83503+ default should be suitable for most people, however if you find that
83504+ many of your logs are being interpreted as flooding, you may want to
83505+ raise this value.
83506+
83507+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
83508+ any rate limiting on grsecurity log messages.
83509+
83510+endmenu
83511diff --git a/grsecurity/Makefile b/grsecurity/Makefile
83512new file mode 100644
83513index 0000000..30ababb
83514--- /dev/null
83515+++ b/grsecurity/Makefile
83516@@ -0,0 +1,54 @@
83517+# grsecurity – access control and security hardening for Linux
83518+# All code in this directory and various hooks located throughout the Linux kernel are
83519+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
83520+# http://www.grsecurity.net spender@grsecurity.net
83521+#
83522+# This program is free software; you can redistribute it and/or
83523+# modify it under the terms of the GNU General Public License version 2
83524+# as published by the Free Software Foundation.
83525+#
83526+# This program is distributed in the hope that it will be useful,
83527+# but WITHOUT ANY WARRANTY; without even the implied warranty of
83528+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83529+# GNU General Public License for more details.
83530+#
83531+# You should have received a copy of the GNU General Public License
83532+# along with this program; if not, write to the Free Software
83533+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
83534+
83535+KBUILD_CFLAGS += -Werror
83536+
83537+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
83538+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
83539+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
83540+ grsec_usb.o grsec_ipc.o grsec_proc.o
83541+
83542+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
83543+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
83544+ gracl_learn.o grsec_log.o gracl_policy.o
83545+ifdef CONFIG_COMPAT
83546+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
83547+endif
83548+
83549+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
83550+
83551+ifdef CONFIG_NET
83552+obj-y += grsec_sock.o
83553+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
83554+endif
83555+
83556+ifndef CONFIG_GRKERNSEC
83557+obj-y += grsec_disabled.o
83558+endif
83559+
83560+ifdef CONFIG_GRKERNSEC_HIDESYM
83561+extra-y := grsec_hidesym.o
83562+$(obj)/grsec_hidesym.o:
83563+ @-chmod -f 500 /boot
83564+ @-chmod -f 500 /lib/modules
83565+ @-chmod -f 500 /lib64/modules
83566+ @-chmod -f 500 /lib32/modules
83567+ @-chmod -f 700 .
83568+ @-chmod -f 700 $(objtree)
83569+ @echo ' grsec: protected kernel image paths'
83570+endif
83571diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
83572new file mode 100644
83573index 0000000..7ad630a
83574--- /dev/null
83575+++ b/grsecurity/gracl.c
83576@@ -0,0 +1,2757 @@
83577+#include <linux/kernel.h>
83578+#include <linux/module.h>
83579+#include <linux/sched.h>
83580+#include <linux/mm.h>
83581+#include <linux/file.h>
83582+#include <linux/fs.h>
83583+#include <linux/namei.h>
83584+#include <linux/mount.h>
83585+#include <linux/tty.h>
83586+#include <linux/proc_fs.h>
83587+#include <linux/lglock.h>
83588+#include <linux/slab.h>
83589+#include <linux/vmalloc.h>
83590+#include <linux/types.h>
83591+#include <linux/sysctl.h>
83592+#include <linux/netdevice.h>
83593+#include <linux/ptrace.h>
83594+#include <linux/gracl.h>
83595+#include <linux/gralloc.h>
83596+#include <linux/security.h>
83597+#include <linux/grinternal.h>
83598+#include <linux/pid_namespace.h>
83599+#include <linux/stop_machine.h>
83600+#include <linux/fdtable.h>
83601+#include <linux/percpu.h>
83602+#include <linux/lglock.h>
83603+#include <linux/hugetlb.h>
83604+#include <linux/posix-timers.h>
83605+#include <linux/prefetch.h>
83606+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83607+#include <linux/magic.h>
83608+#include <linux/pagemap.h>
83609+#include "../fs/btrfs/async-thread.h"
83610+#include "../fs/btrfs/ctree.h"
83611+#include "../fs/btrfs/btrfs_inode.h"
83612+#endif
83613+#include "../fs/mount.h"
83614+
83615+#include <asm/uaccess.h>
83616+#include <asm/errno.h>
83617+#include <asm/mman.h>
83618+
83619+#define FOR_EACH_ROLE_START(role) \
83620+ role = running_polstate.role_list; \
83621+ while (role) {
83622+
83623+#define FOR_EACH_ROLE_END(role) \
83624+ role = role->prev; \
83625+ }
83626+
83627+extern struct path gr_real_root;
83628+
83629+static struct gr_policy_state running_polstate;
83630+struct gr_policy_state *polstate = &running_polstate;
83631+extern struct gr_alloc_state *current_alloc_state;
83632+
83633+extern char *gr_shared_page[4];
83634+DEFINE_RWLOCK(gr_inode_lock);
83635+
83636+static unsigned int gr_status __read_only = GR_STATUS_INIT;
83637+
83638+#ifdef CONFIG_NET
83639+extern struct vfsmount *sock_mnt;
83640+#endif
83641+
83642+extern struct vfsmount *pipe_mnt;
83643+extern struct vfsmount *shm_mnt;
83644+
83645+#ifdef CONFIG_HUGETLBFS
83646+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
83647+#endif
83648+
83649+extern u16 acl_sp_role_value;
83650+extern struct acl_object_label *fakefs_obj_rw;
83651+extern struct acl_object_label *fakefs_obj_rwx;
83652+
83653+int gr_acl_is_enabled(void)
83654+{
83655+ return (gr_status & GR_READY);
83656+}
83657+
83658+void gr_enable_rbac_system(void)
83659+{
83660+ pax_open_kernel();
83661+ gr_status |= GR_READY;
83662+ pax_close_kernel();
83663+}
83664+
83665+int gr_rbac_disable(void *unused)
83666+{
83667+ pax_open_kernel();
83668+ gr_status &= ~GR_READY;
83669+ pax_close_kernel();
83670+
83671+ return 0;
83672+}
83673+
83674+static inline dev_t __get_dev(const struct dentry *dentry)
83675+{
83676+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
83677+
83678+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83679+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83680+ return BTRFS_I(d_inode(ldentry))->root->anon_dev;
83681+ else
83682+#endif
83683+ return d_inode(ldentry)->i_sb->s_dev;
83684+}
83685+
83686+static inline u64 __get_ino(const struct dentry *dentry)
83687+{
83688+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
83689+
83690+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83691+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83692+ return btrfs_ino(d_inode(dentry));
83693+ else
83694+#endif
83695+ return d_inode(ldentry)->i_ino;
83696+}
83697+
83698+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
83699+{
83700+ return __get_dev(dentry);
83701+}
83702+
83703+u64 gr_get_ino_from_dentry(struct dentry *dentry)
83704+{
83705+ return __get_ino(dentry);
83706+}
83707+
83708+static char gr_task_roletype_to_char(struct task_struct *task)
83709+{
83710+ switch (task->role->roletype &
83711+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
83712+ GR_ROLE_SPECIAL)) {
83713+ case GR_ROLE_DEFAULT:
83714+ return 'D';
83715+ case GR_ROLE_USER:
83716+ return 'U';
83717+ case GR_ROLE_GROUP:
83718+ return 'G';
83719+ case GR_ROLE_SPECIAL:
83720+ return 'S';
83721+ }
83722+
83723+ return 'X';
83724+}
83725+
83726+char gr_roletype_to_char(void)
83727+{
83728+ return gr_task_roletype_to_char(current);
83729+}
83730+
83731+int
83732+gr_acl_tpe_check(void)
83733+{
83734+ if (unlikely(!(gr_status & GR_READY)))
83735+ return 0;
83736+ if (current->role->roletype & GR_ROLE_TPE)
83737+ return 1;
83738+ else
83739+ return 0;
83740+}
83741+
83742+int
83743+gr_handle_rawio(const struct inode *inode)
83744+{
83745+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
83746+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
83747+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
83748+ !capable(CAP_SYS_RAWIO))
83749+ return 1;
83750+#endif
83751+ return 0;
83752+}
83753+
83754+int
83755+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
83756+{
83757+ if (likely(lena != lenb))
83758+ return 0;
83759+
83760+ return !memcmp(a, b, lena);
83761+}
83762+
83763+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
83764+{
83765+ *buflen -= namelen;
83766+ if (*buflen < 0)
83767+ return -ENAMETOOLONG;
83768+ *buffer -= namelen;
83769+ memcpy(*buffer, str, namelen);
83770+ return 0;
83771+}
83772+
83773+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
83774+{
83775+ return prepend(buffer, buflen, name->name, name->len);
83776+}
83777+
83778+static int prepend_path(const struct path *path, struct path *root,
83779+ char **buffer, int *buflen)
83780+{
83781+ struct dentry *dentry = path->dentry;
83782+ struct vfsmount *vfsmnt = path->mnt;
83783+ struct mount *mnt = real_mount(vfsmnt);
83784+ bool slash = false;
83785+ int error = 0;
83786+
83787+ while (dentry != root->dentry || vfsmnt != root->mnt) {
83788+ struct dentry * parent;
83789+
83790+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
83791+ /* Global root? */
83792+ if (!mnt_has_parent(mnt)) {
83793+ goto out;
83794+ }
83795+ dentry = mnt->mnt_mountpoint;
83796+ mnt = mnt->mnt_parent;
83797+ vfsmnt = &mnt->mnt;
83798+ continue;
83799+ }
83800+ parent = dentry->d_parent;
83801+ prefetch(parent);
83802+ spin_lock(&dentry->d_lock);
83803+ error = prepend_name(buffer, buflen, &dentry->d_name);
83804+ spin_unlock(&dentry->d_lock);
83805+ if (!error)
83806+ error = prepend(buffer, buflen, "/", 1);
83807+ if (error)
83808+ break;
83809+
83810+ slash = true;
83811+ dentry = parent;
83812+ }
83813+
83814+out:
83815+ if (!error && !slash)
83816+ error = prepend(buffer, buflen, "/", 1);
83817+
83818+ return error;
83819+}
83820+
83821+/* this must be called with mount_lock and rename_lock held */
83822+
83823+static char *__our_d_path(const struct path *path, struct path *root,
83824+ char *buf, int buflen)
83825+{
83826+ char *res = buf + buflen;
83827+ int error;
83828+
83829+ prepend(&res, &buflen, "\0", 1);
83830+ error = prepend_path(path, root, &res, &buflen);
83831+ if (error)
83832+ return ERR_PTR(error);
83833+
83834+ return res;
83835+}
83836+
83837+static char *
83838+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
83839+{
83840+ char *retval;
83841+
83842+ retval = __our_d_path(path, root, buf, buflen);
83843+ if (unlikely(IS_ERR(retval)))
83844+ retval = strcpy(buf, "<path too long>");
83845+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
83846+ retval[1] = '\0';
83847+
83848+ return retval;
83849+}
83850+
83851+static char *
83852+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
83853+ char *buf, int buflen)
83854+{
83855+ struct path path;
83856+ char *res;
83857+
83858+ path.dentry = (struct dentry *)dentry;
83859+ path.mnt = (struct vfsmount *)vfsmnt;
83860+
83861+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
83862+ by the RBAC system */
83863+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
83864+
83865+ return res;
83866+}
83867+
83868+static char *
83869+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
83870+ char *buf, int buflen)
83871+{
83872+ char *res;
83873+ struct path path;
83874+ struct path root;
83875+ struct task_struct *reaper = init_pid_ns.child_reaper;
83876+
83877+ path.dentry = (struct dentry *)dentry;
83878+ path.mnt = (struct vfsmount *)vfsmnt;
83879+
83880+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
83881+ get_fs_root(reaper->fs, &root);
83882+
83883+ read_seqlock_excl(&mount_lock);
83884+ write_seqlock(&rename_lock);
83885+ res = gen_full_path(&path, &root, buf, buflen);
83886+ write_sequnlock(&rename_lock);
83887+ read_sequnlock_excl(&mount_lock);
83888+
83889+ path_put(&root);
83890+ return res;
83891+}
83892+
83893+char *
83894+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
83895+{
83896+ char *ret;
83897+ read_seqlock_excl(&mount_lock);
83898+ write_seqlock(&rename_lock);
83899+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
83900+ PAGE_SIZE);
83901+ write_sequnlock(&rename_lock);
83902+ read_sequnlock_excl(&mount_lock);
83903+ return ret;
83904+}
83905+
83906+static char *
83907+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
83908+{
83909+ char *ret;
83910+ char *buf;
83911+ int buflen;
83912+
83913+ read_seqlock_excl(&mount_lock);
83914+ write_seqlock(&rename_lock);
83915+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
83916+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
83917+ buflen = (int)(ret - buf);
83918+ if (buflen >= 5)
83919+ prepend(&ret, &buflen, "/proc", 5);
83920+ else
83921+ ret = strcpy(buf, "<path too long>");
83922+ write_sequnlock(&rename_lock);
83923+ read_sequnlock_excl(&mount_lock);
83924+ return ret;
83925+}
83926+
83927+char *
83928+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
83929+{
83930+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
83931+ PAGE_SIZE);
83932+}
83933+
83934+char *
83935+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
83936+{
83937+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
83938+ PAGE_SIZE);
83939+}
83940+
83941+char *
83942+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
83943+{
83944+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
83945+ PAGE_SIZE);
83946+}
83947+
83948+char *
83949+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
83950+{
83951+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
83952+ PAGE_SIZE);
83953+}
83954+
83955+char *
83956+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
83957+{
83958+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
83959+ PAGE_SIZE);
83960+}
83961+
83962+__u32
83963+to_gr_audit(const __u32 reqmode)
83964+{
83965+ /* masks off auditable permission flags, then shifts them to create
83966+ auditing flags, and adds the special case of append auditing if
83967+ we're requesting write */
83968+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
83969+}
83970+
83971+struct acl_role_label *
83972+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
83973+ const gid_t gid)
83974+{
83975+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
83976+ struct acl_role_label *match;
83977+ struct role_allowed_ip *ipp;
83978+ unsigned int x;
83979+ u32 curr_ip = task->signal->saved_ip;
83980+
83981+ match = state->acl_role_set.r_hash[index];
83982+
83983+ while (match) {
83984+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
83985+ for (x = 0; x < match->domain_child_num; x++) {
83986+ if (match->domain_children[x] == uid)
83987+ goto found;
83988+ }
83989+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
83990+ break;
83991+ match = match->next;
83992+ }
83993+found:
83994+ if (match == NULL) {
83995+ try_group:
83996+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
83997+ match = state->acl_role_set.r_hash[index];
83998+
83999+ while (match) {
84000+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
84001+ for (x = 0; x < match->domain_child_num; x++) {
84002+ if (match->domain_children[x] == gid)
84003+ goto found2;
84004+ }
84005+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
84006+ break;
84007+ match = match->next;
84008+ }
84009+found2:
84010+ if (match == NULL)
84011+ match = state->default_role;
84012+ if (match->allowed_ips == NULL)
84013+ return match;
84014+ else {
84015+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
84016+ if (likely
84017+ ((ntohl(curr_ip) & ipp->netmask) ==
84018+ (ntohl(ipp->addr) & ipp->netmask)))
84019+ return match;
84020+ }
84021+ match = state->default_role;
84022+ }
84023+ } else if (match->allowed_ips == NULL) {
84024+ return match;
84025+ } else {
84026+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
84027+ if (likely
84028+ ((ntohl(curr_ip) & ipp->netmask) ==
84029+ (ntohl(ipp->addr) & ipp->netmask)))
84030+ return match;
84031+ }
84032+ goto try_group;
84033+ }
84034+
84035+ return match;
84036+}
84037+
84038+static struct acl_role_label *
84039+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
84040+ const gid_t gid)
84041+{
84042+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
84043+}
84044+
84045+struct acl_subject_label *
84046+lookup_acl_subj_label(const u64 ino, const dev_t dev,
84047+ const struct acl_role_label *role)
84048+{
84049+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84050+ struct acl_subject_label *match;
84051+
84052+ match = role->subj_hash[index];
84053+
84054+ while (match && (match->inode != ino || match->device != dev ||
84055+ (match->mode & GR_DELETED))) {
84056+ match = match->next;
84057+ }
84058+
84059+ if (match && !(match->mode & GR_DELETED))
84060+ return match;
84061+ else
84062+ return NULL;
84063+}
84064+
84065+struct acl_subject_label *
84066+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
84067+ const struct acl_role_label *role)
84068+{
84069+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84070+ struct acl_subject_label *match;
84071+
84072+ match = role->subj_hash[index];
84073+
84074+ while (match && (match->inode != ino || match->device != dev ||
84075+ !(match->mode & GR_DELETED))) {
84076+ match = match->next;
84077+ }
84078+
84079+ if (match && (match->mode & GR_DELETED))
84080+ return match;
84081+ else
84082+ return NULL;
84083+}
84084+
84085+static struct acl_object_label *
84086+lookup_acl_obj_label(const u64 ino, const dev_t dev,
84087+ const struct acl_subject_label *subj)
84088+{
84089+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84090+ struct acl_object_label *match;
84091+
84092+ match = subj->obj_hash[index];
84093+
84094+ while (match && (match->inode != ino || match->device != dev ||
84095+ (match->mode & GR_DELETED))) {
84096+ match = match->next;
84097+ }
84098+
84099+ if (match && !(match->mode & GR_DELETED))
84100+ return match;
84101+ else
84102+ return NULL;
84103+}
84104+
84105+static struct acl_object_label *
84106+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
84107+ const struct acl_subject_label *subj)
84108+{
84109+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84110+ struct acl_object_label *match;
84111+
84112+ match = subj->obj_hash[index];
84113+
84114+ while (match && (match->inode != ino || match->device != dev ||
84115+ !(match->mode & GR_DELETED))) {
84116+ match = match->next;
84117+ }
84118+
84119+ if (match && (match->mode & GR_DELETED))
84120+ return match;
84121+
84122+ match = subj->obj_hash[index];
84123+
84124+ while (match && (match->inode != ino || match->device != dev ||
84125+ (match->mode & GR_DELETED))) {
84126+ match = match->next;
84127+ }
84128+
84129+ if (match && !(match->mode & GR_DELETED))
84130+ return match;
84131+ else
84132+ return NULL;
84133+}
84134+
84135+struct name_entry *
84136+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
84137+{
84138+ unsigned int len = strlen(name);
84139+ unsigned int key = full_name_hash(name, len);
84140+ unsigned int index = key % state->name_set.n_size;
84141+ struct name_entry *match;
84142+
84143+ match = state->name_set.n_hash[index];
84144+
84145+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
84146+ match = match->next;
84147+
84148+ return match;
84149+}
84150+
84151+static struct name_entry *
84152+lookup_name_entry(const char *name)
84153+{
84154+ return __lookup_name_entry(&running_polstate, name);
84155+}
84156+
84157+static struct name_entry *
84158+lookup_name_entry_create(const char *name)
84159+{
84160+ unsigned int len = strlen(name);
84161+ unsigned int key = full_name_hash(name, len);
84162+ unsigned int index = key % running_polstate.name_set.n_size;
84163+ struct name_entry *match;
84164+
84165+ match = running_polstate.name_set.n_hash[index];
84166+
84167+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84168+ !match->deleted))
84169+ match = match->next;
84170+
84171+ if (match && match->deleted)
84172+ return match;
84173+
84174+ match = running_polstate.name_set.n_hash[index];
84175+
84176+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84177+ match->deleted))
84178+ match = match->next;
84179+
84180+ if (match && !match->deleted)
84181+ return match;
84182+ else
84183+ return NULL;
84184+}
84185+
84186+static struct inodev_entry *
84187+lookup_inodev_entry(const u64 ino, const dev_t dev)
84188+{
84189+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
84190+ struct inodev_entry *match;
84191+
84192+ match = running_polstate.inodev_set.i_hash[index];
84193+
84194+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
84195+ match = match->next;
84196+
84197+ return match;
84198+}
84199+
84200+void
84201+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
84202+{
84203+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
84204+ state->inodev_set.i_size);
84205+ struct inodev_entry **curr;
84206+
84207+ entry->prev = NULL;
84208+
84209+ curr = &state->inodev_set.i_hash[index];
84210+ if (*curr != NULL)
84211+ (*curr)->prev = entry;
84212+
84213+ entry->next = *curr;
84214+ *curr = entry;
84215+
84216+ return;
84217+}
84218+
84219+static void
84220+insert_inodev_entry(struct inodev_entry *entry)
84221+{
84222+ __insert_inodev_entry(&running_polstate, entry);
84223+}
84224+
84225+void
84226+insert_acl_obj_label(struct acl_object_label *obj,
84227+ struct acl_subject_label *subj)
84228+{
84229+ unsigned int index =
84230+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
84231+ struct acl_object_label **curr;
84232+
84233+ obj->prev = NULL;
84234+
84235+ curr = &subj->obj_hash[index];
84236+ if (*curr != NULL)
84237+ (*curr)->prev = obj;
84238+
84239+ obj->next = *curr;
84240+ *curr = obj;
84241+
84242+ return;
84243+}
84244+
84245+void
84246+insert_acl_subj_label(struct acl_subject_label *obj,
84247+ struct acl_role_label *role)
84248+{
84249+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
84250+ struct acl_subject_label **curr;
84251+
84252+ obj->prev = NULL;
84253+
84254+ curr = &role->subj_hash[index];
84255+ if (*curr != NULL)
84256+ (*curr)->prev = obj;
84257+
84258+ obj->next = *curr;
84259+ *curr = obj;
84260+
84261+ return;
84262+}
84263+
84264+/* derived from glibc fnmatch() 0: match, 1: no match*/
84265+
84266+static int
84267+glob_match(const char *p, const char *n)
84268+{
84269+ char c;
84270+
84271+ while ((c = *p++) != '\0') {
84272+ switch (c) {
84273+ case '?':
84274+ if (*n == '\0')
84275+ return 1;
84276+ else if (*n == '/')
84277+ return 1;
84278+ break;
84279+ case '\\':
84280+ if (*n != c)
84281+ return 1;
84282+ break;
84283+ case '*':
84284+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
84285+ if (*n == '/')
84286+ return 1;
84287+ else if (c == '?') {
84288+ if (*n == '\0')
84289+ return 1;
84290+ else
84291+ ++n;
84292+ }
84293+ }
84294+ if (c == '\0') {
84295+ return 0;
84296+ } else {
84297+ const char *endp;
84298+
84299+ if ((endp = strchr(n, '/')) == NULL)
84300+ endp = n + strlen(n);
84301+
84302+ if (c == '[') {
84303+ for (--p; n < endp; ++n)
84304+ if (!glob_match(p, n))
84305+ return 0;
84306+ } else if (c == '/') {
84307+ while (*n != '\0' && *n != '/')
84308+ ++n;
84309+ if (*n == '/' && !glob_match(p, n + 1))
84310+ return 0;
84311+ } else {
84312+ for (--p; n < endp; ++n)
84313+ if (*n == c && !glob_match(p, n))
84314+ return 0;
84315+ }
84316+
84317+ return 1;
84318+ }
84319+ case '[':
84320+ {
84321+ int not;
84322+ char cold;
84323+
84324+ if (*n == '\0' || *n == '/')
84325+ return 1;
84326+
84327+ not = (*p == '!' || *p == '^');
84328+ if (not)
84329+ ++p;
84330+
84331+ c = *p++;
84332+ for (;;) {
84333+ unsigned char fn = (unsigned char)*n;
84334+
84335+ if (c == '\0')
84336+ return 1;
84337+ else {
84338+ if (c == fn)
84339+ goto matched;
84340+ cold = c;
84341+ c = *p++;
84342+
84343+ if (c == '-' && *p != ']') {
84344+ unsigned char cend = *p++;
84345+
84346+ if (cend == '\0')
84347+ return 1;
84348+
84349+ if (cold <= fn && fn <= cend)
84350+ goto matched;
84351+
84352+ c = *p++;
84353+ }
84354+ }
84355+
84356+ if (c == ']')
84357+ break;
84358+ }
84359+ if (!not)
84360+ return 1;
84361+ break;
84362+ matched:
84363+ while (c != ']') {
84364+ if (c == '\0')
84365+ return 1;
84366+
84367+ c = *p++;
84368+ }
84369+ if (not)
84370+ return 1;
84371+ }
84372+ break;
84373+ default:
84374+ if (c != *n)
84375+ return 1;
84376+ }
84377+
84378+ ++n;
84379+ }
84380+
84381+ if (*n == '\0')
84382+ return 0;
84383+
84384+ if (*n == '/')
84385+ return 0;
84386+
84387+ return 1;
84388+}
84389+
84390+static struct acl_object_label *
84391+chk_glob_label(struct acl_object_label *globbed,
84392+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
84393+{
84394+ struct acl_object_label *tmp;
84395+
84396+ if (*path == NULL)
84397+ *path = gr_to_filename_nolock(dentry, mnt);
84398+
84399+ tmp = globbed;
84400+
84401+ while (tmp) {
84402+ if (!glob_match(tmp->filename, *path))
84403+ return tmp;
84404+ tmp = tmp->next;
84405+ }
84406+
84407+ return NULL;
84408+}
84409+
84410+static struct acl_object_label *
84411+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84412+ const u64 curr_ino, const dev_t curr_dev,
84413+ const struct acl_subject_label *subj, char **path, const int checkglob)
84414+{
84415+ struct acl_subject_label *tmpsubj;
84416+ struct acl_object_label *retval;
84417+ struct acl_object_label *retval2;
84418+
84419+ tmpsubj = (struct acl_subject_label *) subj;
84420+ read_lock(&gr_inode_lock);
84421+ do {
84422+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
84423+ if (retval) {
84424+ if (checkglob && retval->globbed) {
84425+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
84426+ if (retval2)
84427+ retval = retval2;
84428+ }
84429+ break;
84430+ }
84431+ } while ((tmpsubj = tmpsubj->parent_subject));
84432+ read_unlock(&gr_inode_lock);
84433+
84434+ return retval;
84435+}
84436+
84437+static struct acl_object_label *
84438+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84439+ struct dentry *curr_dentry,
84440+ const struct acl_subject_label *subj, char **path, const int checkglob)
84441+{
84442+ int newglob = checkglob;
84443+ u64 inode;
84444+ dev_t device;
84445+
84446+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
84447+ as we don't want a / * rule to match instead of the / object
84448+ don't do this for create lookups that call this function though, since they're looking up
84449+ on the parent and thus need globbing checks on all paths
84450+ */
84451+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
84452+ newglob = GR_NO_GLOB;
84453+
84454+ spin_lock(&curr_dentry->d_lock);
84455+ inode = __get_ino(curr_dentry);
84456+ device = __get_dev(curr_dentry);
84457+ spin_unlock(&curr_dentry->d_lock);
84458+
84459+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
84460+}
84461+
84462+#ifdef CONFIG_HUGETLBFS
84463+static inline bool
84464+is_hugetlbfs_mnt(const struct vfsmount *mnt)
84465+{
84466+ int i;
84467+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
84468+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
84469+ return true;
84470+ }
84471+
84472+ return false;
84473+}
84474+#endif
84475+
84476+static struct acl_object_label *
84477+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84478+ const struct acl_subject_label *subj, char *path, const int checkglob)
84479+{
84480+ struct dentry *dentry = (struct dentry *) l_dentry;
84481+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84482+ struct inode * inode = d_backing_inode(dentry);
84483+ struct mount *real_mnt = real_mount(mnt);
84484+ struct acl_object_label *retval;
84485+ struct dentry *parent;
84486+
84487+ read_seqlock_excl(&mount_lock);
84488+ write_seqlock(&rename_lock);
84489+
84490+ if (unlikely((mnt == shm_mnt && inode->i_nlink == 0) || mnt == pipe_mnt ||
84491+#ifdef CONFIG_NET
84492+ mnt == sock_mnt ||
84493+#endif
84494+#ifdef CONFIG_HUGETLBFS
84495+ (is_hugetlbfs_mnt(mnt) && inode->i_nlink == 0) ||
84496+#endif
84497+ /* ignore Eric Biederman */
84498+ IS_PRIVATE(inode))) {
84499+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
84500+ goto out;
84501+ }
84502+
84503+ for (;;) {
84504+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84505+ break;
84506+
84507+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84508+ if (!mnt_has_parent(real_mnt))
84509+ break;
84510+
84511+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84512+ if (retval != NULL)
84513+ goto out;
84514+
84515+ dentry = real_mnt->mnt_mountpoint;
84516+ real_mnt = real_mnt->mnt_parent;
84517+ mnt = &real_mnt->mnt;
84518+ continue;
84519+ }
84520+
84521+ parent = dentry->d_parent;
84522+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84523+ if (retval != NULL)
84524+ goto out;
84525+
84526+ dentry = parent;
84527+ }
84528+
84529+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84530+
84531+ /* gr_real_root is pinned so we don't have to hold a reference */
84532+ if (retval == NULL)
84533+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
84534+out:
84535+ write_sequnlock(&rename_lock);
84536+ read_sequnlock_excl(&mount_lock);
84537+
84538+ BUG_ON(retval == NULL);
84539+
84540+ return retval;
84541+}
84542+
84543+static struct acl_object_label *
84544+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84545+ const struct acl_subject_label *subj)
84546+{
84547+ char *path = NULL;
84548+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
84549+}
84550+
84551+static struct acl_object_label *
84552+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84553+ const struct acl_subject_label *subj)
84554+{
84555+ char *path = NULL;
84556+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
84557+}
84558+
84559+static struct acl_object_label *
84560+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84561+ const struct acl_subject_label *subj, char *path)
84562+{
84563+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
84564+}
84565+
84566+struct acl_subject_label *
84567+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84568+ const struct acl_role_label *role)
84569+{
84570+ struct dentry *dentry = (struct dentry *) l_dentry;
84571+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84572+ struct mount *real_mnt = real_mount(mnt);
84573+ struct acl_subject_label *retval;
84574+ struct dentry *parent;
84575+
84576+ read_seqlock_excl(&mount_lock);
84577+ write_seqlock(&rename_lock);
84578+
84579+ for (;;) {
84580+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84581+ break;
84582+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84583+ if (!mnt_has_parent(real_mnt))
84584+ break;
84585+
84586+ spin_lock(&dentry->d_lock);
84587+ read_lock(&gr_inode_lock);
84588+ retval =
84589+ lookup_acl_subj_label(__get_ino(dentry),
84590+ __get_dev(dentry), role);
84591+ read_unlock(&gr_inode_lock);
84592+ spin_unlock(&dentry->d_lock);
84593+ if (retval != NULL)
84594+ goto out;
84595+
84596+ dentry = real_mnt->mnt_mountpoint;
84597+ real_mnt = real_mnt->mnt_parent;
84598+ mnt = &real_mnt->mnt;
84599+ continue;
84600+ }
84601+
84602+ spin_lock(&dentry->d_lock);
84603+ read_lock(&gr_inode_lock);
84604+ retval = lookup_acl_subj_label(__get_ino(dentry),
84605+ __get_dev(dentry), role);
84606+ read_unlock(&gr_inode_lock);
84607+ parent = dentry->d_parent;
84608+ spin_unlock(&dentry->d_lock);
84609+
84610+ if (retval != NULL)
84611+ goto out;
84612+
84613+ dentry = parent;
84614+ }
84615+
84616+ spin_lock(&dentry->d_lock);
84617+ read_lock(&gr_inode_lock);
84618+ retval = lookup_acl_subj_label(__get_ino(dentry),
84619+ __get_dev(dentry), role);
84620+ read_unlock(&gr_inode_lock);
84621+ spin_unlock(&dentry->d_lock);
84622+
84623+ if (unlikely(retval == NULL)) {
84624+ /* gr_real_root is pinned, we don't need to hold a reference */
84625+ read_lock(&gr_inode_lock);
84626+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
84627+ __get_dev(gr_real_root.dentry), role);
84628+ read_unlock(&gr_inode_lock);
84629+ }
84630+out:
84631+ write_sequnlock(&rename_lock);
84632+ read_sequnlock_excl(&mount_lock);
84633+
84634+ BUG_ON(retval == NULL);
84635+
84636+ return retval;
84637+}
84638+
84639+void
84640+assign_special_role(const char *rolename)
84641+{
84642+ struct acl_object_label *obj;
84643+ struct acl_role_label *r;
84644+ struct acl_role_label *assigned = NULL;
84645+ struct task_struct *tsk;
84646+ struct file *filp;
84647+
84648+ FOR_EACH_ROLE_START(r)
84649+ if (!strcmp(rolename, r->rolename) &&
84650+ (r->roletype & GR_ROLE_SPECIAL)) {
84651+ assigned = r;
84652+ break;
84653+ }
84654+ FOR_EACH_ROLE_END(r)
84655+
84656+ if (!assigned)
84657+ return;
84658+
84659+ read_lock(&tasklist_lock);
84660+ read_lock(&grsec_exec_file_lock);
84661+
84662+ tsk = current->real_parent;
84663+ if (tsk == NULL)
84664+ goto out_unlock;
84665+
84666+ filp = tsk->exec_file;
84667+ if (filp == NULL)
84668+ goto out_unlock;
84669+
84670+ tsk->is_writable = 0;
84671+ tsk->inherited = 0;
84672+
84673+ tsk->acl_sp_role = 1;
84674+ tsk->acl_role_id = ++acl_sp_role_value;
84675+ tsk->role = assigned;
84676+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
84677+
84678+ /* ignore additional mmap checks for processes that are writable
84679+ by the default ACL */
84680+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
84681+ if (unlikely(obj->mode & GR_WRITE))
84682+ tsk->is_writable = 1;
84683+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
84684+ if (unlikely(obj->mode & GR_WRITE))
84685+ tsk->is_writable = 1;
84686+
84687+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
84688+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
84689+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
84690+#endif
84691+
84692+out_unlock:
84693+ read_unlock(&grsec_exec_file_lock);
84694+ read_unlock(&tasklist_lock);
84695+ return;
84696+}
84697+
84698+
84699+static void
84700+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
84701+{
84702+ struct task_struct *task = current;
84703+ const struct cred *cred = current_cred();
84704+
84705+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
84706+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84707+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84708+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
84709+
84710+ return;
84711+}
84712+
84713+static void
84714+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
84715+{
84716+ struct task_struct *task = current;
84717+ const struct cred *cred = current_cred();
84718+
84719+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
84720+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84721+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84722+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
84723+
84724+ return;
84725+}
84726+
84727+static void
84728+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
84729+{
84730+ struct task_struct *task = current;
84731+ const struct cred *cred = current_cred();
84732+
84733+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
84734+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84735+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84736+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
84737+
84738+ return;
84739+}
84740+
84741+static void
84742+gr_set_proc_res(struct task_struct *task)
84743+{
84744+ struct acl_subject_label *proc;
84745+ unsigned short i;
84746+
84747+ proc = task->acl;
84748+
84749+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
84750+ return;
84751+
84752+ for (i = 0; i < RLIM_NLIMITS; i++) {
84753+ unsigned long rlim_cur, rlim_max;
84754+
84755+ if (!(proc->resmask & (1U << i)))
84756+ continue;
84757+
84758+ rlim_cur = proc->res[i].rlim_cur;
84759+ rlim_max = proc->res[i].rlim_max;
84760+
84761+ if (i == RLIMIT_NOFILE) {
84762+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
84763+ if (rlim_cur > saved_sysctl_nr_open)
84764+ rlim_cur = saved_sysctl_nr_open;
84765+ if (rlim_max > saved_sysctl_nr_open)
84766+ rlim_max = saved_sysctl_nr_open;
84767+ }
84768+
84769+ task->signal->rlim[i].rlim_cur = rlim_cur;
84770+ task->signal->rlim[i].rlim_max = rlim_max;
84771+
84772+ if (i == RLIMIT_CPU)
84773+ update_rlimit_cpu(task, rlim_cur);
84774+ }
84775+
84776+ return;
84777+}
84778+
84779+/* both of the below must be called with
84780+ rcu_read_lock();
84781+ read_lock(&tasklist_lock);
84782+ read_lock(&grsec_exec_file_lock);
84783+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
84784+*/
84785+
84786+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
84787+{
84788+ char *tmpname;
84789+ struct acl_subject_label *tmpsubj;
84790+ struct file *filp;
84791+ struct name_entry *nmatch;
84792+
84793+ filp = task->exec_file;
84794+ if (filp == NULL)
84795+ return NULL;
84796+
84797+ /* the following is to apply the correct subject
84798+ on binaries running when the RBAC system
84799+ is enabled, when the binaries have been
84800+ replaced or deleted since their execution
84801+ -----
84802+ when the RBAC system starts, the inode/dev
84803+ from exec_file will be one the RBAC system
84804+ is unaware of. It only knows the inode/dev
84805+ of the present file on disk, or the absence
84806+ of it.
84807+ */
84808+
84809+ if (filename)
84810+ nmatch = __lookup_name_entry(state, filename);
84811+ else {
84812+ preempt_disable();
84813+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
84814+
84815+ nmatch = __lookup_name_entry(state, tmpname);
84816+ preempt_enable();
84817+ }
84818+ tmpsubj = NULL;
84819+ if (nmatch) {
84820+ if (nmatch->deleted)
84821+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
84822+ else
84823+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
84824+ }
84825+ /* this also works for the reload case -- if we don't match a potentially inherited subject
84826+ then we fall back to a normal lookup based on the binary's ino/dev
84827+ */
84828+ if (tmpsubj == NULL && fallback)
84829+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
84830+
84831+ return tmpsubj;
84832+}
84833+
84834+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
84835+{
84836+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
84837+}
84838+
84839+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
84840+{
84841+ struct acl_object_label *obj;
84842+ struct file *filp;
84843+
84844+ filp = task->exec_file;
84845+
84846+ task->acl = subj;
84847+ task->is_writable = 0;
84848+ /* ignore additional mmap checks for processes that are writable
84849+ by the default ACL */
84850+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
84851+ if (unlikely(obj->mode & GR_WRITE))
84852+ task->is_writable = 1;
84853+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
84854+ if (unlikely(obj->mode & GR_WRITE))
84855+ task->is_writable = 1;
84856+
84857+ gr_set_proc_res(task);
84858+
84859+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
84860+ 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);
84861+#endif
84862+}
84863+
84864+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
84865+{
84866+ __gr_apply_subject_to_task(&running_polstate, task, subj);
84867+}
84868+
84869+__u32
84870+gr_search_file(const struct dentry * dentry, const __u32 mode,
84871+ const struct vfsmount * mnt)
84872+{
84873+ __u32 retval = mode;
84874+ struct acl_subject_label *curracl;
84875+ struct acl_object_label *currobj;
84876+
84877+ if (unlikely(!(gr_status & GR_READY)))
84878+ return (mode & ~GR_AUDITS);
84879+
84880+ curracl = current->acl;
84881+
84882+ currobj = chk_obj_label(dentry, mnt, curracl);
84883+ retval = currobj->mode & mode;
84884+
84885+ /* if we're opening a specified transfer file for writing
84886+ (e.g. /dev/initctl), then transfer our role to init
84887+ */
84888+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
84889+ current->role->roletype & GR_ROLE_PERSIST)) {
84890+ struct task_struct *task = init_pid_ns.child_reaper;
84891+
84892+ if (task->role != current->role) {
84893+ struct acl_subject_label *subj;
84894+
84895+ task->acl_sp_role = 0;
84896+ task->acl_role_id = current->acl_role_id;
84897+ task->role = current->role;
84898+ rcu_read_lock();
84899+ read_lock(&grsec_exec_file_lock);
84900+ subj = gr_get_subject_for_task(task, NULL, 1);
84901+ gr_apply_subject_to_task(task, subj);
84902+ read_unlock(&grsec_exec_file_lock);
84903+ rcu_read_unlock();
84904+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
84905+ }
84906+ }
84907+
84908+ if (unlikely
84909+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
84910+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
84911+ __u32 new_mode = mode;
84912+
84913+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
84914+
84915+ retval = new_mode;
84916+
84917+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
84918+ new_mode |= GR_INHERIT;
84919+
84920+ if (!(mode & GR_NOLEARN))
84921+ gr_log_learn(dentry, mnt, new_mode);
84922+ }
84923+
84924+ return retval;
84925+}
84926+
84927+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
84928+ const struct dentry *parent,
84929+ const struct vfsmount *mnt)
84930+{
84931+ struct name_entry *match;
84932+ struct acl_object_label *matchpo;
84933+ struct acl_subject_label *curracl;
84934+ char *path;
84935+
84936+ if (unlikely(!(gr_status & GR_READY)))
84937+ return NULL;
84938+
84939+ preempt_disable();
84940+ path = gr_to_filename_rbac(new_dentry, mnt);
84941+ match = lookup_name_entry_create(path);
84942+
84943+ curracl = current->acl;
84944+
84945+ if (match) {
84946+ read_lock(&gr_inode_lock);
84947+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
84948+ read_unlock(&gr_inode_lock);
84949+
84950+ if (matchpo) {
84951+ preempt_enable();
84952+ return matchpo;
84953+ }
84954+ }
84955+
84956+ // lookup parent
84957+
84958+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
84959+
84960+ preempt_enable();
84961+ return matchpo;
84962+}
84963+
84964+__u32
84965+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
84966+ const struct vfsmount * mnt, const __u32 mode)
84967+{
84968+ struct acl_object_label *matchpo;
84969+ __u32 retval;
84970+
84971+ if (unlikely(!(gr_status & GR_READY)))
84972+ return (mode & ~GR_AUDITS);
84973+
84974+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
84975+
84976+ retval = matchpo->mode & mode;
84977+
84978+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
84979+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
84980+ __u32 new_mode = mode;
84981+
84982+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
84983+
84984+ gr_log_learn(new_dentry, mnt, new_mode);
84985+ return new_mode;
84986+ }
84987+
84988+ return retval;
84989+}
84990+
84991+__u32
84992+gr_check_link(const struct dentry * new_dentry,
84993+ const struct dentry * parent_dentry,
84994+ const struct vfsmount * parent_mnt,
84995+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
84996+{
84997+ struct acl_object_label *obj;
84998+ __u32 oldmode, newmode;
84999+ __u32 needmode;
85000+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
85001+ GR_DELETE | GR_INHERIT;
85002+
85003+ if (unlikely(!(gr_status & GR_READY)))
85004+ return (GR_CREATE | GR_LINK);
85005+
85006+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
85007+ oldmode = obj->mode;
85008+
85009+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
85010+ newmode = obj->mode;
85011+
85012+ needmode = newmode & checkmodes;
85013+
85014+ // old name for hardlink must have at least the permissions of the new name
85015+ if ((oldmode & needmode) != needmode)
85016+ goto bad;
85017+
85018+ // if old name had restrictions/auditing, make sure the new name does as well
85019+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
85020+
85021+ // don't allow hardlinking of suid/sgid/fcapped files without permission
85022+ if (is_privileged_binary(old_dentry))
85023+ needmode |= GR_SETID;
85024+
85025+ if ((newmode & needmode) != needmode)
85026+ goto bad;
85027+
85028+ // enforce minimum permissions
85029+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
85030+ return newmode;
85031+bad:
85032+ needmode = oldmode;
85033+ if (is_privileged_binary(old_dentry))
85034+ needmode |= GR_SETID;
85035+
85036+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
85037+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
85038+ return (GR_CREATE | GR_LINK);
85039+ } else if (newmode & GR_SUPPRESS)
85040+ return GR_SUPPRESS;
85041+ else
85042+ return 0;
85043+}
85044+
85045+int
85046+gr_check_hidden_task(const struct task_struct *task)
85047+{
85048+ if (unlikely(!(gr_status & GR_READY)))
85049+ return 0;
85050+
85051+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
85052+ return 1;
85053+
85054+ return 0;
85055+}
85056+
85057+int
85058+gr_check_protected_task(const struct task_struct *task)
85059+{
85060+ if (unlikely(!(gr_status & GR_READY) || !task))
85061+ return 0;
85062+
85063+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85064+ task->acl != current->acl)
85065+ return 1;
85066+
85067+ return 0;
85068+}
85069+
85070+int
85071+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
85072+{
85073+ struct task_struct *p;
85074+ int ret = 0;
85075+
85076+ if (unlikely(!(gr_status & GR_READY) || !pid))
85077+ return ret;
85078+
85079+ read_lock(&tasklist_lock);
85080+ do_each_pid_task(pid, type, p) {
85081+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85082+ p->acl != current->acl) {
85083+ ret = 1;
85084+ goto out;
85085+ }
85086+ } while_each_pid_task(pid, type, p);
85087+out:
85088+ read_unlock(&tasklist_lock);
85089+
85090+ return ret;
85091+}
85092+
85093+void
85094+gr_copy_label(struct task_struct *tsk)
85095+{
85096+ struct task_struct *p = current;
85097+
85098+ tsk->inherited = p->inherited;
85099+ tsk->acl_sp_role = 0;
85100+ tsk->acl_role_id = p->acl_role_id;
85101+ tsk->acl = p->acl;
85102+ tsk->role = p->role;
85103+ tsk->signal->used_accept = 0;
85104+ tsk->signal->curr_ip = p->signal->curr_ip;
85105+ tsk->signal->saved_ip = p->signal->saved_ip;
85106+ if (p->exec_file)
85107+ get_file(p->exec_file);
85108+ tsk->exec_file = p->exec_file;
85109+ tsk->is_writable = p->is_writable;
85110+ if (unlikely(p->signal->used_accept)) {
85111+ p->signal->curr_ip = 0;
85112+ p->signal->saved_ip = 0;
85113+ }
85114+
85115+ return;
85116+}
85117+
85118+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
85119+
85120+int
85121+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
85122+{
85123+ unsigned int i;
85124+ __u16 num;
85125+ uid_t *uidlist;
85126+ uid_t curuid;
85127+ int realok = 0;
85128+ int effectiveok = 0;
85129+ int fsok = 0;
85130+ uid_t globalreal, globaleffective, globalfs;
85131+
85132+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
85133+ struct user_struct *user;
85134+
85135+ if (!uid_valid(real))
85136+ goto skipit;
85137+
85138+ /* find user based on global namespace */
85139+
85140+ globalreal = GR_GLOBAL_UID(real);
85141+
85142+ user = find_user(make_kuid(&init_user_ns, globalreal));
85143+ if (user == NULL)
85144+ goto skipit;
85145+
85146+ if (gr_process_kernel_setuid_ban(user)) {
85147+ /* for find_user */
85148+ free_uid(user);
85149+ return 1;
85150+ }
85151+
85152+ /* for find_user */
85153+ free_uid(user);
85154+
85155+skipit:
85156+#endif
85157+
85158+ if (unlikely(!(gr_status & GR_READY)))
85159+ return 0;
85160+
85161+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85162+ gr_log_learn_uid_change(real, effective, fs);
85163+
85164+ num = current->acl->user_trans_num;
85165+ uidlist = current->acl->user_transitions;
85166+
85167+ if (uidlist == NULL)
85168+ return 0;
85169+
85170+ if (!uid_valid(real)) {
85171+ realok = 1;
85172+ globalreal = (uid_t)-1;
85173+ } else {
85174+ globalreal = GR_GLOBAL_UID(real);
85175+ }
85176+ if (!uid_valid(effective)) {
85177+ effectiveok = 1;
85178+ globaleffective = (uid_t)-1;
85179+ } else {
85180+ globaleffective = GR_GLOBAL_UID(effective);
85181+ }
85182+ if (!uid_valid(fs)) {
85183+ fsok = 1;
85184+ globalfs = (uid_t)-1;
85185+ } else {
85186+ globalfs = GR_GLOBAL_UID(fs);
85187+ }
85188+
85189+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
85190+ for (i = 0; i < num; i++) {
85191+ curuid = uidlist[i];
85192+ if (globalreal == curuid)
85193+ realok = 1;
85194+ if (globaleffective == curuid)
85195+ effectiveok = 1;
85196+ if (globalfs == curuid)
85197+ fsok = 1;
85198+ }
85199+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
85200+ for (i = 0; i < num; i++) {
85201+ curuid = uidlist[i];
85202+ if (globalreal == curuid)
85203+ break;
85204+ if (globaleffective == curuid)
85205+ break;
85206+ if (globalfs == curuid)
85207+ break;
85208+ }
85209+ /* not in deny list */
85210+ if (i == num) {
85211+ realok = 1;
85212+ effectiveok = 1;
85213+ fsok = 1;
85214+ }
85215+ }
85216+
85217+ if (realok && effectiveok && fsok)
85218+ return 0;
85219+ else {
85220+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85221+ return 1;
85222+ }
85223+}
85224+
85225+int
85226+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85227+{
85228+ unsigned int i;
85229+ __u16 num;
85230+ gid_t *gidlist;
85231+ gid_t curgid;
85232+ int realok = 0;
85233+ int effectiveok = 0;
85234+ int fsok = 0;
85235+ gid_t globalreal, globaleffective, globalfs;
85236+
85237+ if (unlikely(!(gr_status & GR_READY)))
85238+ return 0;
85239+
85240+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85241+ gr_log_learn_gid_change(real, effective, fs);
85242+
85243+ num = current->acl->group_trans_num;
85244+ gidlist = current->acl->group_transitions;
85245+
85246+ if (gidlist == NULL)
85247+ return 0;
85248+
85249+ if (!gid_valid(real)) {
85250+ realok = 1;
85251+ globalreal = (gid_t)-1;
85252+ } else {
85253+ globalreal = GR_GLOBAL_GID(real);
85254+ }
85255+ if (!gid_valid(effective)) {
85256+ effectiveok = 1;
85257+ globaleffective = (gid_t)-1;
85258+ } else {
85259+ globaleffective = GR_GLOBAL_GID(effective);
85260+ }
85261+ if (!gid_valid(fs)) {
85262+ fsok = 1;
85263+ globalfs = (gid_t)-1;
85264+ } else {
85265+ globalfs = GR_GLOBAL_GID(fs);
85266+ }
85267+
85268+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
85269+ for (i = 0; i < num; i++) {
85270+ curgid = gidlist[i];
85271+ if (globalreal == curgid)
85272+ realok = 1;
85273+ if (globaleffective == curgid)
85274+ effectiveok = 1;
85275+ if (globalfs == curgid)
85276+ fsok = 1;
85277+ }
85278+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
85279+ for (i = 0; i < num; i++) {
85280+ curgid = gidlist[i];
85281+ if (globalreal == curgid)
85282+ break;
85283+ if (globaleffective == curgid)
85284+ break;
85285+ if (globalfs == curgid)
85286+ break;
85287+ }
85288+ /* not in deny list */
85289+ if (i == num) {
85290+ realok = 1;
85291+ effectiveok = 1;
85292+ fsok = 1;
85293+ }
85294+ }
85295+
85296+ if (realok && effectiveok && fsok)
85297+ return 0;
85298+ else {
85299+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85300+ return 1;
85301+ }
85302+}
85303+
85304+extern int gr_acl_is_capable(const int cap);
85305+
85306+void
85307+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
85308+{
85309+ struct acl_role_label *role = task->role;
85310+ struct acl_role_label *origrole = role;
85311+ struct acl_subject_label *subj = NULL;
85312+ struct acl_object_label *obj;
85313+ struct file *filp;
85314+ uid_t uid;
85315+ gid_t gid;
85316+
85317+ if (unlikely(!(gr_status & GR_READY)))
85318+ return;
85319+
85320+ uid = GR_GLOBAL_UID(kuid);
85321+ gid = GR_GLOBAL_GID(kgid);
85322+
85323+ filp = task->exec_file;
85324+
85325+ /* kernel process, we'll give them the kernel role */
85326+ if (unlikely(!filp)) {
85327+ task->role = running_polstate.kernel_role;
85328+ task->acl = running_polstate.kernel_role->root_label;
85329+ return;
85330+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
85331+ /* save the current ip at time of role lookup so that the proper
85332+ IP will be learned for role_allowed_ip */
85333+ task->signal->saved_ip = task->signal->curr_ip;
85334+ role = lookup_acl_role_label(task, uid, gid);
85335+ }
85336+
85337+ /* don't change the role if we're not a privileged process */
85338+ if (role && task->role != role &&
85339+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
85340+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
85341+ return;
85342+
85343+ task->role = role;
85344+
85345+ if (task->inherited) {
85346+ /* if we reached our subject through inheritance, then first see
85347+ if there's a subject of the same name in the new role that has
85348+ an object that would result in the same inherited subject
85349+ */
85350+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
85351+ if (subj) {
85352+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
85353+ if (!(obj->mode & GR_INHERIT))
85354+ subj = NULL;
85355+ }
85356+
85357+ }
85358+ if (subj == NULL) {
85359+ /* otherwise:
85360+ perform subject lookup in possibly new role
85361+ we can use this result below in the case where role == task->role
85362+ */
85363+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
85364+ }
85365+
85366+ /* if we changed uid/gid, but result in the same role
85367+ and are using inheritance, don't lose the inherited subject
85368+ if current subject is other than what normal lookup
85369+ would result in, we arrived via inheritance, don't
85370+ lose subject
85371+ */
85372+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
85373+ (subj == task->acl)))
85374+ task->acl = subj;
85375+
85376+ /* leave task->inherited unaffected */
85377+
85378+ task->is_writable = 0;
85379+
85380+ /* ignore additional mmap checks for processes that are writable
85381+ by the default ACL */
85382+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
85383+ if (unlikely(obj->mode & GR_WRITE))
85384+ task->is_writable = 1;
85385+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
85386+ if (unlikely(obj->mode & GR_WRITE))
85387+ task->is_writable = 1;
85388+
85389+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85390+ 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);
85391+#endif
85392+
85393+ gr_set_proc_res(task);
85394+
85395+ return;
85396+}
85397+
85398+int
85399+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
85400+ const int unsafe_flags)
85401+{
85402+ struct task_struct *task = current;
85403+ struct acl_subject_label *newacl;
85404+ struct acl_object_label *obj;
85405+ __u32 retmode;
85406+
85407+ if (unlikely(!(gr_status & GR_READY)))
85408+ return 0;
85409+
85410+ newacl = chk_subj_label(dentry, mnt, task->role);
85411+
85412+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
85413+ did an exec
85414+ */
85415+ rcu_read_lock();
85416+ read_lock(&tasklist_lock);
85417+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
85418+ (task->parent->acl->mode & GR_POVERRIDE))) {
85419+ read_unlock(&tasklist_lock);
85420+ rcu_read_unlock();
85421+ goto skip_check;
85422+ }
85423+ read_unlock(&tasklist_lock);
85424+ rcu_read_unlock();
85425+
85426+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
85427+ !(task->role->roletype & GR_ROLE_GOD) &&
85428+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
85429+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
85430+ if (unsafe_flags & LSM_UNSAFE_SHARE)
85431+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
85432+ else
85433+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
85434+ return -EACCES;
85435+ }
85436+
85437+skip_check:
85438+
85439+ obj = chk_obj_label(dentry, mnt, task->acl);
85440+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
85441+
85442+ if (!(task->acl->mode & GR_INHERITLEARN) &&
85443+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
85444+ if (obj->nested)
85445+ task->acl = obj->nested;
85446+ else
85447+ task->acl = newacl;
85448+ task->inherited = 0;
85449+ } else {
85450+ task->inherited = 1;
85451+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
85452+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
85453+ }
85454+
85455+ task->is_writable = 0;
85456+
85457+ /* ignore additional mmap checks for processes that are writable
85458+ by the default ACL */
85459+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
85460+ if (unlikely(obj->mode & GR_WRITE))
85461+ task->is_writable = 1;
85462+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
85463+ if (unlikely(obj->mode & GR_WRITE))
85464+ task->is_writable = 1;
85465+
85466+ gr_set_proc_res(task);
85467+
85468+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85469+ 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);
85470+#endif
85471+ return 0;
85472+}
85473+
85474+/* always called with valid inodev ptr */
85475+static void
85476+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
85477+{
85478+ struct acl_object_label *matchpo;
85479+ struct acl_subject_label *matchps;
85480+ struct acl_subject_label *subj;
85481+ struct acl_role_label *role;
85482+ unsigned int x;
85483+
85484+ FOR_EACH_ROLE_START(role)
85485+ FOR_EACH_SUBJECT_START(role, subj, x)
85486+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85487+ matchpo->mode |= GR_DELETED;
85488+ FOR_EACH_SUBJECT_END(subj,x)
85489+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85490+ /* nested subjects aren't in the role's subj_hash table */
85491+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85492+ matchpo->mode |= GR_DELETED;
85493+ FOR_EACH_NESTED_SUBJECT_END(subj)
85494+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
85495+ matchps->mode |= GR_DELETED;
85496+ FOR_EACH_ROLE_END(role)
85497+
85498+ inodev->nentry->deleted = 1;
85499+
85500+ return;
85501+}
85502+
85503+void
85504+gr_handle_delete(const u64 ino, const dev_t dev)
85505+{
85506+ struct inodev_entry *inodev;
85507+
85508+ if (unlikely(!(gr_status & GR_READY)))
85509+ return;
85510+
85511+ write_lock(&gr_inode_lock);
85512+ inodev = lookup_inodev_entry(ino, dev);
85513+ if (inodev != NULL)
85514+ do_handle_delete(inodev, ino, dev);
85515+ write_unlock(&gr_inode_lock);
85516+
85517+ return;
85518+}
85519+
85520+static void
85521+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
85522+ const u64 newinode, const dev_t newdevice,
85523+ struct acl_subject_label *subj)
85524+{
85525+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
85526+ struct acl_object_label *match;
85527+
85528+ match = subj->obj_hash[index];
85529+
85530+ while (match && (match->inode != oldinode ||
85531+ match->device != olddevice ||
85532+ !(match->mode & GR_DELETED)))
85533+ match = match->next;
85534+
85535+ if (match && (match->inode == oldinode)
85536+ && (match->device == olddevice)
85537+ && (match->mode & GR_DELETED)) {
85538+ if (match->prev == NULL) {
85539+ subj->obj_hash[index] = match->next;
85540+ if (match->next != NULL)
85541+ match->next->prev = NULL;
85542+ } else {
85543+ match->prev->next = match->next;
85544+ if (match->next != NULL)
85545+ match->next->prev = match->prev;
85546+ }
85547+ match->prev = NULL;
85548+ match->next = NULL;
85549+ match->inode = newinode;
85550+ match->device = newdevice;
85551+ match->mode &= ~GR_DELETED;
85552+
85553+ insert_acl_obj_label(match, subj);
85554+ }
85555+
85556+ return;
85557+}
85558+
85559+static void
85560+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
85561+ const u64 newinode, const dev_t newdevice,
85562+ struct acl_role_label *role)
85563+{
85564+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
85565+ struct acl_subject_label *match;
85566+
85567+ match = role->subj_hash[index];
85568+
85569+ while (match && (match->inode != oldinode ||
85570+ match->device != olddevice ||
85571+ !(match->mode & GR_DELETED)))
85572+ match = match->next;
85573+
85574+ if (match && (match->inode == oldinode)
85575+ && (match->device == olddevice)
85576+ && (match->mode & GR_DELETED)) {
85577+ if (match->prev == NULL) {
85578+ role->subj_hash[index] = match->next;
85579+ if (match->next != NULL)
85580+ match->next->prev = NULL;
85581+ } else {
85582+ match->prev->next = match->next;
85583+ if (match->next != NULL)
85584+ match->next->prev = match->prev;
85585+ }
85586+ match->prev = NULL;
85587+ match->next = NULL;
85588+ match->inode = newinode;
85589+ match->device = newdevice;
85590+ match->mode &= ~GR_DELETED;
85591+
85592+ insert_acl_subj_label(match, role);
85593+ }
85594+
85595+ return;
85596+}
85597+
85598+static void
85599+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
85600+ const u64 newinode, const dev_t newdevice)
85601+{
85602+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
85603+ struct inodev_entry *match;
85604+
85605+ match = running_polstate.inodev_set.i_hash[index];
85606+
85607+ while (match && (match->nentry->inode != oldinode ||
85608+ match->nentry->device != olddevice || !match->nentry->deleted))
85609+ match = match->next;
85610+
85611+ if (match && (match->nentry->inode == oldinode)
85612+ && (match->nentry->device == olddevice) &&
85613+ match->nentry->deleted) {
85614+ if (match->prev == NULL) {
85615+ running_polstate.inodev_set.i_hash[index] = match->next;
85616+ if (match->next != NULL)
85617+ match->next->prev = NULL;
85618+ } else {
85619+ match->prev->next = match->next;
85620+ if (match->next != NULL)
85621+ match->next->prev = match->prev;
85622+ }
85623+ match->prev = NULL;
85624+ match->next = NULL;
85625+ match->nentry->inode = newinode;
85626+ match->nentry->device = newdevice;
85627+ match->nentry->deleted = 0;
85628+
85629+ insert_inodev_entry(match);
85630+ }
85631+
85632+ return;
85633+}
85634+
85635+static void
85636+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
85637+{
85638+ struct acl_subject_label *subj;
85639+ struct acl_role_label *role;
85640+ unsigned int x;
85641+
85642+ FOR_EACH_ROLE_START(role)
85643+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
85644+
85645+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85646+ if ((subj->inode == ino) && (subj->device == dev)) {
85647+ subj->inode = ino;
85648+ subj->device = dev;
85649+ }
85650+ /* nested subjects aren't in the role's subj_hash table */
85651+ update_acl_obj_label(matchn->inode, matchn->device,
85652+ ino, dev, subj);
85653+ FOR_EACH_NESTED_SUBJECT_END(subj)
85654+ FOR_EACH_SUBJECT_START(role, subj, x)
85655+ update_acl_obj_label(matchn->inode, matchn->device,
85656+ ino, dev, subj);
85657+ FOR_EACH_SUBJECT_END(subj,x)
85658+ FOR_EACH_ROLE_END(role)
85659+
85660+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
85661+
85662+ return;
85663+}
85664+
85665+static void
85666+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
85667+ const struct vfsmount *mnt)
85668+{
85669+ u64 ino = __get_ino(dentry);
85670+ dev_t dev = __get_dev(dentry);
85671+
85672+ __do_handle_create(matchn, ino, dev);
85673+
85674+ return;
85675+}
85676+
85677+void
85678+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
85679+{
85680+ struct name_entry *matchn;
85681+
85682+ if (unlikely(!(gr_status & GR_READY)))
85683+ return;
85684+
85685+ preempt_disable();
85686+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
85687+
85688+ if (unlikely((unsigned long)matchn)) {
85689+ write_lock(&gr_inode_lock);
85690+ do_handle_create(matchn, dentry, mnt);
85691+ write_unlock(&gr_inode_lock);
85692+ }
85693+ preempt_enable();
85694+
85695+ return;
85696+}
85697+
85698+void
85699+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
85700+{
85701+ struct name_entry *matchn;
85702+
85703+ if (unlikely(!(gr_status & GR_READY)))
85704+ return;
85705+
85706+ preempt_disable();
85707+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
85708+
85709+ if (unlikely((unsigned long)matchn)) {
85710+ write_lock(&gr_inode_lock);
85711+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
85712+ write_unlock(&gr_inode_lock);
85713+ }
85714+ preempt_enable();
85715+
85716+ return;
85717+}
85718+
85719+void
85720+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
85721+ struct dentry *old_dentry,
85722+ struct dentry *new_dentry,
85723+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
85724+{
85725+ struct name_entry *matchn;
85726+ struct name_entry *matchn2 = NULL;
85727+ struct inodev_entry *inodev;
85728+ struct inode *inode = d_backing_inode(new_dentry);
85729+ struct inode *old_inode = d_backing_inode(old_dentry);
85730+ u64 old_ino = __get_ino(old_dentry);
85731+ dev_t old_dev = __get_dev(old_dentry);
85732+ unsigned int exchange = flags & RENAME_EXCHANGE;
85733+
85734+ /* vfs_rename swaps the name and parent link for old_dentry and
85735+ new_dentry
85736+ at this point, old_dentry has the new name, parent link, and inode
85737+ for the renamed file
85738+ if a file is being replaced by a rename, new_dentry has the inode
85739+ and name for the replaced file
85740+ */
85741+
85742+ if (unlikely(!(gr_status & GR_READY)))
85743+ return;
85744+
85745+ preempt_disable();
85746+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
85747+
85748+ /* exchange cases:
85749+ a filename exists for the source, but not dest
85750+ do a recreate on source
85751+ a filename exists for the dest, but not source
85752+ do a recreate on dest
85753+ a filename exists for both source and dest
85754+ delete source and dest, then create source and dest
85755+ a filename exists for neither source nor dest
85756+ no updates needed
85757+
85758+ the name entry lookups get us the old inode/dev associated with
85759+ each name, so do the deletes first (if possible) so that when
85760+ we do the create, we pick up on the right entries
85761+ */
85762+
85763+ if (exchange)
85764+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
85765+
85766+ /* we wouldn't have to check d_inode if it weren't for
85767+ NFS silly-renaming
85768+ */
85769+
85770+ write_lock(&gr_inode_lock);
85771+ if (unlikely((replace || exchange) && inode)) {
85772+ u64 new_ino = __get_ino(new_dentry);
85773+ dev_t new_dev = __get_dev(new_dentry);
85774+
85775+ inodev = lookup_inodev_entry(new_ino, new_dev);
85776+ if (inodev != NULL && ((inode->i_nlink <= 1) || d_is_dir(new_dentry)))
85777+ do_handle_delete(inodev, new_ino, new_dev);
85778+ }
85779+
85780+ inodev = lookup_inodev_entry(old_ino, old_dev);
85781+ if (inodev != NULL && ((old_inode->i_nlink <= 1) || d_is_dir(old_dentry)))
85782+ do_handle_delete(inodev, old_ino, old_dev);
85783+
85784+ if (unlikely(matchn != NULL))
85785+ do_handle_create(matchn, old_dentry, mnt);
85786+
85787+ if (unlikely(matchn2 != NULL))
85788+ do_handle_create(matchn2, new_dentry, mnt);
85789+
85790+ write_unlock(&gr_inode_lock);
85791+ preempt_enable();
85792+
85793+ return;
85794+}
85795+
85796+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
85797+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
85798+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
85799+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
85800+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
85801+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
85802+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
85803+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
85804+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
85805+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
85806+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
85807+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
85808+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
85809+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
85810+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
85811+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
85812+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
85813+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
85814+};
85815+
85816+void
85817+gr_learn_resource(const struct task_struct *task,
85818+ const int res, const unsigned long wanted, const int gt)
85819+{
85820+ struct acl_subject_label *acl;
85821+ const struct cred *cred;
85822+
85823+ if (unlikely((gr_status & GR_READY) &&
85824+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
85825+ goto skip_reslog;
85826+
85827+ gr_log_resource(task, res, wanted, gt);
85828+skip_reslog:
85829+
85830+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
85831+ return;
85832+
85833+ acl = task->acl;
85834+
85835+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
85836+ !(acl->resmask & (1U << (unsigned short) res))))
85837+ return;
85838+
85839+ if (wanted >= acl->res[res].rlim_cur) {
85840+ unsigned long res_add;
85841+
85842+ res_add = wanted + res_learn_bumps[res];
85843+
85844+ acl->res[res].rlim_cur = res_add;
85845+
85846+ if (wanted > acl->res[res].rlim_max)
85847+ acl->res[res].rlim_max = res_add;
85848+
85849+ /* only log the subject filename, since resource logging is supported for
85850+ single-subject learning only */
85851+ rcu_read_lock();
85852+ cred = __task_cred(task);
85853+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
85854+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
85855+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
85856+ "", (unsigned long) res, &task->signal->saved_ip);
85857+ rcu_read_unlock();
85858+ }
85859+
85860+ return;
85861+}
85862+EXPORT_SYMBOL_GPL(gr_learn_resource);
85863+#endif
85864+
85865+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
85866+void
85867+pax_set_initial_flags(struct linux_binprm *bprm)
85868+{
85869+ struct task_struct *task = current;
85870+ struct acl_subject_label *proc;
85871+ unsigned long flags;
85872+
85873+ if (unlikely(!(gr_status & GR_READY)))
85874+ return;
85875+
85876+ flags = pax_get_flags(task);
85877+
85878+ proc = task->acl;
85879+
85880+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
85881+ flags &= ~MF_PAX_PAGEEXEC;
85882+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
85883+ flags &= ~MF_PAX_SEGMEXEC;
85884+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
85885+ flags &= ~MF_PAX_RANDMMAP;
85886+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
85887+ flags &= ~MF_PAX_EMUTRAMP;
85888+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
85889+ flags &= ~MF_PAX_MPROTECT;
85890+
85891+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
85892+ flags |= MF_PAX_PAGEEXEC;
85893+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
85894+ flags |= MF_PAX_SEGMEXEC;
85895+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
85896+ flags |= MF_PAX_RANDMMAP;
85897+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
85898+ flags |= MF_PAX_EMUTRAMP;
85899+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
85900+ flags |= MF_PAX_MPROTECT;
85901+
85902+ pax_set_flags(task, flags);
85903+
85904+ return;
85905+}
85906+#endif
85907+
85908+int
85909+gr_handle_proc_ptrace(struct task_struct *task)
85910+{
85911+ struct file *filp;
85912+ struct task_struct *tmp = task;
85913+ struct task_struct *curtemp = current;
85914+ __u32 retmode;
85915+
85916+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
85917+ if (unlikely(!(gr_status & GR_READY)))
85918+ return 0;
85919+#endif
85920+
85921+ read_lock(&tasklist_lock);
85922+ read_lock(&grsec_exec_file_lock);
85923+ filp = task->exec_file;
85924+
85925+ while (task_pid_nr(tmp) > 0) {
85926+ if (tmp == curtemp)
85927+ break;
85928+ tmp = tmp->real_parent;
85929+ }
85930+
85931+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
85932+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
85933+ read_unlock(&grsec_exec_file_lock);
85934+ read_unlock(&tasklist_lock);
85935+ return 1;
85936+ }
85937+
85938+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
85939+ if (!(gr_status & GR_READY)) {
85940+ read_unlock(&grsec_exec_file_lock);
85941+ read_unlock(&tasklist_lock);
85942+ return 0;
85943+ }
85944+#endif
85945+
85946+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
85947+ read_unlock(&grsec_exec_file_lock);
85948+ read_unlock(&tasklist_lock);
85949+
85950+ if (retmode & GR_NOPTRACE)
85951+ return 1;
85952+
85953+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
85954+ && (current->acl != task->acl || (current->acl != current->role->root_label
85955+ && task_pid_nr(current) != task_pid_nr(task))))
85956+ return 1;
85957+
85958+ return 0;
85959+}
85960+
85961+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
85962+{
85963+ if (unlikely(!(gr_status & GR_READY)))
85964+ return;
85965+
85966+ if (!(current->role->roletype & GR_ROLE_GOD))
85967+ return;
85968+
85969+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
85970+ p->role->rolename, gr_task_roletype_to_char(p),
85971+ p->acl->filename);
85972+}
85973+
85974+int
85975+gr_handle_ptrace(struct task_struct *task, const long request)
85976+{
85977+ struct task_struct *tmp = task;
85978+ struct task_struct *curtemp = current;
85979+ __u32 retmode;
85980+
85981+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
85982+ if (unlikely(!(gr_status & GR_READY)))
85983+ return 0;
85984+#endif
85985+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
85986+ read_lock(&tasklist_lock);
85987+ while (task_pid_nr(tmp) > 0) {
85988+ if (tmp == curtemp)
85989+ break;
85990+ tmp = tmp->real_parent;
85991+ }
85992+
85993+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
85994+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
85995+ read_unlock(&tasklist_lock);
85996+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
85997+ return 1;
85998+ }
85999+ read_unlock(&tasklist_lock);
86000+ }
86001+
86002+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
86003+ if (!(gr_status & GR_READY))
86004+ return 0;
86005+#endif
86006+
86007+ read_lock(&grsec_exec_file_lock);
86008+ if (unlikely(!task->exec_file)) {
86009+ read_unlock(&grsec_exec_file_lock);
86010+ return 0;
86011+ }
86012+
86013+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
86014+ read_unlock(&grsec_exec_file_lock);
86015+
86016+ if (retmode & GR_NOPTRACE) {
86017+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86018+ return 1;
86019+ }
86020+
86021+ if (retmode & GR_PTRACERD) {
86022+ switch (request) {
86023+ case PTRACE_SEIZE:
86024+ case PTRACE_POKETEXT:
86025+ case PTRACE_POKEDATA:
86026+ case PTRACE_POKEUSR:
86027+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
86028+ case PTRACE_SETREGS:
86029+ case PTRACE_SETFPREGS:
86030+#endif
86031+#ifdef CONFIG_X86
86032+ case PTRACE_SETFPXREGS:
86033+#endif
86034+#ifdef CONFIG_ALTIVEC
86035+ case PTRACE_SETVRREGS:
86036+#endif
86037+ return 1;
86038+ default:
86039+ return 0;
86040+ }
86041+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
86042+ !(current->role->roletype & GR_ROLE_GOD) &&
86043+ (current->acl != task->acl)) {
86044+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86045+ return 1;
86046+ }
86047+
86048+ return 0;
86049+}
86050+
86051+static int is_writable_mmap(const struct file *filp)
86052+{
86053+ struct task_struct *task = current;
86054+ struct acl_object_label *obj, *obj2;
86055+ struct dentry *dentry = filp->f_path.dentry;
86056+ struct vfsmount *mnt = filp->f_path.mnt;
86057+ struct inode *inode = d_backing_inode(dentry);
86058+
86059+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
86060+ !task->is_writable && d_is_reg(dentry) && (mnt != shm_mnt || (inode->i_nlink > 0))) {
86061+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
86062+ obj2 = chk_obj_label(dentry, mnt, task->role->root_label);
86063+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
86064+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, dentry, mnt);
86065+ return 1;
86066+ }
86067+ }
86068+ return 0;
86069+}
86070+
86071+int
86072+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
86073+{
86074+ __u32 mode;
86075+
86076+ if (unlikely(!file || !(prot & PROT_EXEC)))
86077+ return 1;
86078+
86079+ if (is_writable_mmap(file))
86080+ return 0;
86081+
86082+ mode =
86083+ gr_search_file(file->f_path.dentry,
86084+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86085+ file->f_path.mnt);
86086+
86087+ if (!gr_tpe_allow(file))
86088+ return 0;
86089+
86090+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86091+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86092+ return 0;
86093+ } else if (unlikely(!(mode & GR_EXEC))) {
86094+ return 0;
86095+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86096+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86097+ return 1;
86098+ }
86099+
86100+ return 1;
86101+}
86102+
86103+int
86104+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
86105+{
86106+ __u32 mode;
86107+
86108+ if (unlikely(!file || !(prot & PROT_EXEC)))
86109+ return 1;
86110+
86111+ if (is_writable_mmap(file))
86112+ return 0;
86113+
86114+ mode =
86115+ gr_search_file(file->f_path.dentry,
86116+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86117+ file->f_path.mnt);
86118+
86119+ if (!gr_tpe_allow(file))
86120+ return 0;
86121+
86122+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86123+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86124+ return 0;
86125+ } else if (unlikely(!(mode & GR_EXEC))) {
86126+ return 0;
86127+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86128+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86129+ return 1;
86130+ }
86131+
86132+ return 1;
86133+}
86134+
86135+void
86136+gr_acl_handle_psacct(struct task_struct *task, const long code)
86137+{
86138+ unsigned long runtime, cputime;
86139+ cputime_t utime, stime;
86140+ unsigned int wday, cday;
86141+ __u8 whr, chr;
86142+ __u8 wmin, cmin;
86143+ __u8 wsec, csec;
86144+ struct timespec curtime, starttime;
86145+
86146+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
86147+ !(task->acl->mode & GR_PROCACCT)))
86148+ return;
86149+
86150+ curtime = ns_to_timespec(ktime_get_ns());
86151+ starttime = ns_to_timespec(task->start_time);
86152+ runtime = curtime.tv_sec - starttime.tv_sec;
86153+ wday = runtime / (60 * 60 * 24);
86154+ runtime -= wday * (60 * 60 * 24);
86155+ whr = runtime / (60 * 60);
86156+ runtime -= whr * (60 * 60);
86157+ wmin = runtime / 60;
86158+ runtime -= wmin * 60;
86159+ wsec = runtime;
86160+
86161+ task_cputime(task, &utime, &stime);
86162+ cputime = cputime_to_secs(utime + stime);
86163+ cday = cputime / (60 * 60 * 24);
86164+ cputime -= cday * (60 * 60 * 24);
86165+ chr = cputime / (60 * 60);
86166+ cputime -= chr * (60 * 60);
86167+ cmin = cputime / 60;
86168+ cputime -= cmin * 60;
86169+ csec = cputime;
86170+
86171+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
86172+
86173+ return;
86174+}
86175+
86176+#ifdef CONFIG_TASKSTATS
86177+int gr_is_taskstats_denied(int pid)
86178+{
86179+ struct task_struct *task;
86180+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86181+ const struct cred *cred;
86182+#endif
86183+ int ret = 0;
86184+
86185+ /* restrict taskstats viewing to un-chrooted root users
86186+ who have the 'view' subject flag if the RBAC system is enabled
86187+ */
86188+
86189+ rcu_read_lock();
86190+ read_lock(&tasklist_lock);
86191+ task = find_task_by_vpid(pid);
86192+ if (task) {
86193+#ifdef CONFIG_GRKERNSEC_CHROOT
86194+ if (proc_is_chrooted(task))
86195+ ret = -EACCES;
86196+#endif
86197+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86198+ cred = __task_cred(task);
86199+#ifdef CONFIG_GRKERNSEC_PROC_USER
86200+ if (gr_is_global_nonroot(cred->uid))
86201+ ret = -EACCES;
86202+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86203+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
86204+ ret = -EACCES;
86205+#endif
86206+#endif
86207+ if (gr_status & GR_READY) {
86208+ if (!(task->acl->mode & GR_VIEW))
86209+ ret = -EACCES;
86210+ }
86211+ } else
86212+ ret = -ENOENT;
86213+
86214+ read_unlock(&tasklist_lock);
86215+ rcu_read_unlock();
86216+
86217+ return ret;
86218+}
86219+#endif
86220+
86221+/* AUXV entries are filled via a descendant of search_binary_handler
86222+ after we've already applied the subject for the target
86223+*/
86224+int gr_acl_enable_at_secure(void)
86225+{
86226+ if (unlikely(!(gr_status & GR_READY)))
86227+ return 0;
86228+
86229+ if (current->acl->mode & GR_ATSECURE)
86230+ return 1;
86231+
86232+ return 0;
86233+}
86234+
86235+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
86236+{
86237+ struct task_struct *task = current;
86238+ struct dentry *dentry = file->f_path.dentry;
86239+ struct vfsmount *mnt = file->f_path.mnt;
86240+ struct acl_object_label *obj, *tmp;
86241+ struct acl_subject_label *subj;
86242+ unsigned int bufsize;
86243+ int is_not_root;
86244+ char *path;
86245+ dev_t dev = __get_dev(dentry);
86246+
86247+ if (unlikely(!(gr_status & GR_READY)))
86248+ return 1;
86249+
86250+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
86251+ return 1;
86252+
86253+ /* ignore Eric Biederman */
86254+ if (IS_PRIVATE(d_backing_inode(dentry)))
86255+ return 1;
86256+
86257+ subj = task->acl;
86258+ read_lock(&gr_inode_lock);
86259+ do {
86260+ obj = lookup_acl_obj_label(ino, dev, subj);
86261+ if (obj != NULL) {
86262+ read_unlock(&gr_inode_lock);
86263+ return (obj->mode & GR_FIND) ? 1 : 0;
86264+ }
86265+ } while ((subj = subj->parent_subject));
86266+ read_unlock(&gr_inode_lock);
86267+
86268+ /* this is purely an optimization since we're looking for an object
86269+ for the directory we're doing a readdir on
86270+ if it's possible for any globbed object to match the entry we're
86271+ filling into the directory, then the object we find here will be
86272+ an anchor point with attached globbed objects
86273+ */
86274+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
86275+ if (obj->globbed == NULL)
86276+ return (obj->mode & GR_FIND) ? 1 : 0;
86277+
86278+ is_not_root = ((obj->filename[0] == '/') &&
86279+ (obj->filename[1] == '\0')) ? 0 : 1;
86280+ bufsize = PAGE_SIZE - namelen - is_not_root;
86281+
86282+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
86283+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
86284+ return 1;
86285+
86286+ preempt_disable();
86287+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
86288+ bufsize);
86289+
86290+ bufsize = strlen(path);
86291+
86292+ /* if base is "/", don't append an additional slash */
86293+ if (is_not_root)
86294+ *(path + bufsize) = '/';
86295+ memcpy(path + bufsize + is_not_root, name, namelen);
86296+ *(path + bufsize + namelen + is_not_root) = '\0';
86297+
86298+ tmp = obj->globbed;
86299+ while (tmp) {
86300+ if (!glob_match(tmp->filename, path)) {
86301+ preempt_enable();
86302+ return (tmp->mode & GR_FIND) ? 1 : 0;
86303+ }
86304+ tmp = tmp->next;
86305+ }
86306+ preempt_enable();
86307+ return (obj->mode & GR_FIND) ? 1 : 0;
86308+}
86309+
86310+void gr_put_exec_file(struct task_struct *task)
86311+{
86312+ struct file *filp;
86313+
86314+ write_lock(&grsec_exec_file_lock);
86315+ filp = task->exec_file;
86316+ task->exec_file = NULL;
86317+ write_unlock(&grsec_exec_file_lock);
86318+
86319+ if (filp)
86320+ fput(filp);
86321+
86322+ return;
86323+}
86324+
86325+
86326+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
86327+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
86328+#endif
86329+#ifdef CONFIG_SECURITY
86330+EXPORT_SYMBOL_GPL(gr_check_user_change);
86331+EXPORT_SYMBOL_GPL(gr_check_group_change);
86332+#endif
86333+
86334diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
86335new file mode 100644
86336index 0000000..9adc75c
86337--- /dev/null
86338+++ b/grsecurity/gracl_alloc.c
86339@@ -0,0 +1,105 @@
86340+#include <linux/kernel.h>
86341+#include <linux/mm.h>
86342+#include <linux/slab.h>
86343+#include <linux/vmalloc.h>
86344+#include <linux/gracl.h>
86345+#include <linux/grsecurity.h>
86346+
86347+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
86348+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
86349+
86350+static int
86351+alloc_pop(void)
86352+{
86353+ if (current_alloc_state->alloc_stack_next == 1)
86354+ return 0;
86355+
86356+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
86357+
86358+ current_alloc_state->alloc_stack_next--;
86359+
86360+ return 1;
86361+}
86362+
86363+static int
86364+alloc_push(void *buf)
86365+{
86366+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
86367+ return 1;
86368+
86369+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
86370+
86371+ current_alloc_state->alloc_stack_next++;
86372+
86373+ return 0;
86374+}
86375+
86376+void *
86377+acl_alloc(unsigned long len)
86378+{
86379+ void *ret = NULL;
86380+
86381+ if (!len || len > PAGE_SIZE)
86382+ goto out;
86383+
86384+ ret = kmalloc(len, GFP_KERNEL);
86385+
86386+ if (ret) {
86387+ if (alloc_push(ret)) {
86388+ kfree(ret);
86389+ ret = NULL;
86390+ }
86391+ }
86392+
86393+out:
86394+ return ret;
86395+}
86396+
86397+void *
86398+acl_alloc_num(unsigned long num, unsigned long len)
86399+{
86400+ if (!len || (num > (PAGE_SIZE / len)))
86401+ return NULL;
86402+
86403+ return acl_alloc(num * len);
86404+}
86405+
86406+void
86407+acl_free_all(void)
86408+{
86409+ if (!current_alloc_state->alloc_stack)
86410+ return;
86411+
86412+ while (alloc_pop()) ;
86413+
86414+ if (current_alloc_state->alloc_stack) {
86415+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
86416+ kfree(current_alloc_state->alloc_stack);
86417+ else
86418+ vfree(current_alloc_state->alloc_stack);
86419+ }
86420+
86421+ current_alloc_state->alloc_stack = NULL;
86422+ current_alloc_state->alloc_stack_size = 1;
86423+ current_alloc_state->alloc_stack_next = 1;
86424+
86425+ return;
86426+}
86427+
86428+int
86429+acl_alloc_stack_init(unsigned long size)
86430+{
86431+ if ((size * sizeof (void *)) <= PAGE_SIZE)
86432+ current_alloc_state->alloc_stack =
86433+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
86434+ else
86435+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
86436+
86437+ current_alloc_state->alloc_stack_size = size;
86438+ current_alloc_state->alloc_stack_next = 1;
86439+
86440+ if (!current_alloc_state->alloc_stack)
86441+ return 0;
86442+ else
86443+ return 1;
86444+}
86445diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
86446new file mode 100644
86447index 0000000..1a94c11
86448--- /dev/null
86449+++ b/grsecurity/gracl_cap.c
86450@@ -0,0 +1,127 @@
86451+#include <linux/kernel.h>
86452+#include <linux/module.h>
86453+#include <linux/sched.h>
86454+#include <linux/gracl.h>
86455+#include <linux/grsecurity.h>
86456+#include <linux/grinternal.h>
86457+
86458+extern const char *captab_log[];
86459+extern int captab_log_entries;
86460+
86461+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
86462+{
86463+ struct acl_subject_label *curracl;
86464+
86465+ if (!gr_acl_is_enabled())
86466+ return 1;
86467+
86468+ curracl = task->acl;
86469+
86470+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
86471+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
86472+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
86473+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
86474+ gr_to_filename(task->exec_file->f_path.dentry,
86475+ task->exec_file->f_path.mnt) : curracl->filename,
86476+ curracl->filename, 0UL,
86477+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
86478+ return 1;
86479+ }
86480+
86481+ return 0;
86482+}
86483+
86484+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
86485+{
86486+ struct acl_subject_label *curracl;
86487+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86488+ kernel_cap_t cap_audit = __cap_empty_set;
86489+
86490+ if (!gr_acl_is_enabled())
86491+ return 1;
86492+
86493+ curracl = task->acl;
86494+
86495+ cap_drop = curracl->cap_lower;
86496+ cap_mask = curracl->cap_mask;
86497+ cap_audit = curracl->cap_invert_audit;
86498+
86499+ while ((curracl = curracl->parent_subject)) {
86500+ /* if the cap isn't specified in the current computed mask but is specified in the
86501+ current level subject, and is lowered in the current level subject, then add
86502+ it to the set of dropped capabilities
86503+ otherwise, add the current level subject's mask to the current computed mask
86504+ */
86505+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86506+ cap_raise(cap_mask, cap);
86507+ if (cap_raised(curracl->cap_lower, cap))
86508+ cap_raise(cap_drop, cap);
86509+ if (cap_raised(curracl->cap_invert_audit, cap))
86510+ cap_raise(cap_audit, cap);
86511+ }
86512+ }
86513+
86514+ if (!cap_raised(cap_drop, cap)) {
86515+ if (cap_raised(cap_audit, cap))
86516+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
86517+ return 1;
86518+ }
86519+
86520+ /* only learn the capability use if the process has the capability in the
86521+ general case, the two uses in sys.c of gr_learn_cap are an exception
86522+ to this rule to ensure any role transition involves what the full-learned
86523+ policy believes in a privileged process
86524+ */
86525+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
86526+ return 1;
86527+
86528+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
86529+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
86530+
86531+ return 0;
86532+}
86533+
86534+int
86535+gr_acl_is_capable(const int cap)
86536+{
86537+ return gr_task_acl_is_capable(current, current_cred(), cap);
86538+}
86539+
86540+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
86541+{
86542+ struct acl_subject_label *curracl;
86543+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86544+
86545+ if (!gr_acl_is_enabled())
86546+ return 1;
86547+
86548+ curracl = task->acl;
86549+
86550+ cap_drop = curracl->cap_lower;
86551+ cap_mask = curracl->cap_mask;
86552+
86553+ while ((curracl = curracl->parent_subject)) {
86554+ /* if the cap isn't specified in the current computed mask but is specified in the
86555+ current level subject, and is lowered in the current level subject, then add
86556+ it to the set of dropped capabilities
86557+ otherwise, add the current level subject's mask to the current computed mask
86558+ */
86559+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86560+ cap_raise(cap_mask, cap);
86561+ if (cap_raised(curracl->cap_lower, cap))
86562+ cap_raise(cap_drop, cap);
86563+ }
86564+ }
86565+
86566+ if (!cap_raised(cap_drop, cap))
86567+ return 1;
86568+
86569+ return 0;
86570+}
86571+
86572+int
86573+gr_acl_is_capable_nolog(const int cap)
86574+{
86575+ return gr_task_acl_is_capable_nolog(current, cap);
86576+}
86577+
86578diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
86579new file mode 100644
86580index 0000000..a43dd06
86581--- /dev/null
86582+++ b/grsecurity/gracl_compat.c
86583@@ -0,0 +1,269 @@
86584+#include <linux/kernel.h>
86585+#include <linux/gracl.h>
86586+#include <linux/compat.h>
86587+#include <linux/gracl_compat.h>
86588+
86589+#include <asm/uaccess.h>
86590+
86591+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
86592+{
86593+ struct gr_arg_wrapper_compat uwrapcompat;
86594+
86595+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
86596+ return -EFAULT;
86597+
86598+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
86599+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
86600+ return -EINVAL;
86601+
86602+ uwrap->arg = compat_ptr(uwrapcompat.arg);
86603+ uwrap->version = uwrapcompat.version;
86604+ uwrap->size = sizeof(struct gr_arg);
86605+
86606+ return 0;
86607+}
86608+
86609+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
86610+{
86611+ struct gr_arg_compat argcompat;
86612+
86613+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
86614+ return -EFAULT;
86615+
86616+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
86617+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
86618+ arg->role_db.num_roles = argcompat.role_db.num_roles;
86619+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
86620+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
86621+ arg->role_db.num_objects = argcompat.role_db.num_objects;
86622+
86623+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
86624+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
86625+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
86626+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
86627+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
86628+ arg->segv_device = argcompat.segv_device;
86629+ arg->segv_inode = argcompat.segv_inode;
86630+ arg->segv_uid = argcompat.segv_uid;
86631+ arg->num_sprole_pws = argcompat.num_sprole_pws;
86632+ arg->mode = argcompat.mode;
86633+
86634+ return 0;
86635+}
86636+
86637+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
86638+{
86639+ struct acl_object_label_compat objcompat;
86640+
86641+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
86642+ return -EFAULT;
86643+
86644+ obj->filename = compat_ptr(objcompat.filename);
86645+ obj->inode = objcompat.inode;
86646+ obj->device = objcompat.device;
86647+ obj->mode = objcompat.mode;
86648+
86649+ obj->nested = compat_ptr(objcompat.nested);
86650+ obj->globbed = compat_ptr(objcompat.globbed);
86651+
86652+ obj->prev = compat_ptr(objcompat.prev);
86653+ obj->next = compat_ptr(objcompat.next);
86654+
86655+ return 0;
86656+}
86657+
86658+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
86659+{
86660+ unsigned int i;
86661+ struct acl_subject_label_compat subjcompat;
86662+
86663+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
86664+ return -EFAULT;
86665+
86666+ subj->filename = compat_ptr(subjcompat.filename);
86667+ subj->inode = subjcompat.inode;
86668+ subj->device = subjcompat.device;
86669+ subj->mode = subjcompat.mode;
86670+ subj->cap_mask = subjcompat.cap_mask;
86671+ subj->cap_lower = subjcompat.cap_lower;
86672+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
86673+
86674+ for (i = 0; i < GR_NLIMITS; i++) {
86675+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
86676+ subj->res[i].rlim_cur = RLIM_INFINITY;
86677+ else
86678+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
86679+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
86680+ subj->res[i].rlim_max = RLIM_INFINITY;
86681+ else
86682+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
86683+ }
86684+ subj->resmask = subjcompat.resmask;
86685+
86686+ subj->user_trans_type = subjcompat.user_trans_type;
86687+ subj->group_trans_type = subjcompat.group_trans_type;
86688+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
86689+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
86690+ subj->user_trans_num = subjcompat.user_trans_num;
86691+ subj->group_trans_num = subjcompat.group_trans_num;
86692+
86693+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
86694+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
86695+ subj->ip_type = subjcompat.ip_type;
86696+ subj->ips = compat_ptr(subjcompat.ips);
86697+ subj->ip_num = subjcompat.ip_num;
86698+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
86699+
86700+ subj->crashes = subjcompat.crashes;
86701+ subj->expires = subjcompat.expires;
86702+
86703+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
86704+ subj->hash = compat_ptr(subjcompat.hash);
86705+ subj->prev = compat_ptr(subjcompat.prev);
86706+ subj->next = compat_ptr(subjcompat.next);
86707+
86708+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
86709+ subj->obj_hash_size = subjcompat.obj_hash_size;
86710+ subj->pax_flags = subjcompat.pax_flags;
86711+
86712+ return 0;
86713+}
86714+
86715+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
86716+{
86717+ struct acl_role_label_compat rolecompat;
86718+
86719+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
86720+ return -EFAULT;
86721+
86722+ role->rolename = compat_ptr(rolecompat.rolename);
86723+ role->uidgid = rolecompat.uidgid;
86724+ role->roletype = rolecompat.roletype;
86725+
86726+ role->auth_attempts = rolecompat.auth_attempts;
86727+ role->expires = rolecompat.expires;
86728+
86729+ role->root_label = compat_ptr(rolecompat.root_label);
86730+ role->hash = compat_ptr(rolecompat.hash);
86731+
86732+ role->prev = compat_ptr(rolecompat.prev);
86733+ role->next = compat_ptr(rolecompat.next);
86734+
86735+ role->transitions = compat_ptr(rolecompat.transitions);
86736+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
86737+ role->domain_children = compat_ptr(rolecompat.domain_children);
86738+ role->domain_child_num = rolecompat.domain_child_num;
86739+
86740+ role->umask = rolecompat.umask;
86741+
86742+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
86743+ role->subj_hash_size = rolecompat.subj_hash_size;
86744+
86745+ return 0;
86746+}
86747+
86748+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
86749+{
86750+ struct role_allowed_ip_compat roleip_compat;
86751+
86752+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
86753+ return -EFAULT;
86754+
86755+ roleip->addr = roleip_compat.addr;
86756+ roleip->netmask = roleip_compat.netmask;
86757+
86758+ roleip->prev = compat_ptr(roleip_compat.prev);
86759+ roleip->next = compat_ptr(roleip_compat.next);
86760+
86761+ return 0;
86762+}
86763+
86764+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
86765+{
86766+ struct role_transition_compat trans_compat;
86767+
86768+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
86769+ return -EFAULT;
86770+
86771+ trans->rolename = compat_ptr(trans_compat.rolename);
86772+
86773+ trans->prev = compat_ptr(trans_compat.prev);
86774+ trans->next = compat_ptr(trans_compat.next);
86775+
86776+ return 0;
86777+
86778+}
86779+
86780+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
86781+{
86782+ struct gr_hash_struct_compat hash_compat;
86783+
86784+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
86785+ return -EFAULT;
86786+
86787+ hash->table = compat_ptr(hash_compat.table);
86788+ hash->nametable = compat_ptr(hash_compat.nametable);
86789+ hash->first = compat_ptr(hash_compat.first);
86790+
86791+ hash->table_size = hash_compat.table_size;
86792+ hash->used_size = hash_compat.used_size;
86793+
86794+ hash->type = hash_compat.type;
86795+
86796+ return 0;
86797+}
86798+
86799+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
86800+{
86801+ compat_uptr_t ptrcompat;
86802+
86803+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
86804+ return -EFAULT;
86805+
86806+ *(void **)ptr = compat_ptr(ptrcompat);
86807+
86808+ return 0;
86809+}
86810+
86811+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
86812+{
86813+ struct acl_ip_label_compat ip_compat;
86814+
86815+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
86816+ return -EFAULT;
86817+
86818+ ip->iface = compat_ptr(ip_compat.iface);
86819+ ip->addr = ip_compat.addr;
86820+ ip->netmask = ip_compat.netmask;
86821+ ip->low = ip_compat.low;
86822+ ip->high = ip_compat.high;
86823+ ip->mode = ip_compat.mode;
86824+ ip->type = ip_compat.type;
86825+
86826+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
86827+
86828+ ip->prev = compat_ptr(ip_compat.prev);
86829+ ip->next = compat_ptr(ip_compat.next);
86830+
86831+ return 0;
86832+}
86833+
86834+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
86835+{
86836+ struct sprole_pw_compat pw_compat;
86837+
86838+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
86839+ return -EFAULT;
86840+
86841+ pw->rolename = compat_ptr(pw_compat.rolename);
86842+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
86843+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
86844+
86845+ return 0;
86846+}
86847+
86848+size_t get_gr_arg_wrapper_size_compat(void)
86849+{
86850+ return sizeof(struct gr_arg_wrapper_compat);
86851+}
86852+
86853diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
86854new file mode 100644
86855index 0000000..fce7f71
86856--- /dev/null
86857+++ b/grsecurity/gracl_fs.c
86858@@ -0,0 +1,448 @@
86859+#include <linux/kernel.h>
86860+#include <linux/sched.h>
86861+#include <linux/types.h>
86862+#include <linux/fs.h>
86863+#include <linux/file.h>
86864+#include <linux/stat.h>
86865+#include <linux/grsecurity.h>
86866+#include <linux/grinternal.h>
86867+#include <linux/gracl.h>
86868+
86869+umode_t
86870+gr_acl_umask(void)
86871+{
86872+ if (unlikely(!gr_acl_is_enabled()))
86873+ return 0;
86874+
86875+ return current->role->umask;
86876+}
86877+
86878+__u32
86879+gr_acl_handle_hidden_file(const struct dentry * dentry,
86880+ const struct vfsmount * mnt)
86881+{
86882+ __u32 mode;
86883+
86884+ if (unlikely(d_is_negative(dentry)))
86885+ return GR_FIND;
86886+
86887+ mode =
86888+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
86889+
86890+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
86891+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
86892+ return mode;
86893+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
86894+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
86895+ return 0;
86896+ } else if (unlikely(!(mode & GR_FIND)))
86897+ return 0;
86898+
86899+ return GR_FIND;
86900+}
86901+
86902+__u32
86903+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
86904+ int acc_mode)
86905+{
86906+ __u32 reqmode = GR_FIND;
86907+ __u32 mode;
86908+
86909+ if (unlikely(d_is_negative(dentry)))
86910+ return reqmode;
86911+
86912+ if (acc_mode & MAY_APPEND)
86913+ reqmode |= GR_APPEND;
86914+ else if (acc_mode & MAY_WRITE)
86915+ reqmode |= GR_WRITE;
86916+ if ((acc_mode & MAY_READ) && !d_is_dir(dentry))
86917+ reqmode |= GR_READ;
86918+
86919+ mode =
86920+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
86921+ mnt);
86922+
86923+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
86924+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
86925+ reqmode & GR_READ ? " reading" : "",
86926+ reqmode & GR_WRITE ? " writing" : reqmode &
86927+ GR_APPEND ? " appending" : "");
86928+ return reqmode;
86929+ } else
86930+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
86931+ {
86932+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
86933+ reqmode & GR_READ ? " reading" : "",
86934+ reqmode & GR_WRITE ? " writing" : reqmode &
86935+ GR_APPEND ? " appending" : "");
86936+ return 0;
86937+ } else if (unlikely((mode & reqmode) != reqmode))
86938+ return 0;
86939+
86940+ return reqmode;
86941+}
86942+
86943+__u32
86944+gr_acl_handle_creat(const struct dentry * dentry,
86945+ const struct dentry * p_dentry,
86946+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
86947+ const int imode)
86948+{
86949+ __u32 reqmode = GR_WRITE | GR_CREATE;
86950+ __u32 mode;
86951+
86952+ if (acc_mode & MAY_APPEND)
86953+ reqmode |= GR_APPEND;
86954+ // if a directory was required or the directory already exists, then
86955+ // don't count this open as a read
86956+ if ((acc_mode & MAY_READ) &&
86957+ !((open_flags & O_DIRECTORY) || d_is_dir(dentry)))
86958+ reqmode |= GR_READ;
86959+ if ((open_flags & O_CREAT) &&
86960+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
86961+ reqmode |= GR_SETID;
86962+
86963+ mode =
86964+ gr_check_create(dentry, p_dentry, p_mnt,
86965+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
86966+
86967+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
86968+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
86969+ reqmode & GR_READ ? " reading" : "",
86970+ reqmode & GR_WRITE ? " writing" : reqmode &
86971+ GR_APPEND ? " appending" : "");
86972+ return reqmode;
86973+ } else
86974+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
86975+ {
86976+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
86977+ reqmode & GR_READ ? " reading" : "",
86978+ reqmode & GR_WRITE ? " writing" : reqmode &
86979+ GR_APPEND ? " appending" : "");
86980+ return 0;
86981+ } else if (unlikely((mode & reqmode) != reqmode))
86982+ return 0;
86983+
86984+ return reqmode;
86985+}
86986+
86987+__u32
86988+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
86989+ const int fmode)
86990+{
86991+ __u32 mode, reqmode = GR_FIND;
86992+
86993+ if ((fmode & S_IXOTH) && !d_is_dir(dentry))
86994+ reqmode |= GR_EXEC;
86995+ if (fmode & S_IWOTH)
86996+ reqmode |= GR_WRITE;
86997+ if (fmode & S_IROTH)
86998+ reqmode |= GR_READ;
86999+
87000+ mode =
87001+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
87002+ mnt);
87003+
87004+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87005+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
87006+ reqmode & GR_READ ? " reading" : "",
87007+ reqmode & GR_WRITE ? " writing" : "",
87008+ reqmode & GR_EXEC ? " executing" : "");
87009+ return reqmode;
87010+ } else
87011+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87012+ {
87013+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
87014+ reqmode & GR_READ ? " reading" : "",
87015+ reqmode & GR_WRITE ? " writing" : "",
87016+ reqmode & GR_EXEC ? " executing" : "");
87017+ return 0;
87018+ } else if (unlikely((mode & reqmode) != reqmode))
87019+ return 0;
87020+
87021+ return reqmode;
87022+}
87023+
87024+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
87025+{
87026+ __u32 mode;
87027+
87028+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
87029+
87030+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87031+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
87032+ return mode;
87033+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87034+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
87035+ return 0;
87036+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87037+ return 0;
87038+
87039+ return (reqmode);
87040+}
87041+
87042+__u32
87043+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
87044+{
87045+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
87046+}
87047+
87048+__u32
87049+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
87050+{
87051+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
87052+}
87053+
87054+__u32
87055+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
87056+{
87057+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
87058+}
87059+
87060+__u32
87061+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
87062+{
87063+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
87064+}
87065+
87066+__u32
87067+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
87068+ umode_t *modeptr)
87069+{
87070+ umode_t mode;
87071+ struct inode *inode = d_backing_inode(dentry);
87072+
87073+ *modeptr &= ~gr_acl_umask();
87074+ mode = *modeptr;
87075+
87076+ if (unlikely(inode && S_ISSOCK(inode->i_mode)))
87077+ return 1;
87078+
87079+ if (unlikely(!d_is_dir(dentry) &&
87080+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
87081+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
87082+ GR_CHMOD_ACL_MSG);
87083+ } else {
87084+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
87085+ }
87086+}
87087+
87088+__u32
87089+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
87090+{
87091+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
87092+}
87093+
87094+__u32
87095+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
87096+{
87097+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
87098+}
87099+
87100+__u32
87101+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
87102+{
87103+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
87104+}
87105+
87106+__u32
87107+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
87108+{
87109+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
87110+}
87111+
87112+__u32
87113+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
87114+{
87115+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
87116+ GR_UNIXCONNECT_ACL_MSG);
87117+}
87118+
87119+/* hardlinks require at minimum create and link permission,
87120+ any additional privilege required is based on the
87121+ privilege of the file being linked to
87122+*/
87123+__u32
87124+gr_acl_handle_link(const struct dentry * new_dentry,
87125+ const struct dentry * parent_dentry,
87126+ const struct vfsmount * parent_mnt,
87127+ const struct dentry * old_dentry,
87128+ const struct vfsmount * old_mnt, const struct filename *to)
87129+{
87130+ __u32 mode;
87131+ __u32 needmode = GR_CREATE | GR_LINK;
87132+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
87133+
87134+ mode =
87135+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
87136+ old_mnt);
87137+
87138+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
87139+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87140+ return mode;
87141+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87142+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87143+ return 0;
87144+ } else if (unlikely((mode & needmode) != needmode))
87145+ return 0;
87146+
87147+ return 1;
87148+}
87149+
87150+__u32
87151+gr_acl_handle_symlink(const struct dentry * new_dentry,
87152+ const struct dentry * parent_dentry,
87153+ const struct vfsmount * parent_mnt, const struct filename *from)
87154+{
87155+ __u32 needmode = GR_WRITE | GR_CREATE;
87156+ __u32 mode;
87157+
87158+ mode =
87159+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
87160+ GR_CREATE | GR_AUDIT_CREATE |
87161+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
87162+
87163+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
87164+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87165+ return mode;
87166+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87167+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87168+ return 0;
87169+ } else if (unlikely((mode & needmode) != needmode))
87170+ return 0;
87171+
87172+ return (GR_WRITE | GR_CREATE);
87173+}
87174+
87175+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)
87176+{
87177+ __u32 mode;
87178+
87179+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
87180+
87181+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87182+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
87183+ return mode;
87184+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87185+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
87186+ return 0;
87187+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87188+ return 0;
87189+
87190+ return (reqmode);
87191+}
87192+
87193+__u32
87194+gr_acl_handle_mknod(const struct dentry * new_dentry,
87195+ const struct dentry * parent_dentry,
87196+ const struct vfsmount * parent_mnt,
87197+ const int mode)
87198+{
87199+ __u32 reqmode = GR_WRITE | GR_CREATE;
87200+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
87201+ reqmode |= GR_SETID;
87202+
87203+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87204+ reqmode, GR_MKNOD_ACL_MSG);
87205+}
87206+
87207+__u32
87208+gr_acl_handle_mkdir(const struct dentry *new_dentry,
87209+ const struct dentry *parent_dentry,
87210+ const struct vfsmount *parent_mnt)
87211+{
87212+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87213+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
87214+}
87215+
87216+#define RENAME_CHECK_SUCCESS(old, new) \
87217+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
87218+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
87219+
87220+int
87221+gr_acl_handle_rename(struct dentry *new_dentry,
87222+ struct dentry *parent_dentry,
87223+ const struct vfsmount *parent_mnt,
87224+ struct dentry *old_dentry,
87225+ struct inode *old_parent_inode,
87226+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
87227+{
87228+ __u32 comp1, comp2;
87229+ int error = 0;
87230+
87231+ if (unlikely(!gr_acl_is_enabled()))
87232+ return 0;
87233+
87234+ if (flags & RENAME_EXCHANGE) {
87235+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87236+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87237+ GR_SUPPRESS, parent_mnt);
87238+ comp2 =
87239+ gr_search_file(old_dentry,
87240+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87241+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87242+ } else if (d_is_negative(new_dentry)) {
87243+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
87244+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
87245+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
87246+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
87247+ GR_DELETE | GR_AUDIT_DELETE |
87248+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87249+ GR_SUPPRESS, old_mnt);
87250+ } else {
87251+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87252+ GR_CREATE | GR_DELETE |
87253+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
87254+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87255+ GR_SUPPRESS, parent_mnt);
87256+ comp2 =
87257+ gr_search_file(old_dentry,
87258+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87259+ GR_DELETE | GR_AUDIT_DELETE |
87260+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87261+ }
87262+
87263+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
87264+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
87265+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87266+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
87267+ && !(comp2 & GR_SUPPRESS)) {
87268+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87269+ error = -EACCES;
87270+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
87271+ error = -EACCES;
87272+
87273+ return error;
87274+}
87275+
87276+void
87277+gr_acl_handle_exit(void)
87278+{
87279+ u16 id;
87280+ char *rolename;
87281+
87282+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
87283+ !(current->role->roletype & GR_ROLE_PERSIST))) {
87284+ id = current->acl_role_id;
87285+ rolename = current->role->rolename;
87286+ gr_set_acls(1);
87287+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
87288+ }
87289+
87290+ gr_put_exec_file(current);
87291+ return;
87292+}
87293+
87294+int
87295+gr_acl_handle_procpidmem(const struct task_struct *task)
87296+{
87297+ if (unlikely(!gr_acl_is_enabled()))
87298+ return 0;
87299+
87300+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
87301+ !(current->acl->mode & GR_POVERRIDE) &&
87302+ !(current->role->roletype & GR_ROLE_GOD))
87303+ return -EACCES;
87304+
87305+ return 0;
87306+}
87307diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
87308new file mode 100644
87309index 0000000..ed6ee43
87310--- /dev/null
87311+++ b/grsecurity/gracl_ip.c
87312@@ -0,0 +1,386 @@
87313+#include <linux/kernel.h>
87314+#include <asm/uaccess.h>
87315+#include <asm/errno.h>
87316+#include <net/sock.h>
87317+#include <linux/file.h>
87318+#include <linux/fs.h>
87319+#include <linux/net.h>
87320+#include <linux/in.h>
87321+#include <linux/skbuff.h>
87322+#include <linux/ip.h>
87323+#include <linux/udp.h>
87324+#include <linux/types.h>
87325+#include <linux/sched.h>
87326+#include <linux/netdevice.h>
87327+#include <linux/inetdevice.h>
87328+#include <linux/gracl.h>
87329+#include <linux/grsecurity.h>
87330+#include <linux/grinternal.h>
87331+
87332+#define GR_BIND 0x01
87333+#define GR_CONNECT 0x02
87334+#define GR_INVERT 0x04
87335+#define GR_BINDOVERRIDE 0x08
87336+#define GR_CONNECTOVERRIDE 0x10
87337+#define GR_SOCK_FAMILY 0x20
87338+
87339+static const char * gr_protocols[IPPROTO_MAX] = {
87340+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
87341+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
87342+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
87343+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
87344+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
87345+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
87346+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
87347+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
87348+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
87349+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
87350+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
87351+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
87352+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
87353+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
87354+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
87355+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
87356+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
87357+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
87358+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
87359+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
87360+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
87361+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
87362+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
87363+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
87364+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
87365+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
87366+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
87367+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
87368+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
87369+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
87370+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
87371+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
87372+ };
87373+
87374+static const char * gr_socktypes[SOCK_MAX] = {
87375+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
87376+ "unknown:7", "unknown:8", "unknown:9", "packet"
87377+ };
87378+
87379+static const char * gr_sockfamilies[AF_MAX+1] = {
87380+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
87381+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
87382+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
87383+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf", "alg", "nfc", "vsock"
87384+ };
87385+
87386+const char *
87387+gr_proto_to_name(unsigned char proto)
87388+{
87389+ return gr_protocols[proto];
87390+}
87391+
87392+const char *
87393+gr_socktype_to_name(unsigned char type)
87394+{
87395+ return gr_socktypes[type];
87396+}
87397+
87398+const char *
87399+gr_sockfamily_to_name(unsigned char family)
87400+{
87401+ return gr_sockfamilies[family];
87402+}
87403+
87404+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
87405+
87406+int
87407+gr_search_socket(const int domain, const int type, const int protocol)
87408+{
87409+ struct acl_subject_label *curr;
87410+ const struct cred *cred = current_cred();
87411+
87412+ if (unlikely(!gr_acl_is_enabled()))
87413+ goto exit;
87414+
87415+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
87416+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
87417+ goto exit; // let the kernel handle it
87418+
87419+ curr = current->acl;
87420+
87421+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
87422+ /* the family is allowed, if this is PF_INET allow it only if
87423+ the extra sock type/protocol checks pass */
87424+ if (domain == PF_INET)
87425+ goto inet_check;
87426+ goto exit;
87427+ } else {
87428+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87429+ __u32 fakeip = 0;
87430+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87431+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87432+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87433+ gr_to_filename(current->exec_file->f_path.dentry,
87434+ current->exec_file->f_path.mnt) :
87435+ curr->filename, curr->filename,
87436+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
87437+ &current->signal->saved_ip);
87438+ goto exit;
87439+ }
87440+ goto exit_fail;
87441+ }
87442+
87443+inet_check:
87444+ /* the rest of this checking is for IPv4 only */
87445+ if (!curr->ips)
87446+ goto exit;
87447+
87448+ if ((curr->ip_type & (1U << type)) &&
87449+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
87450+ goto exit;
87451+
87452+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87453+ /* we don't place acls on raw sockets , and sometimes
87454+ dgram/ip sockets are opened for ioctl and not
87455+ bind/connect, so we'll fake a bind learn log */
87456+ if (type == SOCK_RAW || type == SOCK_PACKET) {
87457+ __u32 fakeip = 0;
87458+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87459+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87460+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87461+ gr_to_filename(current->exec_file->f_path.dentry,
87462+ current->exec_file->f_path.mnt) :
87463+ curr->filename, curr->filename,
87464+ &fakeip, 0, type,
87465+ protocol, GR_CONNECT, &current->signal->saved_ip);
87466+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
87467+ __u32 fakeip = 0;
87468+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87469+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87470+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87471+ gr_to_filename(current->exec_file->f_path.dentry,
87472+ current->exec_file->f_path.mnt) :
87473+ curr->filename, curr->filename,
87474+ &fakeip, 0, type,
87475+ protocol, GR_BIND, &current->signal->saved_ip);
87476+ }
87477+ /* we'll log when they use connect or bind */
87478+ goto exit;
87479+ }
87480+
87481+exit_fail:
87482+ if (domain == PF_INET)
87483+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
87484+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
87485+ else if (rcu_access_pointer(net_families[domain]) != NULL)
87486+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
87487+ gr_socktype_to_name(type), protocol);
87488+
87489+ return 0;
87490+exit:
87491+ return 1;
87492+}
87493+
87494+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)
87495+{
87496+ if ((ip->mode & mode) &&
87497+ (ip_port >= ip->low) &&
87498+ (ip_port <= ip->high) &&
87499+ ((ntohl(ip_addr) & our_netmask) ==
87500+ (ntohl(our_addr) & our_netmask))
87501+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
87502+ && (ip->type & (1U << type))) {
87503+ if (ip->mode & GR_INVERT)
87504+ return 2; // specifically denied
87505+ else
87506+ return 1; // allowed
87507+ }
87508+
87509+ return 0; // not specifically allowed, may continue parsing
87510+}
87511+
87512+static int
87513+gr_search_connectbind(const int full_mode, struct sock *sk,
87514+ struct sockaddr_in *addr, const int type)
87515+{
87516+ char iface[IFNAMSIZ] = {0};
87517+ struct acl_subject_label *curr;
87518+ struct acl_ip_label *ip;
87519+ struct inet_sock *isk;
87520+ struct net_device *dev;
87521+ struct in_device *idev;
87522+ unsigned long i;
87523+ int ret;
87524+ int mode = full_mode & (GR_BIND | GR_CONNECT);
87525+ __u32 ip_addr = 0;
87526+ __u32 our_addr;
87527+ __u32 our_netmask;
87528+ char *p;
87529+ __u16 ip_port = 0;
87530+ const struct cred *cred = current_cred();
87531+
87532+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
87533+ return 0;
87534+
87535+ curr = current->acl;
87536+ isk = inet_sk(sk);
87537+
87538+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
87539+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
87540+ addr->sin_addr.s_addr = curr->inaddr_any_override;
87541+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
87542+ struct sockaddr_in saddr;
87543+ int err;
87544+
87545+ saddr.sin_family = AF_INET;
87546+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
87547+ saddr.sin_port = isk->inet_sport;
87548+
87549+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87550+ if (err)
87551+ return err;
87552+
87553+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87554+ if (err)
87555+ return err;
87556+ }
87557+
87558+ if (!curr->ips)
87559+ return 0;
87560+
87561+ ip_addr = addr->sin_addr.s_addr;
87562+ ip_port = ntohs(addr->sin_port);
87563+
87564+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87565+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87566+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87567+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87568+ gr_to_filename(current->exec_file->f_path.dentry,
87569+ current->exec_file->f_path.mnt) :
87570+ curr->filename, curr->filename,
87571+ &ip_addr, ip_port, type,
87572+ sk->sk_protocol, mode, &current->signal->saved_ip);
87573+ return 0;
87574+ }
87575+
87576+ for (i = 0; i < curr->ip_num; i++) {
87577+ ip = *(curr->ips + i);
87578+ if (ip->iface != NULL) {
87579+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
87580+ p = strchr(iface, ':');
87581+ if (p != NULL)
87582+ *p = '\0';
87583+ dev = dev_get_by_name(sock_net(sk), iface);
87584+ if (dev == NULL)
87585+ continue;
87586+ idev = in_dev_get(dev);
87587+ if (idev == NULL) {
87588+ dev_put(dev);
87589+ continue;
87590+ }
87591+ rcu_read_lock();
87592+ for_ifa(idev) {
87593+ if (!strcmp(ip->iface, ifa->ifa_label)) {
87594+ our_addr = ifa->ifa_address;
87595+ our_netmask = 0xffffffff;
87596+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87597+ if (ret == 1) {
87598+ rcu_read_unlock();
87599+ in_dev_put(idev);
87600+ dev_put(dev);
87601+ return 0;
87602+ } else if (ret == 2) {
87603+ rcu_read_unlock();
87604+ in_dev_put(idev);
87605+ dev_put(dev);
87606+ goto denied;
87607+ }
87608+ }
87609+ } endfor_ifa(idev);
87610+ rcu_read_unlock();
87611+ in_dev_put(idev);
87612+ dev_put(dev);
87613+ } else {
87614+ our_addr = ip->addr;
87615+ our_netmask = ip->netmask;
87616+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87617+ if (ret == 1)
87618+ return 0;
87619+ else if (ret == 2)
87620+ goto denied;
87621+ }
87622+ }
87623+
87624+denied:
87625+ if (mode == GR_BIND)
87626+ 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));
87627+ else if (mode == GR_CONNECT)
87628+ 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));
87629+
87630+ return -EACCES;
87631+}
87632+
87633+int
87634+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
87635+{
87636+ /* always allow disconnection of dgram sockets with connect */
87637+ if (addr->sin_family == AF_UNSPEC)
87638+ return 0;
87639+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
87640+}
87641+
87642+int
87643+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
87644+{
87645+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
87646+}
87647+
87648+int gr_search_listen(struct socket *sock)
87649+{
87650+ struct sock *sk = sock->sk;
87651+ struct sockaddr_in addr;
87652+
87653+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
87654+ addr.sin_port = inet_sk(sk)->inet_sport;
87655+
87656+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
87657+}
87658+
87659+int gr_search_accept(struct socket *sock)
87660+{
87661+ struct sock *sk = sock->sk;
87662+ struct sockaddr_in addr;
87663+
87664+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
87665+ addr.sin_port = inet_sk(sk)->inet_sport;
87666+
87667+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
87668+}
87669+
87670+int
87671+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
87672+{
87673+ if (addr)
87674+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
87675+ else {
87676+ struct sockaddr_in sin;
87677+ const struct inet_sock *inet = inet_sk(sk);
87678+
87679+ sin.sin_addr.s_addr = inet->inet_daddr;
87680+ sin.sin_port = inet->inet_dport;
87681+
87682+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
87683+ }
87684+}
87685+
87686+int
87687+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
87688+{
87689+ struct sockaddr_in sin;
87690+
87691+ if (unlikely(skb->len < sizeof (struct udphdr)))
87692+ return 0; // skip this packet
87693+
87694+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
87695+ sin.sin_port = udp_hdr(skb)->source;
87696+
87697+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
87698+}
87699diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
87700new file mode 100644
87701index 0000000..25f54ef
87702--- /dev/null
87703+++ b/grsecurity/gracl_learn.c
87704@@ -0,0 +1,207 @@
87705+#include <linux/kernel.h>
87706+#include <linux/mm.h>
87707+#include <linux/sched.h>
87708+#include <linux/poll.h>
87709+#include <linux/string.h>
87710+#include <linux/file.h>
87711+#include <linux/types.h>
87712+#include <linux/vmalloc.h>
87713+#include <linux/grinternal.h>
87714+
87715+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
87716+ size_t count, loff_t *ppos);
87717+extern int gr_acl_is_enabled(void);
87718+
87719+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
87720+static int gr_learn_attached;
87721+
87722+/* use a 512k buffer */
87723+#define LEARN_BUFFER_SIZE (512 * 1024)
87724+
87725+static DEFINE_SPINLOCK(gr_learn_lock);
87726+static DEFINE_MUTEX(gr_learn_user_mutex);
87727+
87728+/* we need to maintain two buffers, so that the kernel context of grlearn
87729+ uses a semaphore around the userspace copying, and the other kernel contexts
87730+ use a spinlock when copying into the buffer, since they cannot sleep
87731+*/
87732+static char *learn_buffer;
87733+static char *learn_buffer_user;
87734+static int learn_buffer_len;
87735+static int learn_buffer_user_len;
87736+
87737+static ssize_t
87738+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
87739+{
87740+ DECLARE_WAITQUEUE(wait, current);
87741+ ssize_t retval = 0;
87742+
87743+ add_wait_queue(&learn_wait, &wait);
87744+ set_current_state(TASK_INTERRUPTIBLE);
87745+ do {
87746+ mutex_lock(&gr_learn_user_mutex);
87747+ spin_lock(&gr_learn_lock);
87748+ if (learn_buffer_len)
87749+ break;
87750+ spin_unlock(&gr_learn_lock);
87751+ mutex_unlock(&gr_learn_user_mutex);
87752+ if (file->f_flags & O_NONBLOCK) {
87753+ retval = -EAGAIN;
87754+ goto out;
87755+ }
87756+ if (signal_pending(current)) {
87757+ retval = -ERESTARTSYS;
87758+ goto out;
87759+ }
87760+
87761+ schedule();
87762+ } while (1);
87763+
87764+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
87765+ learn_buffer_user_len = learn_buffer_len;
87766+ retval = learn_buffer_len;
87767+ learn_buffer_len = 0;
87768+
87769+ spin_unlock(&gr_learn_lock);
87770+
87771+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
87772+ retval = -EFAULT;
87773+
87774+ mutex_unlock(&gr_learn_user_mutex);
87775+out:
87776+ set_current_state(TASK_RUNNING);
87777+ remove_wait_queue(&learn_wait, &wait);
87778+ return retval;
87779+}
87780+
87781+static unsigned int
87782+poll_learn(struct file * file, poll_table * wait)
87783+{
87784+ poll_wait(file, &learn_wait, wait);
87785+
87786+ if (learn_buffer_len)
87787+ return (POLLIN | POLLRDNORM);
87788+
87789+ return 0;
87790+}
87791+
87792+void
87793+gr_clear_learn_entries(void)
87794+{
87795+ char *tmp;
87796+
87797+ mutex_lock(&gr_learn_user_mutex);
87798+ spin_lock(&gr_learn_lock);
87799+ tmp = learn_buffer;
87800+ learn_buffer = NULL;
87801+ spin_unlock(&gr_learn_lock);
87802+ if (tmp)
87803+ vfree(tmp);
87804+ if (learn_buffer_user != NULL) {
87805+ vfree(learn_buffer_user);
87806+ learn_buffer_user = NULL;
87807+ }
87808+ learn_buffer_len = 0;
87809+ mutex_unlock(&gr_learn_user_mutex);
87810+
87811+ return;
87812+}
87813+
87814+void
87815+gr_add_learn_entry(const char *fmt, ...)
87816+{
87817+ va_list args;
87818+ unsigned int len;
87819+
87820+ if (!gr_learn_attached)
87821+ return;
87822+
87823+ spin_lock(&gr_learn_lock);
87824+
87825+ /* leave a gap at the end so we know when it's "full" but don't have to
87826+ compute the exact length of the string we're trying to append
87827+ */
87828+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
87829+ spin_unlock(&gr_learn_lock);
87830+ wake_up_interruptible(&learn_wait);
87831+ return;
87832+ }
87833+ if (learn_buffer == NULL) {
87834+ spin_unlock(&gr_learn_lock);
87835+ return;
87836+ }
87837+
87838+ va_start(args, fmt);
87839+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
87840+ va_end(args);
87841+
87842+ learn_buffer_len += len + 1;
87843+
87844+ spin_unlock(&gr_learn_lock);
87845+ wake_up_interruptible(&learn_wait);
87846+
87847+ return;
87848+}
87849+
87850+static int
87851+open_learn(struct inode *inode, struct file *file)
87852+{
87853+ if (file->f_mode & FMODE_READ && gr_learn_attached)
87854+ return -EBUSY;
87855+ if (file->f_mode & FMODE_READ) {
87856+ int retval = 0;
87857+ mutex_lock(&gr_learn_user_mutex);
87858+ if (learn_buffer == NULL)
87859+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
87860+ if (learn_buffer_user == NULL)
87861+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
87862+ if (learn_buffer == NULL) {
87863+ retval = -ENOMEM;
87864+ goto out_error;
87865+ }
87866+ if (learn_buffer_user == NULL) {
87867+ retval = -ENOMEM;
87868+ goto out_error;
87869+ }
87870+ learn_buffer_len = 0;
87871+ learn_buffer_user_len = 0;
87872+ gr_learn_attached = 1;
87873+out_error:
87874+ mutex_unlock(&gr_learn_user_mutex);
87875+ return retval;
87876+ }
87877+ return 0;
87878+}
87879+
87880+static int
87881+close_learn(struct inode *inode, struct file *file)
87882+{
87883+ if (file->f_mode & FMODE_READ) {
87884+ char *tmp = NULL;
87885+ mutex_lock(&gr_learn_user_mutex);
87886+ spin_lock(&gr_learn_lock);
87887+ tmp = learn_buffer;
87888+ learn_buffer = NULL;
87889+ spin_unlock(&gr_learn_lock);
87890+ if (tmp)
87891+ vfree(tmp);
87892+ if (learn_buffer_user != NULL) {
87893+ vfree(learn_buffer_user);
87894+ learn_buffer_user = NULL;
87895+ }
87896+ learn_buffer_len = 0;
87897+ learn_buffer_user_len = 0;
87898+ gr_learn_attached = 0;
87899+ mutex_unlock(&gr_learn_user_mutex);
87900+ }
87901+
87902+ return 0;
87903+}
87904+
87905+const struct file_operations grsec_fops = {
87906+ .read = read_learn,
87907+ .write = write_grsec_handler,
87908+ .open = open_learn,
87909+ .release = close_learn,
87910+ .poll = poll_learn,
87911+};
87912diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
87913new file mode 100644
87914index 0000000..0773423
87915--- /dev/null
87916+++ b/grsecurity/gracl_policy.c
87917@@ -0,0 +1,1786 @@
87918+#include <linux/kernel.h>
87919+#include <linux/module.h>
87920+#include <linux/sched.h>
87921+#include <linux/mm.h>
87922+#include <linux/file.h>
87923+#include <linux/fs.h>
87924+#include <linux/namei.h>
87925+#include <linux/mount.h>
87926+#include <linux/tty.h>
87927+#include <linux/proc_fs.h>
87928+#include <linux/lglock.h>
87929+#include <linux/slab.h>
87930+#include <linux/vmalloc.h>
87931+#include <linux/types.h>
87932+#include <linux/sysctl.h>
87933+#include <linux/netdevice.h>
87934+#include <linux/ptrace.h>
87935+#include <linux/gracl.h>
87936+#include <linux/gralloc.h>
87937+#include <linux/security.h>
87938+#include <linux/grinternal.h>
87939+#include <linux/pid_namespace.h>
87940+#include <linux/stop_machine.h>
87941+#include <linux/fdtable.h>
87942+#include <linux/percpu.h>
87943+#include <linux/lglock.h>
87944+#include <linux/hugetlb.h>
87945+#include <linux/posix-timers.h>
87946+#include "../fs/mount.h"
87947+
87948+#include <asm/uaccess.h>
87949+#include <asm/errno.h>
87950+#include <asm/mman.h>
87951+
87952+extern struct gr_policy_state *polstate;
87953+
87954+#define FOR_EACH_ROLE_START(role) \
87955+ role = polstate->role_list; \
87956+ while (role) {
87957+
87958+#define FOR_EACH_ROLE_END(role) \
87959+ role = role->prev; \
87960+ }
87961+
87962+struct path gr_real_root;
87963+
87964+extern struct gr_alloc_state *current_alloc_state;
87965+
87966+u16 acl_sp_role_value;
87967+
87968+static DEFINE_MUTEX(gr_dev_mutex);
87969+
87970+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
87971+extern void gr_clear_learn_entries(void);
87972+
87973+struct gr_arg *gr_usermode __read_only;
87974+unsigned char *gr_system_salt __read_only;
87975+unsigned char *gr_system_sum __read_only;
87976+
87977+static unsigned int gr_auth_attempts = 0;
87978+static unsigned long gr_auth_expires = 0UL;
87979+
87980+struct acl_object_label *fakefs_obj_rw;
87981+struct acl_object_label *fakefs_obj_rwx;
87982+
87983+extern int gr_init_uidset(void);
87984+extern void gr_free_uidset(void);
87985+extern void gr_remove_uid(uid_t uid);
87986+extern int gr_find_uid(uid_t uid);
87987+
87988+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);
87989+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
87990+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
87991+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
87992+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);
87993+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
87994+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
87995+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
87996+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
87997+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
87998+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
87999+extern void assign_special_role(const char *rolename);
88000+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
88001+extern int gr_rbac_disable(void *unused);
88002+extern void gr_enable_rbac_system(void);
88003+
88004+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
88005+{
88006+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
88007+ return -EFAULT;
88008+
88009+ return 0;
88010+}
88011+
88012+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
88013+{
88014+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
88015+ return -EFAULT;
88016+
88017+ return 0;
88018+}
88019+
88020+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
88021+{
88022+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
88023+ return -EFAULT;
88024+
88025+ return 0;
88026+}
88027+
88028+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
88029+{
88030+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
88031+ return -EFAULT;
88032+
88033+ return 0;
88034+}
88035+
88036+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
88037+{
88038+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
88039+ return -EFAULT;
88040+
88041+ return 0;
88042+}
88043+
88044+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
88045+{
88046+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
88047+ return -EFAULT;
88048+
88049+ return 0;
88050+}
88051+
88052+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
88053+{
88054+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
88055+ return -EFAULT;
88056+
88057+ return 0;
88058+}
88059+
88060+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
88061+{
88062+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
88063+ return -EFAULT;
88064+
88065+ return 0;
88066+}
88067+
88068+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
88069+{
88070+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
88071+ return -EFAULT;
88072+
88073+ return 0;
88074+}
88075+
88076+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
88077+{
88078+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
88079+ return -EFAULT;
88080+
88081+ if ((uwrap->version != GRSECURITY_VERSION) ||
88082+ (uwrap->size != sizeof(struct gr_arg)))
88083+ return -EINVAL;
88084+
88085+ return 0;
88086+}
88087+
88088+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
88089+{
88090+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
88091+ return -EFAULT;
88092+
88093+ return 0;
88094+}
88095+
88096+static size_t get_gr_arg_wrapper_size_normal(void)
88097+{
88098+ return sizeof(struct gr_arg_wrapper);
88099+}
88100+
88101+#ifdef CONFIG_COMPAT
88102+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
88103+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
88104+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
88105+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
88106+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
88107+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
88108+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
88109+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
88110+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
88111+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
88112+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
88113+extern size_t get_gr_arg_wrapper_size_compat(void);
88114+
88115+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
88116+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
88117+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
88118+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
88119+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
88120+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
88121+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
88122+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
88123+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
88124+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
88125+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
88126+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
88127+
88128+#else
88129+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
88130+#define copy_gr_arg copy_gr_arg_normal
88131+#define copy_gr_hash_struct copy_gr_hash_struct_normal
88132+#define copy_acl_object_label copy_acl_object_label_normal
88133+#define copy_acl_subject_label copy_acl_subject_label_normal
88134+#define copy_acl_role_label copy_acl_role_label_normal
88135+#define copy_acl_ip_label copy_acl_ip_label_normal
88136+#define copy_pointer_from_array copy_pointer_from_array_normal
88137+#define copy_sprole_pw copy_sprole_pw_normal
88138+#define copy_role_transition copy_role_transition_normal
88139+#define copy_role_allowed_ip copy_role_allowed_ip_normal
88140+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
88141+#endif
88142+
88143+static struct acl_subject_label *
88144+lookup_subject_map(const struct acl_subject_label *userp)
88145+{
88146+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
88147+ struct subject_map *match;
88148+
88149+ match = polstate->subj_map_set.s_hash[index];
88150+
88151+ while (match && match->user != userp)
88152+ match = match->next;
88153+
88154+ if (match != NULL)
88155+ return match->kernel;
88156+ else
88157+ return NULL;
88158+}
88159+
88160+static void
88161+insert_subj_map_entry(struct subject_map *subjmap)
88162+{
88163+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
88164+ struct subject_map **curr;
88165+
88166+ subjmap->prev = NULL;
88167+
88168+ curr = &polstate->subj_map_set.s_hash[index];
88169+ if (*curr != NULL)
88170+ (*curr)->prev = subjmap;
88171+
88172+ subjmap->next = *curr;
88173+ *curr = subjmap;
88174+
88175+ return;
88176+}
88177+
88178+static void
88179+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
88180+{
88181+ unsigned int index =
88182+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
88183+ struct acl_role_label **curr;
88184+ struct acl_role_label *tmp, *tmp2;
88185+
88186+ curr = &polstate->acl_role_set.r_hash[index];
88187+
88188+ /* simple case, slot is empty, just set it to our role */
88189+ if (*curr == NULL) {
88190+ *curr = role;
88191+ } else {
88192+ /* example:
88193+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
88194+ 2 -> 3
88195+ */
88196+ /* first check to see if we can already be reached via this slot */
88197+ tmp = *curr;
88198+ while (tmp && tmp != role)
88199+ tmp = tmp->next;
88200+ if (tmp == role) {
88201+ /* we don't need to add ourselves to this slot's chain */
88202+ return;
88203+ }
88204+ /* we need to add ourselves to this chain, two cases */
88205+ if (role->next == NULL) {
88206+ /* simple case, append the current chain to our role */
88207+ role->next = *curr;
88208+ *curr = role;
88209+ } else {
88210+ /* 1 -> 2 -> 3 -> 4
88211+ 2 -> 3 -> 4
88212+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
88213+ */
88214+ /* trickier case: walk our role's chain until we find
88215+ the role for the start of the current slot's chain */
88216+ tmp = role;
88217+ tmp2 = *curr;
88218+ while (tmp->next && tmp->next != tmp2)
88219+ tmp = tmp->next;
88220+ if (tmp->next == tmp2) {
88221+ /* from example above, we found 3, so just
88222+ replace this slot's chain with ours */
88223+ *curr = role;
88224+ } else {
88225+ /* we didn't find a subset of our role's chain
88226+ in the current slot's chain, so append their
88227+ chain to ours, and set us as the first role in
88228+ the slot's chain
88229+
88230+ we could fold this case with the case above,
88231+ but making it explicit for clarity
88232+ */
88233+ tmp->next = tmp2;
88234+ *curr = role;
88235+ }
88236+ }
88237+ }
88238+
88239+ return;
88240+}
88241+
88242+static void
88243+insert_acl_role_label(struct acl_role_label *role)
88244+{
88245+ int i;
88246+
88247+ if (polstate->role_list == NULL) {
88248+ polstate->role_list = role;
88249+ role->prev = NULL;
88250+ } else {
88251+ role->prev = polstate->role_list;
88252+ polstate->role_list = role;
88253+ }
88254+
88255+ /* used for hash chains */
88256+ role->next = NULL;
88257+
88258+ if (role->roletype & GR_ROLE_DOMAIN) {
88259+ for (i = 0; i < role->domain_child_num; i++)
88260+ __insert_acl_role_label(role, role->domain_children[i]);
88261+ } else
88262+ __insert_acl_role_label(role, role->uidgid);
88263+}
88264+
88265+static int
88266+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
88267+{
88268+ struct name_entry **curr, *nentry;
88269+ struct inodev_entry *ientry;
88270+ unsigned int len = strlen(name);
88271+ unsigned int key = full_name_hash(name, len);
88272+ unsigned int index = key % polstate->name_set.n_size;
88273+
88274+ curr = &polstate->name_set.n_hash[index];
88275+
88276+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
88277+ curr = &((*curr)->next);
88278+
88279+ if (*curr != NULL)
88280+ return 1;
88281+
88282+ nentry = acl_alloc(sizeof (struct name_entry));
88283+ if (nentry == NULL)
88284+ return 0;
88285+ ientry = acl_alloc(sizeof (struct inodev_entry));
88286+ if (ientry == NULL)
88287+ return 0;
88288+ ientry->nentry = nentry;
88289+
88290+ nentry->key = key;
88291+ nentry->name = name;
88292+ nentry->inode = inode;
88293+ nentry->device = device;
88294+ nentry->len = len;
88295+ nentry->deleted = deleted;
88296+
88297+ nentry->prev = NULL;
88298+ curr = &polstate->name_set.n_hash[index];
88299+ if (*curr != NULL)
88300+ (*curr)->prev = nentry;
88301+ nentry->next = *curr;
88302+ *curr = nentry;
88303+
88304+ /* insert us into the table searchable by inode/dev */
88305+ __insert_inodev_entry(polstate, ientry);
88306+
88307+ return 1;
88308+}
88309+
88310+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
88311+
88312+static void *
88313+create_table(__u32 * len, int elementsize)
88314+{
88315+ unsigned int table_sizes[] = {
88316+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
88317+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
88318+ 4194301, 8388593, 16777213, 33554393, 67108859
88319+ };
88320+ void *newtable = NULL;
88321+ unsigned int pwr = 0;
88322+
88323+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
88324+ table_sizes[pwr] <= *len)
88325+ pwr++;
88326+
88327+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
88328+ return newtable;
88329+
88330+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
88331+ newtable =
88332+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
88333+ else
88334+ newtable = vmalloc(table_sizes[pwr] * elementsize);
88335+
88336+ *len = table_sizes[pwr];
88337+
88338+ return newtable;
88339+}
88340+
88341+static int
88342+init_variables(const struct gr_arg *arg, bool reload)
88343+{
88344+ struct task_struct *reaper = init_pid_ns.child_reaper;
88345+ unsigned int stacksize;
88346+
88347+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
88348+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
88349+ polstate->name_set.n_size = arg->role_db.num_objects;
88350+ polstate->inodev_set.i_size = arg->role_db.num_objects;
88351+
88352+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
88353+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
88354+ return 1;
88355+
88356+ if (!reload) {
88357+ if (!gr_init_uidset())
88358+ return 1;
88359+ }
88360+
88361+ /* set up the stack that holds allocation info */
88362+
88363+ stacksize = arg->role_db.num_pointers + 5;
88364+
88365+ if (!acl_alloc_stack_init(stacksize))
88366+ return 1;
88367+
88368+ if (!reload) {
88369+ /* grab reference for the real root dentry and vfsmount */
88370+ get_fs_root(reaper->fs, &gr_real_root);
88371+
88372+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
88373+ 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));
88374+#endif
88375+
88376+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88377+ if (fakefs_obj_rw == NULL)
88378+ return 1;
88379+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
88380+
88381+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88382+ if (fakefs_obj_rwx == NULL)
88383+ return 1;
88384+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
88385+ }
88386+
88387+ polstate->subj_map_set.s_hash =
88388+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
88389+ polstate->acl_role_set.r_hash =
88390+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
88391+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
88392+ polstate->inodev_set.i_hash =
88393+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
88394+
88395+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
88396+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
88397+ return 1;
88398+
88399+ memset(polstate->subj_map_set.s_hash, 0,
88400+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
88401+ memset(polstate->acl_role_set.r_hash, 0,
88402+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
88403+ memset(polstate->name_set.n_hash, 0,
88404+ sizeof (struct name_entry *) * polstate->name_set.n_size);
88405+ memset(polstate->inodev_set.i_hash, 0,
88406+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
88407+
88408+ return 0;
88409+}
88410+
88411+/* free information not needed after startup
88412+ currently contains user->kernel pointer mappings for subjects
88413+*/
88414+
88415+static void
88416+free_init_variables(void)
88417+{
88418+ __u32 i;
88419+
88420+ if (polstate->subj_map_set.s_hash) {
88421+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
88422+ if (polstate->subj_map_set.s_hash[i]) {
88423+ kfree(polstate->subj_map_set.s_hash[i]);
88424+ polstate->subj_map_set.s_hash[i] = NULL;
88425+ }
88426+ }
88427+
88428+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
88429+ PAGE_SIZE)
88430+ kfree(polstate->subj_map_set.s_hash);
88431+ else
88432+ vfree(polstate->subj_map_set.s_hash);
88433+ }
88434+
88435+ return;
88436+}
88437+
88438+static void
88439+free_variables(bool reload)
88440+{
88441+ struct acl_subject_label *s;
88442+ struct acl_role_label *r;
88443+ struct task_struct *task, *task2;
88444+ unsigned int x;
88445+
88446+ if (!reload) {
88447+ gr_clear_learn_entries();
88448+
88449+ read_lock(&tasklist_lock);
88450+ do_each_thread(task2, task) {
88451+ task->acl_sp_role = 0;
88452+ task->acl_role_id = 0;
88453+ task->inherited = 0;
88454+ task->acl = NULL;
88455+ task->role = NULL;
88456+ } while_each_thread(task2, task);
88457+ read_unlock(&tasklist_lock);
88458+
88459+ kfree(fakefs_obj_rw);
88460+ fakefs_obj_rw = NULL;
88461+ kfree(fakefs_obj_rwx);
88462+ fakefs_obj_rwx = NULL;
88463+
88464+ /* release the reference to the real root dentry and vfsmount */
88465+ path_put(&gr_real_root);
88466+ memset(&gr_real_root, 0, sizeof(gr_real_root));
88467+ }
88468+
88469+ /* free all object hash tables */
88470+
88471+ FOR_EACH_ROLE_START(r)
88472+ if (r->subj_hash == NULL)
88473+ goto next_role;
88474+ FOR_EACH_SUBJECT_START(r, s, x)
88475+ if (s->obj_hash == NULL)
88476+ break;
88477+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88478+ kfree(s->obj_hash);
88479+ else
88480+ vfree(s->obj_hash);
88481+ FOR_EACH_SUBJECT_END(s, x)
88482+ FOR_EACH_NESTED_SUBJECT_START(r, s)
88483+ if (s->obj_hash == NULL)
88484+ break;
88485+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88486+ kfree(s->obj_hash);
88487+ else
88488+ vfree(s->obj_hash);
88489+ FOR_EACH_NESTED_SUBJECT_END(s)
88490+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
88491+ kfree(r->subj_hash);
88492+ else
88493+ vfree(r->subj_hash);
88494+ r->subj_hash = NULL;
88495+next_role:
88496+ FOR_EACH_ROLE_END(r)
88497+
88498+ acl_free_all();
88499+
88500+ if (polstate->acl_role_set.r_hash) {
88501+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
88502+ PAGE_SIZE)
88503+ kfree(polstate->acl_role_set.r_hash);
88504+ else
88505+ vfree(polstate->acl_role_set.r_hash);
88506+ }
88507+ if (polstate->name_set.n_hash) {
88508+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
88509+ PAGE_SIZE)
88510+ kfree(polstate->name_set.n_hash);
88511+ else
88512+ vfree(polstate->name_set.n_hash);
88513+ }
88514+
88515+ if (polstate->inodev_set.i_hash) {
88516+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
88517+ PAGE_SIZE)
88518+ kfree(polstate->inodev_set.i_hash);
88519+ else
88520+ vfree(polstate->inodev_set.i_hash);
88521+ }
88522+
88523+ if (!reload)
88524+ gr_free_uidset();
88525+
88526+ memset(&polstate->name_set, 0, sizeof (struct name_db));
88527+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
88528+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
88529+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
88530+
88531+ polstate->default_role = NULL;
88532+ polstate->kernel_role = NULL;
88533+ polstate->role_list = NULL;
88534+
88535+ return;
88536+}
88537+
88538+static struct acl_subject_label *
88539+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
88540+
88541+static int alloc_and_copy_string(char **name, unsigned int maxlen)
88542+{
88543+ unsigned int len = strnlen_user(*name, maxlen);
88544+ char *tmp;
88545+
88546+ if (!len || len >= maxlen)
88547+ return -EINVAL;
88548+
88549+ if ((tmp = (char *) acl_alloc(len)) == NULL)
88550+ return -ENOMEM;
88551+
88552+ if (copy_from_user(tmp, *name, len))
88553+ return -EFAULT;
88554+
88555+ tmp[len-1] = '\0';
88556+ *name = tmp;
88557+
88558+ return 0;
88559+}
88560+
88561+static int
88562+copy_user_glob(struct acl_object_label *obj)
88563+{
88564+ struct acl_object_label *g_tmp, **guser;
88565+ int error;
88566+
88567+ if (obj->globbed == NULL)
88568+ return 0;
88569+
88570+ guser = &obj->globbed;
88571+ while (*guser) {
88572+ g_tmp = (struct acl_object_label *)
88573+ acl_alloc(sizeof (struct acl_object_label));
88574+ if (g_tmp == NULL)
88575+ return -ENOMEM;
88576+
88577+ if (copy_acl_object_label(g_tmp, *guser))
88578+ return -EFAULT;
88579+
88580+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
88581+ if (error)
88582+ return error;
88583+
88584+ *guser = g_tmp;
88585+ guser = &(g_tmp->next);
88586+ }
88587+
88588+ return 0;
88589+}
88590+
88591+static int
88592+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
88593+ struct acl_role_label *role)
88594+{
88595+ struct acl_object_label *o_tmp;
88596+ int ret;
88597+
88598+ while (userp) {
88599+ if ((o_tmp = (struct acl_object_label *)
88600+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
88601+ return -ENOMEM;
88602+
88603+ if (copy_acl_object_label(o_tmp, userp))
88604+ return -EFAULT;
88605+
88606+ userp = o_tmp->prev;
88607+
88608+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
88609+ if (ret)
88610+ return ret;
88611+
88612+ insert_acl_obj_label(o_tmp, subj);
88613+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
88614+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
88615+ return -ENOMEM;
88616+
88617+ ret = copy_user_glob(o_tmp);
88618+ if (ret)
88619+ return ret;
88620+
88621+ if (o_tmp->nested) {
88622+ int already_copied;
88623+
88624+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
88625+ if (IS_ERR(o_tmp->nested))
88626+ return PTR_ERR(o_tmp->nested);
88627+
88628+ /* insert into nested subject list if we haven't copied this one yet
88629+ to prevent duplicate entries */
88630+ if (!already_copied) {
88631+ o_tmp->nested->next = role->hash->first;
88632+ role->hash->first = o_tmp->nested;
88633+ }
88634+ }
88635+ }
88636+
88637+ return 0;
88638+}
88639+
88640+static __u32
88641+count_user_subjs(struct acl_subject_label *userp)
88642+{
88643+ struct acl_subject_label s_tmp;
88644+ __u32 num = 0;
88645+
88646+ while (userp) {
88647+ if (copy_acl_subject_label(&s_tmp, userp))
88648+ break;
88649+
88650+ userp = s_tmp.prev;
88651+ }
88652+
88653+ return num;
88654+}
88655+
88656+static int
88657+copy_user_allowedips(struct acl_role_label *rolep)
88658+{
88659+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
88660+
88661+ ruserip = rolep->allowed_ips;
88662+
88663+ while (ruserip) {
88664+ rlast = rtmp;
88665+
88666+ if ((rtmp = (struct role_allowed_ip *)
88667+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
88668+ return -ENOMEM;
88669+
88670+ if (copy_role_allowed_ip(rtmp, ruserip))
88671+ return -EFAULT;
88672+
88673+ ruserip = rtmp->prev;
88674+
88675+ if (!rlast) {
88676+ rtmp->prev = NULL;
88677+ rolep->allowed_ips = rtmp;
88678+ } else {
88679+ rlast->next = rtmp;
88680+ rtmp->prev = rlast;
88681+ }
88682+
88683+ if (!ruserip)
88684+ rtmp->next = NULL;
88685+ }
88686+
88687+ return 0;
88688+}
88689+
88690+static int
88691+copy_user_transitions(struct acl_role_label *rolep)
88692+{
88693+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
88694+ int error;
88695+
88696+ rusertp = rolep->transitions;
88697+
88698+ while (rusertp) {
88699+ rlast = rtmp;
88700+
88701+ if ((rtmp = (struct role_transition *)
88702+ acl_alloc(sizeof (struct role_transition))) == NULL)
88703+ return -ENOMEM;
88704+
88705+ if (copy_role_transition(rtmp, rusertp))
88706+ return -EFAULT;
88707+
88708+ rusertp = rtmp->prev;
88709+
88710+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
88711+ if (error)
88712+ return error;
88713+
88714+ if (!rlast) {
88715+ rtmp->prev = NULL;
88716+ rolep->transitions = rtmp;
88717+ } else {
88718+ rlast->next = rtmp;
88719+ rtmp->prev = rlast;
88720+ }
88721+
88722+ if (!rusertp)
88723+ rtmp->next = NULL;
88724+ }
88725+
88726+ return 0;
88727+}
88728+
88729+static __u32 count_user_objs(const struct acl_object_label __user *userp)
88730+{
88731+ struct acl_object_label o_tmp;
88732+ __u32 num = 0;
88733+
88734+ while (userp) {
88735+ if (copy_acl_object_label(&o_tmp, userp))
88736+ break;
88737+
88738+ userp = o_tmp.prev;
88739+ num++;
88740+ }
88741+
88742+ return num;
88743+}
88744+
88745+static struct acl_subject_label *
88746+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
88747+{
88748+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
88749+ __u32 num_objs;
88750+ struct acl_ip_label **i_tmp, *i_utmp2;
88751+ struct gr_hash_struct ghash;
88752+ struct subject_map *subjmap;
88753+ unsigned int i_num;
88754+ int err;
88755+
88756+ if (already_copied != NULL)
88757+ *already_copied = 0;
88758+
88759+ s_tmp = lookup_subject_map(userp);
88760+
88761+ /* we've already copied this subject into the kernel, just return
88762+ the reference to it, and don't copy it over again
88763+ */
88764+ if (s_tmp) {
88765+ if (already_copied != NULL)
88766+ *already_copied = 1;
88767+ return(s_tmp);
88768+ }
88769+
88770+ if ((s_tmp = (struct acl_subject_label *)
88771+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
88772+ return ERR_PTR(-ENOMEM);
88773+
88774+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
88775+ if (subjmap == NULL)
88776+ return ERR_PTR(-ENOMEM);
88777+
88778+ subjmap->user = userp;
88779+ subjmap->kernel = s_tmp;
88780+ insert_subj_map_entry(subjmap);
88781+
88782+ if (copy_acl_subject_label(s_tmp, userp))
88783+ return ERR_PTR(-EFAULT);
88784+
88785+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
88786+ if (err)
88787+ return ERR_PTR(err);
88788+
88789+ if (!strcmp(s_tmp->filename, "/"))
88790+ role->root_label = s_tmp;
88791+
88792+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
88793+ return ERR_PTR(-EFAULT);
88794+
88795+ /* copy user and group transition tables */
88796+
88797+ if (s_tmp->user_trans_num) {
88798+ uid_t *uidlist;
88799+
88800+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
88801+ if (uidlist == NULL)
88802+ return ERR_PTR(-ENOMEM);
88803+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
88804+ return ERR_PTR(-EFAULT);
88805+
88806+ s_tmp->user_transitions = uidlist;
88807+ }
88808+
88809+ if (s_tmp->group_trans_num) {
88810+ gid_t *gidlist;
88811+
88812+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
88813+ if (gidlist == NULL)
88814+ return ERR_PTR(-ENOMEM);
88815+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
88816+ return ERR_PTR(-EFAULT);
88817+
88818+ s_tmp->group_transitions = gidlist;
88819+ }
88820+
88821+ /* set up object hash table */
88822+ num_objs = count_user_objs(ghash.first);
88823+
88824+ s_tmp->obj_hash_size = num_objs;
88825+ s_tmp->obj_hash =
88826+ (struct acl_object_label **)
88827+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
88828+
88829+ if (!s_tmp->obj_hash)
88830+ return ERR_PTR(-ENOMEM);
88831+
88832+ memset(s_tmp->obj_hash, 0,
88833+ s_tmp->obj_hash_size *
88834+ sizeof (struct acl_object_label *));
88835+
88836+ /* add in objects */
88837+ err = copy_user_objs(ghash.first, s_tmp, role);
88838+
88839+ if (err)
88840+ return ERR_PTR(err);
88841+
88842+ /* set pointer for parent subject */
88843+ if (s_tmp->parent_subject) {
88844+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
88845+
88846+ if (IS_ERR(s_tmp2))
88847+ return s_tmp2;
88848+
88849+ s_tmp->parent_subject = s_tmp2;
88850+ }
88851+
88852+ /* add in ip acls */
88853+
88854+ if (!s_tmp->ip_num) {
88855+ s_tmp->ips = NULL;
88856+ goto insert;
88857+ }
88858+
88859+ i_tmp =
88860+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
88861+ sizeof (struct acl_ip_label *));
88862+
88863+ if (!i_tmp)
88864+ return ERR_PTR(-ENOMEM);
88865+
88866+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
88867+ *(i_tmp + i_num) =
88868+ (struct acl_ip_label *)
88869+ acl_alloc(sizeof (struct acl_ip_label));
88870+ if (!*(i_tmp + i_num))
88871+ return ERR_PTR(-ENOMEM);
88872+
88873+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
88874+ return ERR_PTR(-EFAULT);
88875+
88876+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
88877+ return ERR_PTR(-EFAULT);
88878+
88879+ if ((*(i_tmp + i_num))->iface == NULL)
88880+ continue;
88881+
88882+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
88883+ if (err)
88884+ return ERR_PTR(err);
88885+ }
88886+
88887+ s_tmp->ips = i_tmp;
88888+
88889+insert:
88890+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
88891+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
88892+ return ERR_PTR(-ENOMEM);
88893+
88894+ return s_tmp;
88895+}
88896+
88897+static int
88898+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
88899+{
88900+ struct acl_subject_label s_pre;
88901+ struct acl_subject_label * ret;
88902+ int err;
88903+
88904+ while (userp) {
88905+ if (copy_acl_subject_label(&s_pre, userp))
88906+ return -EFAULT;
88907+
88908+ ret = do_copy_user_subj(userp, role, NULL);
88909+
88910+ err = PTR_ERR(ret);
88911+ if (IS_ERR(ret))
88912+ return err;
88913+
88914+ insert_acl_subj_label(ret, role);
88915+
88916+ userp = s_pre.prev;
88917+ }
88918+
88919+ return 0;
88920+}
88921+
88922+static int
88923+copy_user_acl(struct gr_arg *arg)
88924+{
88925+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
88926+ struct acl_subject_label *subj_list;
88927+ struct sprole_pw *sptmp;
88928+ struct gr_hash_struct *ghash;
88929+ uid_t *domainlist;
88930+ unsigned int r_num;
88931+ int err = 0;
88932+ __u16 i;
88933+ __u32 num_subjs;
88934+
88935+ /* we need a default and kernel role */
88936+ if (arg->role_db.num_roles < 2)
88937+ return -EINVAL;
88938+
88939+ /* copy special role authentication info from userspace */
88940+
88941+ polstate->num_sprole_pws = arg->num_sprole_pws;
88942+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
88943+
88944+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
88945+ return -ENOMEM;
88946+
88947+ for (i = 0; i < polstate->num_sprole_pws; i++) {
88948+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
88949+ if (!sptmp)
88950+ return -ENOMEM;
88951+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
88952+ return -EFAULT;
88953+
88954+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
88955+ if (err)
88956+ return err;
88957+
88958+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
88959+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
88960+#endif
88961+
88962+ polstate->acl_special_roles[i] = sptmp;
88963+ }
88964+
88965+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
88966+
88967+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
88968+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
88969+
88970+ if (!r_tmp)
88971+ return -ENOMEM;
88972+
88973+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
88974+ return -EFAULT;
88975+
88976+ if (copy_acl_role_label(r_tmp, r_utmp2))
88977+ return -EFAULT;
88978+
88979+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
88980+ if (err)
88981+ return err;
88982+
88983+ if (!strcmp(r_tmp->rolename, "default")
88984+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
88985+ polstate->default_role = r_tmp;
88986+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
88987+ polstate->kernel_role = r_tmp;
88988+ }
88989+
88990+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
88991+ return -ENOMEM;
88992+
88993+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
88994+ return -EFAULT;
88995+
88996+ r_tmp->hash = ghash;
88997+
88998+ num_subjs = count_user_subjs(r_tmp->hash->first);
88999+
89000+ r_tmp->subj_hash_size = num_subjs;
89001+ r_tmp->subj_hash =
89002+ (struct acl_subject_label **)
89003+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
89004+
89005+ if (!r_tmp->subj_hash)
89006+ return -ENOMEM;
89007+
89008+ err = copy_user_allowedips(r_tmp);
89009+ if (err)
89010+ return err;
89011+
89012+ /* copy domain info */
89013+ if (r_tmp->domain_children != NULL) {
89014+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
89015+ if (domainlist == NULL)
89016+ return -ENOMEM;
89017+
89018+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
89019+ return -EFAULT;
89020+
89021+ r_tmp->domain_children = domainlist;
89022+ }
89023+
89024+ err = copy_user_transitions(r_tmp);
89025+ if (err)
89026+ return err;
89027+
89028+ memset(r_tmp->subj_hash, 0,
89029+ r_tmp->subj_hash_size *
89030+ sizeof (struct acl_subject_label *));
89031+
89032+ /* acquire the list of subjects, then NULL out
89033+ the list prior to parsing the subjects for this role,
89034+ as during this parsing the list is replaced with a list
89035+ of *nested* subjects for the role
89036+ */
89037+ subj_list = r_tmp->hash->first;
89038+
89039+ /* set nested subject list to null */
89040+ r_tmp->hash->first = NULL;
89041+
89042+ err = copy_user_subjs(subj_list, r_tmp);
89043+
89044+ if (err)
89045+ return err;
89046+
89047+ insert_acl_role_label(r_tmp);
89048+ }
89049+
89050+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
89051+ return -EINVAL;
89052+
89053+ return err;
89054+}
89055+
89056+static int gracl_reload_apply_policies(void *reload)
89057+{
89058+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
89059+ struct task_struct *task, *task2;
89060+ struct acl_role_label *role, *rtmp;
89061+ struct acl_subject_label *subj;
89062+ const struct cred *cred;
89063+ int role_applied;
89064+ int ret = 0;
89065+
89066+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
89067+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
89068+
89069+ /* first make sure we'll be able to apply the new policy cleanly */
89070+ do_each_thread(task2, task) {
89071+ if (task->exec_file == NULL)
89072+ continue;
89073+ role_applied = 0;
89074+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89075+ /* preserve special roles */
89076+ FOR_EACH_ROLE_START(role)
89077+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89078+ rtmp = task->role;
89079+ task->role = role;
89080+ role_applied = 1;
89081+ break;
89082+ }
89083+ FOR_EACH_ROLE_END(role)
89084+ }
89085+ if (!role_applied) {
89086+ cred = __task_cred(task);
89087+ rtmp = task->role;
89088+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89089+ }
89090+ /* this handles non-nested inherited subjects, nested subjects will still
89091+ be dropped currently */
89092+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89093+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
89094+ /* change the role back so that we've made no modifications to the policy */
89095+ task->role = rtmp;
89096+
89097+ if (subj == NULL || task->tmpacl == NULL) {
89098+ ret = -EINVAL;
89099+ goto out;
89100+ }
89101+ } while_each_thread(task2, task);
89102+
89103+ /* now actually apply the policy */
89104+
89105+ do_each_thread(task2, task) {
89106+ if (task->exec_file) {
89107+ role_applied = 0;
89108+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89109+ /* preserve special roles */
89110+ FOR_EACH_ROLE_START(role)
89111+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89112+ task->role = role;
89113+ role_applied = 1;
89114+ break;
89115+ }
89116+ FOR_EACH_ROLE_END(role)
89117+ }
89118+ if (!role_applied) {
89119+ cred = __task_cred(task);
89120+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89121+ }
89122+ /* this handles non-nested inherited subjects, nested subjects will still
89123+ be dropped currently */
89124+ if (!reload_state->oldmode && task->inherited)
89125+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89126+ else {
89127+ /* looked up and tagged to the task previously */
89128+ subj = task->tmpacl;
89129+ }
89130+ /* subj will be non-null */
89131+ __gr_apply_subject_to_task(polstate, task, subj);
89132+ if (reload_state->oldmode) {
89133+ task->acl_role_id = 0;
89134+ task->acl_sp_role = 0;
89135+ task->inherited = 0;
89136+ }
89137+ } else {
89138+ // it's a kernel process
89139+ task->role = polstate->kernel_role;
89140+ task->acl = polstate->kernel_role->root_label;
89141+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
89142+ task->acl->mode &= ~GR_PROCFIND;
89143+#endif
89144+ }
89145+ } while_each_thread(task2, task);
89146+
89147+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
89148+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
89149+
89150+out:
89151+
89152+ return ret;
89153+}
89154+
89155+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
89156+{
89157+ struct gr_reload_state new_reload_state = { };
89158+ int err;
89159+
89160+ new_reload_state.oldpolicy_ptr = polstate;
89161+ new_reload_state.oldalloc_ptr = current_alloc_state;
89162+ new_reload_state.oldmode = oldmode;
89163+
89164+ current_alloc_state = &new_reload_state.newalloc;
89165+ polstate = &new_reload_state.newpolicy;
89166+
89167+ /* everything relevant is now saved off, copy in the new policy */
89168+ if (init_variables(args, true)) {
89169+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89170+ err = -ENOMEM;
89171+ goto error;
89172+ }
89173+
89174+ err = copy_user_acl(args);
89175+ free_init_variables();
89176+ if (err)
89177+ goto error;
89178+ /* the new policy is copied in, with the old policy available via saved_state
89179+ first go through applying roles, making sure to preserve special roles
89180+ then apply new subjects, making sure to preserve inherited and nested subjects,
89181+ though currently only inherited subjects will be preserved
89182+ */
89183+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
89184+ if (err)
89185+ goto error;
89186+
89187+ /* we've now applied the new policy, so restore the old policy state to free it */
89188+ polstate = &new_reload_state.oldpolicy;
89189+ current_alloc_state = &new_reload_state.oldalloc;
89190+ free_variables(true);
89191+
89192+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
89193+ to running_polstate/current_alloc_state inside stop_machine
89194+ */
89195+ err = 0;
89196+ goto out;
89197+error:
89198+ /* on error of loading the new policy, we'll just keep the previous
89199+ policy set around
89200+ */
89201+ free_variables(true);
89202+
89203+ /* doesn't affect runtime, but maintains consistent state */
89204+out:
89205+ polstate = new_reload_state.oldpolicy_ptr;
89206+ current_alloc_state = new_reload_state.oldalloc_ptr;
89207+
89208+ return err;
89209+}
89210+
89211+static int
89212+gracl_init(struct gr_arg *args)
89213+{
89214+ int error = 0;
89215+
89216+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
89217+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
89218+
89219+ if (init_variables(args, false)) {
89220+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89221+ error = -ENOMEM;
89222+ goto out;
89223+ }
89224+
89225+ error = copy_user_acl(args);
89226+ free_init_variables();
89227+ if (error)
89228+ goto out;
89229+
89230+ error = gr_set_acls(0);
89231+ if (error)
89232+ goto out;
89233+
89234+ gr_enable_rbac_system();
89235+
89236+ return 0;
89237+
89238+out:
89239+ free_variables(false);
89240+ return error;
89241+}
89242+
89243+static int
89244+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
89245+ unsigned char **sum)
89246+{
89247+ struct acl_role_label *r;
89248+ struct role_allowed_ip *ipp;
89249+ struct role_transition *trans;
89250+ unsigned int i;
89251+ int found = 0;
89252+ u32 curr_ip = current->signal->curr_ip;
89253+
89254+ current->signal->saved_ip = curr_ip;
89255+
89256+ /* check transition table */
89257+
89258+ for (trans = current->role->transitions; trans; trans = trans->next) {
89259+ if (!strcmp(rolename, trans->rolename)) {
89260+ found = 1;
89261+ break;
89262+ }
89263+ }
89264+
89265+ if (!found)
89266+ return 0;
89267+
89268+ /* handle special roles that do not require authentication
89269+ and check ip */
89270+
89271+ FOR_EACH_ROLE_START(r)
89272+ if (!strcmp(rolename, r->rolename) &&
89273+ (r->roletype & GR_ROLE_SPECIAL)) {
89274+ found = 0;
89275+ if (r->allowed_ips != NULL) {
89276+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
89277+ if ((ntohl(curr_ip) & ipp->netmask) ==
89278+ (ntohl(ipp->addr) & ipp->netmask))
89279+ found = 1;
89280+ }
89281+ } else
89282+ found = 2;
89283+ if (!found)
89284+ return 0;
89285+
89286+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
89287+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
89288+ *salt = NULL;
89289+ *sum = NULL;
89290+ return 1;
89291+ }
89292+ }
89293+ FOR_EACH_ROLE_END(r)
89294+
89295+ for (i = 0; i < polstate->num_sprole_pws; i++) {
89296+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
89297+ *salt = polstate->acl_special_roles[i]->salt;
89298+ *sum = polstate->acl_special_roles[i]->sum;
89299+ return 1;
89300+ }
89301+ }
89302+
89303+ return 0;
89304+}
89305+
89306+int gr_check_secure_terminal(struct task_struct *task)
89307+{
89308+ struct task_struct *p, *p2, *p3;
89309+ struct files_struct *files;
89310+ struct fdtable *fdt;
89311+ struct file *our_file = NULL, *file;
89312+ struct inode *our_inode = NULL;
89313+ int i;
89314+
89315+ if (task->signal->tty == NULL)
89316+ return 1;
89317+
89318+ files = get_files_struct(task);
89319+ if (files != NULL) {
89320+ rcu_read_lock();
89321+ fdt = files_fdtable(files);
89322+ for (i=0; i < fdt->max_fds; i++) {
89323+ file = fcheck_files(files, i);
89324+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
89325+ get_file(file);
89326+ our_file = file;
89327+ }
89328+ }
89329+ rcu_read_unlock();
89330+ put_files_struct(files);
89331+ }
89332+
89333+ if (our_file == NULL)
89334+ return 1;
89335+
89336+ our_inode = d_backing_inode(our_file->f_path.dentry);
89337+
89338+ read_lock(&tasklist_lock);
89339+ do_each_thread(p2, p) {
89340+ files = get_files_struct(p);
89341+ if (files == NULL ||
89342+ (p->signal && p->signal->tty == task->signal->tty)) {
89343+ if (files != NULL)
89344+ put_files_struct(files);
89345+ continue;
89346+ }
89347+ rcu_read_lock();
89348+ fdt = files_fdtable(files);
89349+ for (i=0; i < fdt->max_fds; i++) {
89350+ struct inode *inode = NULL;
89351+ file = fcheck_files(files, i);
89352+ if (file)
89353+ inode = d_backing_inode(file->f_path.dentry);
89354+ if (inode && S_ISCHR(inode->i_mode) && inode->i_rdev == our_inode->i_rdev) {
89355+ p3 = task;
89356+ while (task_pid_nr(p3) > 0) {
89357+ if (p3 == p)
89358+ break;
89359+ p3 = p3->real_parent;
89360+ }
89361+ if (p3 == p)
89362+ break;
89363+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
89364+ gr_handle_alertkill(p);
89365+ rcu_read_unlock();
89366+ put_files_struct(files);
89367+ read_unlock(&tasklist_lock);
89368+ fput(our_file);
89369+ return 0;
89370+ }
89371+ }
89372+ rcu_read_unlock();
89373+ put_files_struct(files);
89374+ } while_each_thread(p2, p);
89375+ read_unlock(&tasklist_lock);
89376+
89377+ fput(our_file);
89378+ return 1;
89379+}
89380+
89381+ssize_t
89382+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
89383+{
89384+ struct gr_arg_wrapper uwrap;
89385+ unsigned char *sprole_salt = NULL;
89386+ unsigned char *sprole_sum = NULL;
89387+ int error = 0;
89388+ int error2 = 0;
89389+ size_t req_count = 0;
89390+ unsigned char oldmode = 0;
89391+
89392+ mutex_lock(&gr_dev_mutex);
89393+
89394+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
89395+ error = -EPERM;
89396+ goto out;
89397+ }
89398+
89399+#ifdef CONFIG_COMPAT
89400+ pax_open_kernel();
89401+ if (is_compat_task()) {
89402+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
89403+ copy_gr_arg = &copy_gr_arg_compat;
89404+ copy_acl_object_label = &copy_acl_object_label_compat;
89405+ copy_acl_subject_label = &copy_acl_subject_label_compat;
89406+ copy_acl_role_label = &copy_acl_role_label_compat;
89407+ copy_acl_ip_label = &copy_acl_ip_label_compat;
89408+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
89409+ copy_role_transition = &copy_role_transition_compat;
89410+ copy_sprole_pw = &copy_sprole_pw_compat;
89411+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
89412+ copy_pointer_from_array = &copy_pointer_from_array_compat;
89413+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
89414+ } else {
89415+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
89416+ copy_gr_arg = &copy_gr_arg_normal;
89417+ copy_acl_object_label = &copy_acl_object_label_normal;
89418+ copy_acl_subject_label = &copy_acl_subject_label_normal;
89419+ copy_acl_role_label = &copy_acl_role_label_normal;
89420+ copy_acl_ip_label = &copy_acl_ip_label_normal;
89421+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
89422+ copy_role_transition = &copy_role_transition_normal;
89423+ copy_sprole_pw = &copy_sprole_pw_normal;
89424+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
89425+ copy_pointer_from_array = &copy_pointer_from_array_normal;
89426+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
89427+ }
89428+ pax_close_kernel();
89429+#endif
89430+
89431+ req_count = get_gr_arg_wrapper_size();
89432+
89433+ if (count != req_count) {
89434+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
89435+ error = -EINVAL;
89436+ goto out;
89437+ }
89438+
89439+
89440+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
89441+ gr_auth_expires = 0;
89442+ gr_auth_attempts = 0;
89443+ }
89444+
89445+ error = copy_gr_arg_wrapper(buf, &uwrap);
89446+ if (error)
89447+ goto out;
89448+
89449+ error = copy_gr_arg(uwrap.arg, gr_usermode);
89450+ if (error)
89451+ goto out;
89452+
89453+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89454+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89455+ time_after(gr_auth_expires, get_seconds())) {
89456+ error = -EBUSY;
89457+ goto out;
89458+ }
89459+
89460+ /* if non-root trying to do anything other than use a special role,
89461+ do not attempt authentication, do not count towards authentication
89462+ locking
89463+ */
89464+
89465+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
89466+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89467+ gr_is_global_nonroot(current_uid())) {
89468+ error = -EPERM;
89469+ goto out;
89470+ }
89471+
89472+ /* ensure pw and special role name are null terminated */
89473+
89474+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
89475+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
89476+
89477+ /* Okay.
89478+ * We have our enough of the argument structure..(we have yet
89479+ * to copy_from_user the tables themselves) . Copy the tables
89480+ * only if we need them, i.e. for loading operations. */
89481+
89482+ switch (gr_usermode->mode) {
89483+ case GR_STATUS:
89484+ if (gr_acl_is_enabled()) {
89485+ error = 1;
89486+ if (!gr_check_secure_terminal(current))
89487+ error = 3;
89488+ } else
89489+ error = 2;
89490+ goto out;
89491+ case GR_SHUTDOWN:
89492+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89493+ stop_machine(gr_rbac_disable, NULL, NULL);
89494+ free_variables(false);
89495+ memset(gr_usermode, 0, sizeof(struct gr_arg));
89496+ memset(gr_system_salt, 0, GR_SALT_LEN);
89497+ memset(gr_system_sum, 0, GR_SHA_LEN);
89498+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
89499+ } else if (gr_acl_is_enabled()) {
89500+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
89501+ error = -EPERM;
89502+ } else {
89503+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
89504+ error = -EAGAIN;
89505+ }
89506+ break;
89507+ case GR_ENABLE:
89508+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
89509+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
89510+ else {
89511+ if (gr_acl_is_enabled())
89512+ error = -EAGAIN;
89513+ else
89514+ error = error2;
89515+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
89516+ }
89517+ break;
89518+ case GR_OLDRELOAD:
89519+ oldmode = 1;
89520+ case GR_RELOAD:
89521+ if (!gr_acl_is_enabled()) {
89522+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
89523+ error = -EAGAIN;
89524+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89525+ error2 = gracl_reload(gr_usermode, oldmode);
89526+ if (!error2)
89527+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
89528+ else {
89529+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89530+ error = error2;
89531+ }
89532+ } else {
89533+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89534+ error = -EPERM;
89535+ }
89536+ break;
89537+ case GR_SEGVMOD:
89538+ if (unlikely(!gr_acl_is_enabled())) {
89539+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
89540+ error = -EAGAIN;
89541+ break;
89542+ }
89543+
89544+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89545+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
89546+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
89547+ struct acl_subject_label *segvacl;
89548+ segvacl =
89549+ lookup_acl_subj_label(gr_usermode->segv_inode,
89550+ gr_usermode->segv_device,
89551+ current->role);
89552+ if (segvacl) {
89553+ segvacl->crashes = 0;
89554+ segvacl->expires = 0;
89555+ }
89556+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
89557+ gr_remove_uid(gr_usermode->segv_uid);
89558+ }
89559+ } else {
89560+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
89561+ error = -EPERM;
89562+ }
89563+ break;
89564+ case GR_SPROLE:
89565+ case GR_SPROLEPAM:
89566+ if (unlikely(!gr_acl_is_enabled())) {
89567+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
89568+ error = -EAGAIN;
89569+ break;
89570+ }
89571+
89572+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
89573+ current->role->expires = 0;
89574+ current->role->auth_attempts = 0;
89575+ }
89576+
89577+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89578+ time_after(current->role->expires, get_seconds())) {
89579+ error = -EBUSY;
89580+ goto out;
89581+ }
89582+
89583+ if (lookup_special_role_auth
89584+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
89585+ && ((!sprole_salt && !sprole_sum)
89586+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
89587+ char *p = "";
89588+ assign_special_role(gr_usermode->sp_role);
89589+ read_lock(&tasklist_lock);
89590+ if (current->real_parent)
89591+ p = current->real_parent->role->rolename;
89592+ read_unlock(&tasklist_lock);
89593+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
89594+ p, acl_sp_role_value);
89595+ } else {
89596+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
89597+ error = -EPERM;
89598+ if(!(current->role->auth_attempts++))
89599+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89600+
89601+ goto out;
89602+ }
89603+ break;
89604+ case GR_UNSPROLE:
89605+ if (unlikely(!gr_acl_is_enabled())) {
89606+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
89607+ error = -EAGAIN;
89608+ break;
89609+ }
89610+
89611+ if (current->role->roletype & GR_ROLE_SPECIAL) {
89612+ char *p = "";
89613+ int i = 0;
89614+
89615+ read_lock(&tasklist_lock);
89616+ if (current->real_parent) {
89617+ p = current->real_parent->role->rolename;
89618+ i = current->real_parent->acl_role_id;
89619+ }
89620+ read_unlock(&tasklist_lock);
89621+
89622+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
89623+ gr_set_acls(1);
89624+ } else {
89625+ error = -EPERM;
89626+ goto out;
89627+ }
89628+ break;
89629+ default:
89630+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
89631+ error = -EINVAL;
89632+ break;
89633+ }
89634+
89635+ if (error != -EPERM)
89636+ goto out;
89637+
89638+ if(!(gr_auth_attempts++))
89639+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89640+
89641+ out:
89642+ mutex_unlock(&gr_dev_mutex);
89643+
89644+ if (!error)
89645+ error = req_count;
89646+
89647+ return error;
89648+}
89649+
89650+int
89651+gr_set_acls(const int type)
89652+{
89653+ struct task_struct *task, *task2;
89654+ struct acl_role_label *role = current->role;
89655+ struct acl_subject_label *subj;
89656+ __u16 acl_role_id = current->acl_role_id;
89657+ const struct cred *cred;
89658+ int ret;
89659+
89660+ rcu_read_lock();
89661+ read_lock(&tasklist_lock);
89662+ read_lock(&grsec_exec_file_lock);
89663+ do_each_thread(task2, task) {
89664+ /* check to see if we're called from the exit handler,
89665+ if so, only replace ACLs that have inherited the admin
89666+ ACL */
89667+
89668+ if (type && (task->role != role ||
89669+ task->acl_role_id != acl_role_id))
89670+ continue;
89671+
89672+ task->acl_role_id = 0;
89673+ task->acl_sp_role = 0;
89674+ task->inherited = 0;
89675+
89676+ if (task->exec_file) {
89677+ cred = __task_cred(task);
89678+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89679+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
89680+ if (subj == NULL) {
89681+ ret = -EINVAL;
89682+ read_unlock(&grsec_exec_file_lock);
89683+ read_unlock(&tasklist_lock);
89684+ rcu_read_unlock();
89685+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
89686+ return ret;
89687+ }
89688+ __gr_apply_subject_to_task(polstate, task, subj);
89689+ } else {
89690+ // it's a kernel process
89691+ task->role = polstate->kernel_role;
89692+ task->acl = polstate->kernel_role->root_label;
89693+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
89694+ task->acl->mode &= ~GR_PROCFIND;
89695+#endif
89696+ }
89697+ } while_each_thread(task2, task);
89698+ read_unlock(&grsec_exec_file_lock);
89699+ read_unlock(&tasklist_lock);
89700+ rcu_read_unlock();
89701+
89702+ return 0;
89703+}
89704diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
89705new file mode 100644
89706index 0000000..39645c9
89707--- /dev/null
89708+++ b/grsecurity/gracl_res.c
89709@@ -0,0 +1,68 @@
89710+#include <linux/kernel.h>
89711+#include <linux/sched.h>
89712+#include <linux/gracl.h>
89713+#include <linux/grinternal.h>
89714+
89715+static const char *restab_log[] = {
89716+ [RLIMIT_CPU] = "RLIMIT_CPU",
89717+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
89718+ [RLIMIT_DATA] = "RLIMIT_DATA",
89719+ [RLIMIT_STACK] = "RLIMIT_STACK",
89720+ [RLIMIT_CORE] = "RLIMIT_CORE",
89721+ [RLIMIT_RSS] = "RLIMIT_RSS",
89722+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
89723+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
89724+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
89725+ [RLIMIT_AS] = "RLIMIT_AS",
89726+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
89727+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
89728+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
89729+ [RLIMIT_NICE] = "RLIMIT_NICE",
89730+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
89731+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
89732+ [GR_CRASH_RES] = "RLIMIT_CRASH"
89733+};
89734+
89735+void
89736+gr_log_resource(const struct task_struct *task,
89737+ const int res, const unsigned long wanted, const int gt)
89738+{
89739+ const struct cred *cred;
89740+ unsigned long rlim;
89741+
89742+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
89743+ return;
89744+
89745+ // not yet supported resource
89746+ if (unlikely(!restab_log[res]))
89747+ return;
89748+
89749+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
89750+ rlim = task_rlimit_max(task, res);
89751+ else
89752+ rlim = task_rlimit(task, res);
89753+
89754+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
89755+ return;
89756+
89757+ rcu_read_lock();
89758+ cred = __task_cred(task);
89759+
89760+ if (res == RLIMIT_NPROC &&
89761+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
89762+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
89763+ goto out_rcu_unlock;
89764+ else if (res == RLIMIT_MEMLOCK &&
89765+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
89766+ goto out_rcu_unlock;
89767+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
89768+ goto out_rcu_unlock;
89769+ rcu_read_unlock();
89770+
89771+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
89772+
89773+ return;
89774+out_rcu_unlock:
89775+ rcu_read_unlock();
89776+ return;
89777+}
89778diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
89779new file mode 100644
89780index 0000000..21646aa
89781--- /dev/null
89782+++ b/grsecurity/gracl_segv.c
89783@@ -0,0 +1,304 @@
89784+#include <linux/kernel.h>
89785+#include <linux/mm.h>
89786+#include <asm/uaccess.h>
89787+#include <asm/errno.h>
89788+#include <asm/mman.h>
89789+#include <net/sock.h>
89790+#include <linux/file.h>
89791+#include <linux/fs.h>
89792+#include <linux/net.h>
89793+#include <linux/in.h>
89794+#include <linux/slab.h>
89795+#include <linux/types.h>
89796+#include <linux/sched.h>
89797+#include <linux/timer.h>
89798+#include <linux/gracl.h>
89799+#include <linux/grsecurity.h>
89800+#include <linux/grinternal.h>
89801+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
89802+#include <linux/magic.h>
89803+#include <linux/pagemap.h>
89804+#include "../fs/btrfs/async-thread.h"
89805+#include "../fs/btrfs/ctree.h"
89806+#include "../fs/btrfs/btrfs_inode.h"
89807+#endif
89808+
89809+static struct crash_uid *uid_set;
89810+static unsigned short uid_used;
89811+static DEFINE_SPINLOCK(gr_uid_lock);
89812+extern rwlock_t gr_inode_lock;
89813+extern struct acl_subject_label *
89814+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
89815+ struct acl_role_label *role);
89816+
89817+int
89818+gr_init_uidset(void)
89819+{
89820+ uid_set =
89821+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
89822+ uid_used = 0;
89823+
89824+ return uid_set ? 1 : 0;
89825+}
89826+
89827+void
89828+gr_free_uidset(void)
89829+{
89830+ if (uid_set) {
89831+ struct crash_uid *tmpset;
89832+ spin_lock(&gr_uid_lock);
89833+ tmpset = uid_set;
89834+ uid_set = NULL;
89835+ uid_used = 0;
89836+ spin_unlock(&gr_uid_lock);
89837+ if (tmpset)
89838+ kfree(tmpset);
89839+ }
89840+
89841+ return;
89842+}
89843+
89844+int
89845+gr_find_uid(const uid_t uid)
89846+{
89847+ struct crash_uid *tmp = uid_set;
89848+ uid_t buid;
89849+ int low = 0, high = uid_used - 1, mid;
89850+
89851+ while (high >= low) {
89852+ mid = (low + high) >> 1;
89853+ buid = tmp[mid].uid;
89854+ if (buid == uid)
89855+ return mid;
89856+ if (buid > uid)
89857+ high = mid - 1;
89858+ if (buid < uid)
89859+ low = mid + 1;
89860+ }
89861+
89862+ return -1;
89863+}
89864+
89865+static void
89866+gr_insertsort(void)
89867+{
89868+ unsigned short i, j;
89869+ struct crash_uid index;
89870+
89871+ for (i = 1; i < uid_used; i++) {
89872+ index = uid_set[i];
89873+ j = i;
89874+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
89875+ uid_set[j] = uid_set[j - 1];
89876+ j--;
89877+ }
89878+ uid_set[j] = index;
89879+ }
89880+
89881+ return;
89882+}
89883+
89884+static void
89885+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
89886+{
89887+ int loc;
89888+ uid_t uid = GR_GLOBAL_UID(kuid);
89889+
89890+ if (uid_used == GR_UIDTABLE_MAX)
89891+ return;
89892+
89893+ loc = gr_find_uid(uid);
89894+
89895+ if (loc >= 0) {
89896+ uid_set[loc].expires = expires;
89897+ return;
89898+ }
89899+
89900+ uid_set[uid_used].uid = uid;
89901+ uid_set[uid_used].expires = expires;
89902+ uid_used++;
89903+
89904+ gr_insertsort();
89905+
89906+ return;
89907+}
89908+
89909+void
89910+gr_remove_uid(const unsigned short loc)
89911+{
89912+ unsigned short i;
89913+
89914+ for (i = loc + 1; i < uid_used; i++)
89915+ uid_set[i - 1] = uid_set[i];
89916+
89917+ uid_used--;
89918+
89919+ return;
89920+}
89921+
89922+int
89923+gr_check_crash_uid(const kuid_t kuid)
89924+{
89925+ int loc;
89926+ int ret = 0;
89927+ uid_t uid;
89928+
89929+ if (unlikely(!gr_acl_is_enabled()))
89930+ return 0;
89931+
89932+ uid = GR_GLOBAL_UID(kuid);
89933+
89934+ spin_lock(&gr_uid_lock);
89935+ loc = gr_find_uid(uid);
89936+
89937+ if (loc < 0)
89938+ goto out_unlock;
89939+
89940+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
89941+ gr_remove_uid(loc);
89942+ else
89943+ ret = 1;
89944+
89945+out_unlock:
89946+ spin_unlock(&gr_uid_lock);
89947+ return ret;
89948+}
89949+
89950+static int
89951+proc_is_setxid(const struct cred *cred)
89952+{
89953+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
89954+ !uid_eq(cred->uid, cred->fsuid))
89955+ return 1;
89956+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
89957+ !gid_eq(cred->gid, cred->fsgid))
89958+ return 1;
89959+
89960+ return 0;
89961+}
89962+
89963+extern int gr_fake_force_sig(int sig, struct task_struct *t);
89964+
89965+void
89966+gr_handle_crash(struct task_struct *task, const int sig)
89967+{
89968+ struct acl_subject_label *curr;
89969+ struct task_struct *tsk, *tsk2;
89970+ const struct cred *cred;
89971+ const struct cred *cred2;
89972+
89973+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
89974+ return;
89975+
89976+ if (unlikely(!gr_acl_is_enabled()))
89977+ return;
89978+
89979+ curr = task->acl;
89980+
89981+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
89982+ return;
89983+
89984+ if (time_before_eq(curr->expires, get_seconds())) {
89985+ curr->expires = 0;
89986+ curr->crashes = 0;
89987+ }
89988+
89989+ curr->crashes++;
89990+
89991+ if (!curr->expires)
89992+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
89993+
89994+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
89995+ time_after(curr->expires, get_seconds())) {
89996+ rcu_read_lock();
89997+ cred = __task_cred(task);
89998+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
89999+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
90000+ spin_lock(&gr_uid_lock);
90001+ gr_insert_uid(cred->uid, curr->expires);
90002+ spin_unlock(&gr_uid_lock);
90003+ curr->expires = 0;
90004+ curr->crashes = 0;
90005+ read_lock(&tasklist_lock);
90006+ do_each_thread(tsk2, tsk) {
90007+ cred2 = __task_cred(tsk);
90008+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
90009+ gr_fake_force_sig(SIGKILL, tsk);
90010+ } while_each_thread(tsk2, tsk);
90011+ read_unlock(&tasklist_lock);
90012+ } else {
90013+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
90014+ read_lock(&tasklist_lock);
90015+ read_lock(&grsec_exec_file_lock);
90016+ do_each_thread(tsk2, tsk) {
90017+ if (likely(tsk != task)) {
90018+ // if this thread has the same subject as the one that triggered
90019+ // RES_CRASH and it's the same binary, kill it
90020+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
90021+ gr_fake_force_sig(SIGKILL, tsk);
90022+ }
90023+ } while_each_thread(tsk2, tsk);
90024+ read_unlock(&grsec_exec_file_lock);
90025+ read_unlock(&tasklist_lock);
90026+ }
90027+ rcu_read_unlock();
90028+ }
90029+
90030+ return;
90031+}
90032+
90033+int
90034+gr_check_crash_exec(const struct file *filp)
90035+{
90036+ struct acl_subject_label *curr;
90037+ struct dentry *dentry;
90038+
90039+ if (unlikely(!gr_acl_is_enabled()))
90040+ return 0;
90041+
90042+ read_lock(&gr_inode_lock);
90043+ dentry = filp->f_path.dentry;
90044+ curr = lookup_acl_subj_label(gr_get_ino_from_dentry(dentry), gr_get_dev_from_dentry(dentry),
90045+ current->role);
90046+ read_unlock(&gr_inode_lock);
90047+
90048+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
90049+ (!curr->crashes && !curr->expires))
90050+ return 0;
90051+
90052+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
90053+ time_after(curr->expires, get_seconds()))
90054+ return 1;
90055+ else if (time_before_eq(curr->expires, get_seconds())) {
90056+ curr->crashes = 0;
90057+ curr->expires = 0;
90058+ }
90059+
90060+ return 0;
90061+}
90062+
90063+void
90064+gr_handle_alertkill(struct task_struct *task)
90065+{
90066+ struct acl_subject_label *curracl;
90067+ __u32 curr_ip;
90068+ struct task_struct *p, *p2;
90069+
90070+ if (unlikely(!gr_acl_is_enabled()))
90071+ return;
90072+
90073+ curracl = task->acl;
90074+ curr_ip = task->signal->curr_ip;
90075+
90076+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
90077+ read_lock(&tasklist_lock);
90078+ do_each_thread(p2, p) {
90079+ if (p->signal->curr_ip == curr_ip)
90080+ gr_fake_force_sig(SIGKILL, p);
90081+ } while_each_thread(p2, p);
90082+ read_unlock(&tasklist_lock);
90083+ } else if (curracl->mode & GR_KILLPROC)
90084+ gr_fake_force_sig(SIGKILL, task);
90085+
90086+ return;
90087+}
90088diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
90089new file mode 100644
90090index 0000000..6b0c9cc
90091--- /dev/null
90092+++ b/grsecurity/gracl_shm.c
90093@@ -0,0 +1,40 @@
90094+#include <linux/kernel.h>
90095+#include <linux/mm.h>
90096+#include <linux/sched.h>
90097+#include <linux/file.h>
90098+#include <linux/ipc.h>
90099+#include <linux/gracl.h>
90100+#include <linux/grsecurity.h>
90101+#include <linux/grinternal.h>
90102+
90103+int
90104+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90105+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
90106+{
90107+ struct task_struct *task;
90108+
90109+ if (!gr_acl_is_enabled())
90110+ return 1;
90111+
90112+ rcu_read_lock();
90113+ read_lock(&tasklist_lock);
90114+
90115+ task = find_task_by_vpid(shm_cprid);
90116+
90117+ if (unlikely(!task))
90118+ task = find_task_by_vpid(shm_lapid);
90119+
90120+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
90121+ (task_pid_nr(task) == shm_lapid)) &&
90122+ (task->acl->mode & GR_PROTSHM) &&
90123+ (task->acl != current->acl))) {
90124+ read_unlock(&tasklist_lock);
90125+ rcu_read_unlock();
90126+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
90127+ return 0;
90128+ }
90129+ read_unlock(&tasklist_lock);
90130+ rcu_read_unlock();
90131+
90132+ return 1;
90133+}
90134diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
90135new file mode 100644
90136index 0000000..bc0be01
90137--- /dev/null
90138+++ b/grsecurity/grsec_chdir.c
90139@@ -0,0 +1,19 @@
90140+#include <linux/kernel.h>
90141+#include <linux/sched.h>
90142+#include <linux/fs.h>
90143+#include <linux/file.h>
90144+#include <linux/grsecurity.h>
90145+#include <linux/grinternal.h>
90146+
90147+void
90148+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
90149+{
90150+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
90151+ if ((grsec_enable_chdir && grsec_enable_group &&
90152+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
90153+ !grsec_enable_group)) {
90154+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
90155+ }
90156+#endif
90157+ return;
90158+}
90159diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
90160new file mode 100644
90161index 0000000..652ab45
90162--- /dev/null
90163+++ b/grsecurity/grsec_chroot.c
90164@@ -0,0 +1,467 @@
90165+#include <linux/kernel.h>
90166+#include <linux/module.h>
90167+#include <linux/sched.h>
90168+#include <linux/file.h>
90169+#include <linux/fs.h>
90170+#include <linux/mount.h>
90171+#include <linux/types.h>
90172+#include "../fs/mount.h"
90173+#include <linux/grsecurity.h>
90174+#include <linux/grinternal.h>
90175+
90176+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90177+int gr_init_ran;
90178+#endif
90179+
90180+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90181+{
90182+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90183+ struct dentry *tmpd = dentry;
90184+
90185+ read_seqlock_excl(&mount_lock);
90186+ write_seqlock(&rename_lock);
90187+
90188+ while (tmpd != mnt->mnt_root) {
90189+ atomic_inc(&tmpd->chroot_refcnt);
90190+ tmpd = tmpd->d_parent;
90191+ }
90192+ atomic_inc(&tmpd->chroot_refcnt);
90193+
90194+ write_sequnlock(&rename_lock);
90195+ read_sequnlock_excl(&mount_lock);
90196+#endif
90197+}
90198+
90199+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90200+{
90201+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90202+ struct dentry *tmpd = dentry;
90203+
90204+ read_seqlock_excl(&mount_lock);
90205+ write_seqlock(&rename_lock);
90206+
90207+ while (tmpd != mnt->mnt_root) {
90208+ atomic_dec(&tmpd->chroot_refcnt);
90209+ tmpd = tmpd->d_parent;
90210+ }
90211+ atomic_dec(&tmpd->chroot_refcnt);
90212+
90213+ write_sequnlock(&rename_lock);
90214+ read_sequnlock_excl(&mount_lock);
90215+#endif
90216+}
90217+
90218+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90219+static struct dentry *get_closest_chroot(struct dentry *dentry)
90220+{
90221+ write_seqlock(&rename_lock);
90222+ do {
90223+ if (atomic_read(&dentry->chroot_refcnt)) {
90224+ write_sequnlock(&rename_lock);
90225+ return dentry;
90226+ }
90227+ dentry = dentry->d_parent;
90228+ } while (!IS_ROOT(dentry));
90229+ write_sequnlock(&rename_lock);
90230+ return NULL;
90231+}
90232+#endif
90233+
90234+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
90235+ struct dentry *newdentry, struct vfsmount *newmnt)
90236+{
90237+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90238+ struct dentry *chroot;
90239+
90240+ if (unlikely(!grsec_enable_chroot_rename))
90241+ return 0;
90242+
90243+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
90244+ return 0;
90245+
90246+ chroot = get_closest_chroot(olddentry);
90247+
90248+ if (chroot == NULL)
90249+ return 0;
90250+
90251+ if (is_subdir(newdentry, chroot))
90252+ return 0;
90253+
90254+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
90255+
90256+ return 1;
90257+#else
90258+ return 0;
90259+#endif
90260+}
90261+
90262+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
90263+{
90264+#ifdef CONFIG_GRKERNSEC
90265+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
90266+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
90267+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90268+ && gr_init_ran
90269+#endif
90270+ )
90271+ task->gr_is_chrooted = 1;
90272+ else {
90273+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90274+ if (task_pid_nr(task) == 1 && !gr_init_ran)
90275+ gr_init_ran = 1;
90276+#endif
90277+ task->gr_is_chrooted = 0;
90278+ }
90279+
90280+ task->gr_chroot_dentry = path->dentry;
90281+#endif
90282+ return;
90283+}
90284+
90285+void gr_clear_chroot_entries(struct task_struct *task)
90286+{
90287+#ifdef CONFIG_GRKERNSEC
90288+ task->gr_is_chrooted = 0;
90289+ task->gr_chroot_dentry = NULL;
90290+#endif
90291+ return;
90292+}
90293+
90294+int
90295+gr_handle_chroot_unix(const pid_t pid)
90296+{
90297+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
90298+ struct task_struct *p;
90299+
90300+ if (unlikely(!grsec_enable_chroot_unix))
90301+ return 1;
90302+
90303+ if (likely(!proc_is_chrooted(current)))
90304+ return 1;
90305+
90306+ rcu_read_lock();
90307+ read_lock(&tasklist_lock);
90308+ p = find_task_by_vpid_unrestricted(pid);
90309+ if (unlikely(p && !have_same_root(current, p))) {
90310+ read_unlock(&tasklist_lock);
90311+ rcu_read_unlock();
90312+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
90313+ return 0;
90314+ }
90315+ read_unlock(&tasklist_lock);
90316+ rcu_read_unlock();
90317+#endif
90318+ return 1;
90319+}
90320+
90321+int
90322+gr_handle_chroot_nice(void)
90323+{
90324+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90325+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
90326+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
90327+ return -EPERM;
90328+ }
90329+#endif
90330+ return 0;
90331+}
90332+
90333+int
90334+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
90335+{
90336+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90337+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
90338+ && proc_is_chrooted(current)) {
90339+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
90340+ return -EACCES;
90341+ }
90342+#endif
90343+ return 0;
90344+}
90345+
90346+int
90347+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
90348+{
90349+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90350+ struct task_struct *p;
90351+ int ret = 0;
90352+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
90353+ return ret;
90354+
90355+ read_lock(&tasklist_lock);
90356+ do_each_pid_task(pid, type, p) {
90357+ if (!have_same_root(current, p)) {
90358+ ret = 1;
90359+ goto out;
90360+ }
90361+ } while_each_pid_task(pid, type, p);
90362+out:
90363+ read_unlock(&tasklist_lock);
90364+ return ret;
90365+#endif
90366+ return 0;
90367+}
90368+
90369+int
90370+gr_pid_is_chrooted(struct task_struct *p)
90371+{
90372+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90373+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
90374+ return 0;
90375+
90376+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
90377+ !have_same_root(current, p)) {
90378+ return 1;
90379+ }
90380+#endif
90381+ return 0;
90382+}
90383+
90384+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
90385+
90386+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
90387+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
90388+{
90389+ struct path path, currentroot;
90390+ int ret = 0;
90391+
90392+ path.dentry = (struct dentry *)u_dentry;
90393+ path.mnt = (struct vfsmount *)u_mnt;
90394+ get_fs_root(current->fs, &currentroot);
90395+ if (path_is_under(&path, &currentroot))
90396+ ret = 1;
90397+ path_put(&currentroot);
90398+
90399+ return ret;
90400+}
90401+#endif
90402+
90403+int
90404+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
90405+{
90406+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90407+ if (!grsec_enable_chroot_fchdir)
90408+ return 1;
90409+
90410+ if (!proc_is_chrooted(current))
90411+ return 1;
90412+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
90413+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
90414+ return 0;
90415+ }
90416+#endif
90417+ return 1;
90418+}
90419+
90420+int
90421+gr_chroot_fhandle(void)
90422+{
90423+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90424+ if (!grsec_enable_chroot_fchdir)
90425+ return 1;
90426+
90427+ if (!proc_is_chrooted(current))
90428+ return 1;
90429+ else {
90430+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
90431+ return 0;
90432+ }
90433+#endif
90434+ return 1;
90435+}
90436+
90437+int
90438+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90439+ const u64 shm_createtime)
90440+{
90441+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
90442+ struct task_struct *p;
90443+
90444+ if (unlikely(!grsec_enable_chroot_shmat))
90445+ return 1;
90446+
90447+ if (likely(!proc_is_chrooted(current)))
90448+ return 1;
90449+
90450+ rcu_read_lock();
90451+ read_lock(&tasklist_lock);
90452+
90453+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
90454+ if (time_before_eq64(p->start_time, shm_createtime)) {
90455+ if (have_same_root(current, p)) {
90456+ goto allow;
90457+ } else {
90458+ read_unlock(&tasklist_lock);
90459+ rcu_read_unlock();
90460+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90461+ return 0;
90462+ }
90463+ }
90464+ /* creator exited, pid reuse, fall through to next check */
90465+ }
90466+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
90467+ if (unlikely(!have_same_root(current, p))) {
90468+ read_unlock(&tasklist_lock);
90469+ rcu_read_unlock();
90470+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90471+ return 0;
90472+ }
90473+ }
90474+
90475+allow:
90476+ read_unlock(&tasklist_lock);
90477+ rcu_read_unlock();
90478+#endif
90479+ return 1;
90480+}
90481+
90482+void
90483+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
90484+{
90485+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
90486+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
90487+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
90488+#endif
90489+ return;
90490+}
90491+
90492+int
90493+gr_handle_chroot_mknod(const struct dentry *dentry,
90494+ const struct vfsmount *mnt, const int mode)
90495+{
90496+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
90497+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
90498+ proc_is_chrooted(current)) {
90499+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
90500+ return -EPERM;
90501+ }
90502+#endif
90503+ return 0;
90504+}
90505+
90506+int
90507+gr_handle_chroot_mount(const struct dentry *dentry,
90508+ const struct vfsmount *mnt, const char *dev_name)
90509+{
90510+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
90511+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
90512+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
90513+ return -EPERM;
90514+ }
90515+#endif
90516+ return 0;
90517+}
90518+
90519+int
90520+gr_handle_chroot_pivot(void)
90521+{
90522+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
90523+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
90524+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
90525+ return -EPERM;
90526+ }
90527+#endif
90528+ return 0;
90529+}
90530+
90531+int
90532+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
90533+{
90534+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
90535+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
90536+ !gr_is_outside_chroot(dentry, mnt)) {
90537+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
90538+ return -EPERM;
90539+ }
90540+#endif
90541+ return 0;
90542+}
90543+
90544+extern const char *captab_log[];
90545+extern int captab_log_entries;
90546+
90547+int
90548+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, 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+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
90555+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
90556+ }
90557+ return 0;
90558+ }
90559+ }
90560+#endif
90561+ return 1;
90562+}
90563+
90564+int
90565+gr_chroot_is_capable(const int cap)
90566+{
90567+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90568+ return gr_task_chroot_is_capable(current, current_cred(), cap);
90569+#endif
90570+ return 1;
90571+}
90572+
90573+int
90574+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
90575+{
90576+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90577+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
90578+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
90579+ if (cap_raised(chroot_caps, cap)) {
90580+ return 0;
90581+ }
90582+ }
90583+#endif
90584+ return 1;
90585+}
90586+
90587+int
90588+gr_chroot_is_capable_nolog(const int cap)
90589+{
90590+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90591+ return gr_task_chroot_is_capable_nolog(current, cap);
90592+#endif
90593+ return 1;
90594+}
90595+
90596+int
90597+gr_handle_chroot_sysctl(const int op)
90598+{
90599+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
90600+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
90601+ proc_is_chrooted(current))
90602+ return -EACCES;
90603+#endif
90604+ return 0;
90605+}
90606+
90607+void
90608+gr_handle_chroot_chdir(const struct path *path)
90609+{
90610+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
90611+ if (grsec_enable_chroot_chdir)
90612+ set_fs_pwd(current->fs, path);
90613+#endif
90614+ return;
90615+}
90616+
90617+int
90618+gr_handle_chroot_chmod(const struct dentry *dentry,
90619+ const struct vfsmount *mnt, const int mode)
90620+{
90621+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
90622+ /* allow chmod +s on directories, but not files */
90623+ if (grsec_enable_chroot_chmod && !d_is_dir(dentry) &&
90624+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
90625+ proc_is_chrooted(current)) {
90626+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
90627+ return -EPERM;
90628+ }
90629+#endif
90630+ return 0;
90631+}
90632diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
90633new file mode 100644
90634index 0000000..e723c08
90635--- /dev/null
90636+++ b/grsecurity/grsec_disabled.c
90637@@ -0,0 +1,445 @@
90638+#include <linux/kernel.h>
90639+#include <linux/module.h>
90640+#include <linux/sched.h>
90641+#include <linux/file.h>
90642+#include <linux/fs.h>
90643+#include <linux/kdev_t.h>
90644+#include <linux/net.h>
90645+#include <linux/in.h>
90646+#include <linux/ip.h>
90647+#include <linux/skbuff.h>
90648+#include <linux/sysctl.h>
90649+
90650+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
90651+void
90652+pax_set_initial_flags(struct linux_binprm *bprm)
90653+{
90654+ return;
90655+}
90656+#endif
90657+
90658+#ifdef CONFIG_SYSCTL
90659+__u32
90660+gr_handle_sysctl(const struct ctl_table * table, const int op)
90661+{
90662+ return 0;
90663+}
90664+#endif
90665+
90666+#ifdef CONFIG_TASKSTATS
90667+int gr_is_taskstats_denied(int pid)
90668+{
90669+ return 0;
90670+}
90671+#endif
90672+
90673+int
90674+gr_acl_is_enabled(void)
90675+{
90676+ return 0;
90677+}
90678+
90679+int
90680+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
90681+{
90682+ return 0;
90683+}
90684+
90685+void
90686+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
90687+{
90688+ return;
90689+}
90690+
90691+int
90692+gr_handle_rawio(const struct inode *inode)
90693+{
90694+ return 0;
90695+}
90696+
90697+void
90698+gr_acl_handle_psacct(struct task_struct *task, const long code)
90699+{
90700+ return;
90701+}
90702+
90703+int
90704+gr_handle_ptrace(struct task_struct *task, const long request)
90705+{
90706+ return 0;
90707+}
90708+
90709+int
90710+gr_handle_proc_ptrace(struct task_struct *task)
90711+{
90712+ return 0;
90713+}
90714+
90715+int
90716+gr_set_acls(const int type)
90717+{
90718+ return 0;
90719+}
90720+
90721+int
90722+gr_check_hidden_task(const struct task_struct *tsk)
90723+{
90724+ return 0;
90725+}
90726+
90727+int
90728+gr_check_protected_task(const struct task_struct *task)
90729+{
90730+ return 0;
90731+}
90732+
90733+int
90734+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
90735+{
90736+ return 0;
90737+}
90738+
90739+void
90740+gr_copy_label(struct task_struct *tsk)
90741+{
90742+ return;
90743+}
90744+
90745+void
90746+gr_set_pax_flags(struct task_struct *task)
90747+{
90748+ return;
90749+}
90750+
90751+int
90752+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
90753+ const int unsafe_share)
90754+{
90755+ return 0;
90756+}
90757+
90758+void
90759+gr_handle_delete(const u64 ino, const dev_t dev)
90760+{
90761+ return;
90762+}
90763+
90764+void
90765+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
90766+{
90767+ return;
90768+}
90769+
90770+void
90771+gr_handle_crash(struct task_struct *task, const int sig)
90772+{
90773+ return;
90774+}
90775+
90776+int
90777+gr_check_crash_exec(const struct file *filp)
90778+{
90779+ return 0;
90780+}
90781+
90782+int
90783+gr_check_crash_uid(const kuid_t uid)
90784+{
90785+ return 0;
90786+}
90787+
90788+void
90789+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
90790+ struct dentry *old_dentry,
90791+ struct dentry *new_dentry,
90792+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
90793+{
90794+ return;
90795+}
90796+
90797+int
90798+gr_search_socket(const int family, const int type, const int protocol)
90799+{
90800+ return 1;
90801+}
90802+
90803+int
90804+gr_search_connectbind(const int mode, const struct socket *sock,
90805+ const struct sockaddr_in *addr)
90806+{
90807+ return 0;
90808+}
90809+
90810+void
90811+gr_handle_alertkill(struct task_struct *task)
90812+{
90813+ return;
90814+}
90815+
90816+__u32
90817+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
90818+{
90819+ return 1;
90820+}
90821+
90822+__u32
90823+gr_acl_handle_hidden_file(const struct dentry * dentry,
90824+ const struct vfsmount * mnt)
90825+{
90826+ return 1;
90827+}
90828+
90829+__u32
90830+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
90831+ int acc_mode)
90832+{
90833+ return 1;
90834+}
90835+
90836+__u32
90837+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
90838+{
90839+ return 1;
90840+}
90841+
90842+__u32
90843+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
90844+{
90845+ return 1;
90846+}
90847+
90848+int
90849+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
90850+ unsigned int *vm_flags)
90851+{
90852+ return 1;
90853+}
90854+
90855+__u32
90856+gr_acl_handle_truncate(const struct dentry * dentry,
90857+ const struct vfsmount * mnt)
90858+{
90859+ return 1;
90860+}
90861+
90862+__u32
90863+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
90864+{
90865+ return 1;
90866+}
90867+
90868+__u32
90869+gr_acl_handle_access(const struct dentry * dentry,
90870+ const struct vfsmount * mnt, const int fmode)
90871+{
90872+ return 1;
90873+}
90874+
90875+__u32
90876+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
90877+ umode_t *mode)
90878+{
90879+ return 1;
90880+}
90881+
90882+__u32
90883+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
90884+{
90885+ return 1;
90886+}
90887+
90888+__u32
90889+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
90890+{
90891+ return 1;
90892+}
90893+
90894+__u32
90895+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
90896+{
90897+ return 1;
90898+}
90899+
90900+void
90901+grsecurity_init(void)
90902+{
90903+ return;
90904+}
90905+
90906+umode_t gr_acl_umask(void)
90907+{
90908+ return 0;
90909+}
90910+
90911+__u32
90912+gr_acl_handle_mknod(const struct dentry * new_dentry,
90913+ const struct dentry * parent_dentry,
90914+ const struct vfsmount * parent_mnt,
90915+ const int mode)
90916+{
90917+ return 1;
90918+}
90919+
90920+__u32
90921+gr_acl_handle_mkdir(const struct dentry * new_dentry,
90922+ const struct dentry * parent_dentry,
90923+ const struct vfsmount * parent_mnt)
90924+{
90925+ return 1;
90926+}
90927+
90928+__u32
90929+gr_acl_handle_symlink(const struct dentry * new_dentry,
90930+ const struct dentry * parent_dentry,
90931+ const struct vfsmount * parent_mnt, const struct filename *from)
90932+{
90933+ return 1;
90934+}
90935+
90936+__u32
90937+gr_acl_handle_link(const struct dentry * new_dentry,
90938+ const struct dentry * parent_dentry,
90939+ const struct vfsmount * parent_mnt,
90940+ const struct dentry * old_dentry,
90941+ const struct vfsmount * old_mnt, const struct filename *to)
90942+{
90943+ return 1;
90944+}
90945+
90946+int
90947+gr_acl_handle_rename(const struct dentry *new_dentry,
90948+ const struct dentry *parent_dentry,
90949+ const struct vfsmount *parent_mnt,
90950+ const struct dentry *old_dentry,
90951+ const struct inode *old_parent_inode,
90952+ const struct vfsmount *old_mnt, const struct filename *newname,
90953+ unsigned int flags)
90954+{
90955+ return 0;
90956+}
90957+
90958+int
90959+gr_acl_handle_filldir(const struct file *file, const char *name,
90960+ const int namelen, const u64 ino)
90961+{
90962+ return 1;
90963+}
90964+
90965+int
90966+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90967+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
90968+{
90969+ return 1;
90970+}
90971+
90972+int
90973+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
90974+{
90975+ return 0;
90976+}
90977+
90978+int
90979+gr_search_accept(const struct socket *sock)
90980+{
90981+ return 0;
90982+}
90983+
90984+int
90985+gr_search_listen(const struct socket *sock)
90986+{
90987+ return 0;
90988+}
90989+
90990+int
90991+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
90992+{
90993+ return 0;
90994+}
90995+
90996+__u32
90997+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
90998+{
90999+ return 1;
91000+}
91001+
91002+__u32
91003+gr_acl_handle_creat(const struct dentry * dentry,
91004+ const struct dentry * p_dentry,
91005+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
91006+ const int imode)
91007+{
91008+ return 1;
91009+}
91010+
91011+void
91012+gr_acl_handle_exit(void)
91013+{
91014+ return;
91015+}
91016+
91017+int
91018+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
91019+{
91020+ return 1;
91021+}
91022+
91023+void
91024+gr_set_role_label(const kuid_t uid, const kgid_t gid)
91025+{
91026+ return;
91027+}
91028+
91029+int
91030+gr_acl_handle_procpidmem(const struct task_struct *task)
91031+{
91032+ return 0;
91033+}
91034+
91035+int
91036+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
91037+{
91038+ return 0;
91039+}
91040+
91041+int
91042+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
91043+{
91044+ return 0;
91045+}
91046+
91047+int
91048+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
91049+{
91050+ return 0;
91051+}
91052+
91053+int
91054+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
91055+{
91056+ return 0;
91057+}
91058+
91059+int gr_acl_enable_at_secure(void)
91060+{
91061+ return 0;
91062+}
91063+
91064+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
91065+{
91066+ return d_backing_inode(dentry)->i_sb->s_dev;
91067+}
91068+
91069+u64 gr_get_ino_from_dentry(struct dentry *dentry)
91070+{
91071+ return d_backing_inode(dentry)->i_ino;
91072+}
91073+
91074+void gr_put_exec_file(struct task_struct *task)
91075+{
91076+ return;
91077+}
91078+
91079+#ifdef CONFIG_SECURITY
91080+EXPORT_SYMBOL_GPL(gr_check_user_change);
91081+EXPORT_SYMBOL_GPL(gr_check_group_change);
91082+#endif
91083diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
91084new file mode 100644
91085index 0000000..fb7531e
91086--- /dev/null
91087+++ b/grsecurity/grsec_exec.c
91088@@ -0,0 +1,189 @@
91089+#include <linux/kernel.h>
91090+#include <linux/sched.h>
91091+#include <linux/file.h>
91092+#include <linux/binfmts.h>
91093+#include <linux/fs.h>
91094+#include <linux/types.h>
91095+#include <linux/grdefs.h>
91096+#include <linux/grsecurity.h>
91097+#include <linux/grinternal.h>
91098+#include <linux/capability.h>
91099+#include <linux/module.h>
91100+#include <linux/compat.h>
91101+
91102+#include <asm/uaccess.h>
91103+
91104+#ifdef CONFIG_GRKERNSEC_EXECLOG
91105+static char gr_exec_arg_buf[132];
91106+static DEFINE_MUTEX(gr_exec_arg_mutex);
91107+#endif
91108+
91109+struct user_arg_ptr {
91110+#ifdef CONFIG_COMPAT
91111+ bool is_compat;
91112+#endif
91113+ union {
91114+ const char __user *const __user *native;
91115+#ifdef CONFIG_COMPAT
91116+ const compat_uptr_t __user *compat;
91117+#endif
91118+ } ptr;
91119+};
91120+
91121+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
91122+
91123+void
91124+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
91125+{
91126+#ifdef CONFIG_GRKERNSEC_EXECLOG
91127+ char *grarg = gr_exec_arg_buf;
91128+ unsigned int i, x, execlen = 0;
91129+ char c;
91130+
91131+ if (!((grsec_enable_execlog && grsec_enable_group &&
91132+ in_group_p(grsec_audit_gid))
91133+ || (grsec_enable_execlog && !grsec_enable_group)))
91134+ return;
91135+
91136+ mutex_lock(&gr_exec_arg_mutex);
91137+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
91138+
91139+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
91140+ const char __user *p;
91141+ unsigned int len;
91142+
91143+ p = get_user_arg_ptr(argv, i);
91144+ if (IS_ERR(p))
91145+ goto log;
91146+
91147+ len = strnlen_user(p, 128 - execlen);
91148+ if (len > 128 - execlen)
91149+ len = 128 - execlen;
91150+ else if (len > 0)
91151+ len--;
91152+ if (copy_from_user(grarg + execlen, p, len))
91153+ goto log;
91154+
91155+ /* rewrite unprintable characters */
91156+ for (x = 0; x < len; x++) {
91157+ c = *(grarg + execlen + x);
91158+ if (c < 32 || c > 126)
91159+ *(grarg + execlen + x) = ' ';
91160+ }
91161+
91162+ execlen += len;
91163+ *(grarg + execlen) = ' ';
91164+ *(grarg + execlen + 1) = '\0';
91165+ execlen++;
91166+ }
91167+
91168+ log:
91169+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
91170+ bprm->file->f_path.mnt, grarg);
91171+ mutex_unlock(&gr_exec_arg_mutex);
91172+#endif
91173+ return;
91174+}
91175+
91176+#ifdef CONFIG_GRKERNSEC
91177+extern int gr_acl_is_capable(const int cap);
91178+extern int gr_acl_is_capable_nolog(const int cap);
91179+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91180+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
91181+extern int gr_chroot_is_capable(const int cap);
91182+extern int gr_chroot_is_capable_nolog(const int cap);
91183+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91184+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
91185+#endif
91186+
91187+const char *captab_log[] = {
91188+ "CAP_CHOWN",
91189+ "CAP_DAC_OVERRIDE",
91190+ "CAP_DAC_READ_SEARCH",
91191+ "CAP_FOWNER",
91192+ "CAP_FSETID",
91193+ "CAP_KILL",
91194+ "CAP_SETGID",
91195+ "CAP_SETUID",
91196+ "CAP_SETPCAP",
91197+ "CAP_LINUX_IMMUTABLE",
91198+ "CAP_NET_BIND_SERVICE",
91199+ "CAP_NET_BROADCAST",
91200+ "CAP_NET_ADMIN",
91201+ "CAP_NET_RAW",
91202+ "CAP_IPC_LOCK",
91203+ "CAP_IPC_OWNER",
91204+ "CAP_SYS_MODULE",
91205+ "CAP_SYS_RAWIO",
91206+ "CAP_SYS_CHROOT",
91207+ "CAP_SYS_PTRACE",
91208+ "CAP_SYS_PACCT",
91209+ "CAP_SYS_ADMIN",
91210+ "CAP_SYS_BOOT",
91211+ "CAP_SYS_NICE",
91212+ "CAP_SYS_RESOURCE",
91213+ "CAP_SYS_TIME",
91214+ "CAP_SYS_TTY_CONFIG",
91215+ "CAP_MKNOD",
91216+ "CAP_LEASE",
91217+ "CAP_AUDIT_WRITE",
91218+ "CAP_AUDIT_CONTROL",
91219+ "CAP_SETFCAP",
91220+ "CAP_MAC_OVERRIDE",
91221+ "CAP_MAC_ADMIN",
91222+ "CAP_SYSLOG",
91223+ "CAP_WAKE_ALARM",
91224+ "CAP_BLOCK_SUSPEND",
91225+ "CAP_AUDIT_READ"
91226+};
91227+
91228+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
91229+
91230+int gr_is_capable(const int cap)
91231+{
91232+#ifdef CONFIG_GRKERNSEC
91233+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
91234+ return 1;
91235+ return 0;
91236+#else
91237+ return 1;
91238+#endif
91239+}
91240+
91241+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
91242+{
91243+#ifdef CONFIG_GRKERNSEC
91244+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
91245+ return 1;
91246+ return 0;
91247+#else
91248+ return 1;
91249+#endif
91250+}
91251+
91252+int gr_is_capable_nolog(const int cap)
91253+{
91254+#ifdef CONFIG_GRKERNSEC
91255+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
91256+ return 1;
91257+ return 0;
91258+#else
91259+ return 1;
91260+#endif
91261+}
91262+
91263+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
91264+{
91265+#ifdef CONFIG_GRKERNSEC
91266+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
91267+ return 1;
91268+ return 0;
91269+#else
91270+ return 1;
91271+#endif
91272+}
91273+
91274+EXPORT_SYMBOL_GPL(gr_is_capable);
91275+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
91276+EXPORT_SYMBOL_GPL(gr_task_is_capable);
91277+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
91278diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
91279new file mode 100644
91280index 0000000..cdec49b
91281--- /dev/null
91282+++ b/grsecurity/grsec_fifo.c
91283@@ -0,0 +1,26 @@
91284+#include <linux/kernel.h>
91285+#include <linux/sched.h>
91286+#include <linux/fs.h>
91287+#include <linux/file.h>
91288+#include <linux/grinternal.h>
91289+
91290+int
91291+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
91292+ const struct dentry *dir, const int flag, const int acc_mode)
91293+{
91294+#ifdef CONFIG_GRKERNSEC_FIFO
91295+ const struct cred *cred = current_cred();
91296+ struct inode *inode = d_backing_inode(dentry);
91297+ struct inode *dir_inode = d_backing_inode(dir);
91298+
91299+ if (grsec_enable_fifo && S_ISFIFO(inode->i_mode) &&
91300+ !(flag & O_EXCL) && (dir_inode->i_mode & S_ISVTX) &&
91301+ !uid_eq(inode->i_uid, dir_inode->i_uid) &&
91302+ !uid_eq(cred->fsuid, inode->i_uid)) {
91303+ if (!inode_permission(inode, acc_mode))
91304+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, GR_GLOBAL_UID(inode->i_uid), GR_GLOBAL_GID(inode->i_gid));
91305+ return -EACCES;
91306+ }
91307+#endif
91308+ return 0;
91309+}
91310diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
91311new file mode 100644
91312index 0000000..8ca18bf
91313--- /dev/null
91314+++ b/grsecurity/grsec_fork.c
91315@@ -0,0 +1,23 @@
91316+#include <linux/kernel.h>
91317+#include <linux/sched.h>
91318+#include <linux/grsecurity.h>
91319+#include <linux/grinternal.h>
91320+#include <linux/errno.h>
91321+
91322+void
91323+gr_log_forkfail(const int retval)
91324+{
91325+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91326+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
91327+ switch (retval) {
91328+ case -EAGAIN:
91329+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
91330+ break;
91331+ case -ENOMEM:
91332+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
91333+ break;
91334+ }
91335+ }
91336+#endif
91337+ return;
91338+}
91339diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
91340new file mode 100644
91341index 0000000..a364c58
91342--- /dev/null
91343+++ b/grsecurity/grsec_init.c
91344@@ -0,0 +1,290 @@
91345+#include <linux/kernel.h>
91346+#include <linux/sched.h>
91347+#include <linux/mm.h>
91348+#include <linux/gracl.h>
91349+#include <linux/slab.h>
91350+#include <linux/vmalloc.h>
91351+#include <linux/percpu.h>
91352+#include <linux/module.h>
91353+
91354+int grsec_enable_ptrace_readexec __read_only;
91355+int grsec_enable_setxid __read_only;
91356+int grsec_enable_symlinkown __read_only;
91357+kgid_t grsec_symlinkown_gid __read_only;
91358+int grsec_enable_brute __read_only;
91359+int grsec_enable_link __read_only;
91360+int grsec_enable_dmesg __read_only;
91361+int grsec_enable_harden_ptrace __read_only;
91362+int grsec_enable_harden_ipc __read_only;
91363+int grsec_enable_fifo __read_only;
91364+int grsec_enable_execlog __read_only;
91365+int grsec_enable_signal __read_only;
91366+int grsec_enable_forkfail __read_only;
91367+int grsec_enable_audit_ptrace __read_only;
91368+int grsec_enable_time __read_only;
91369+int grsec_enable_group __read_only;
91370+kgid_t grsec_audit_gid __read_only;
91371+int grsec_enable_chdir __read_only;
91372+int grsec_enable_mount __read_only;
91373+int grsec_enable_rofs __read_only;
91374+int grsec_deny_new_usb __read_only;
91375+int grsec_enable_chroot_findtask __read_only;
91376+int grsec_enable_chroot_mount __read_only;
91377+int grsec_enable_chroot_shmat __read_only;
91378+int grsec_enable_chroot_fchdir __read_only;
91379+int grsec_enable_chroot_double __read_only;
91380+int grsec_enable_chroot_pivot __read_only;
91381+int grsec_enable_chroot_chdir __read_only;
91382+int grsec_enable_chroot_chmod __read_only;
91383+int grsec_enable_chroot_mknod __read_only;
91384+int grsec_enable_chroot_nice __read_only;
91385+int grsec_enable_chroot_execlog __read_only;
91386+int grsec_enable_chroot_caps __read_only;
91387+int grsec_enable_chroot_rename __read_only;
91388+int grsec_enable_chroot_sysctl __read_only;
91389+int grsec_enable_chroot_unix __read_only;
91390+int grsec_enable_tpe __read_only;
91391+kgid_t grsec_tpe_gid __read_only;
91392+int grsec_enable_blackhole __read_only;
91393+#ifdef CONFIG_IPV6_MODULE
91394+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
91395+#endif
91396+int grsec_lastack_retries __read_only;
91397+int grsec_enable_tpe_all __read_only;
91398+int grsec_enable_tpe_invert __read_only;
91399+int grsec_enable_socket_all __read_only;
91400+kgid_t grsec_socket_all_gid __read_only;
91401+int grsec_enable_socket_client __read_only;
91402+kgid_t grsec_socket_client_gid __read_only;
91403+int grsec_enable_socket_server __read_only;
91404+kgid_t grsec_socket_server_gid __read_only;
91405+int grsec_resource_logging __read_only;
91406+int grsec_disable_privio __read_only;
91407+int grsec_enable_log_rwxmaps __read_only;
91408+int grsec_lock __read_only;
91409+
91410+DEFINE_SPINLOCK(grsec_alert_lock);
91411+unsigned long grsec_alert_wtime = 0;
91412+unsigned long grsec_alert_fyet = 0;
91413+
91414+DEFINE_SPINLOCK(grsec_audit_lock);
91415+
91416+DEFINE_RWLOCK(grsec_exec_file_lock);
91417+
91418+char *gr_shared_page[4];
91419+
91420+char *gr_alert_log_fmt;
91421+char *gr_audit_log_fmt;
91422+char *gr_alert_log_buf;
91423+char *gr_audit_log_buf;
91424+
91425+extern struct gr_arg *gr_usermode;
91426+extern unsigned char *gr_system_salt;
91427+extern unsigned char *gr_system_sum;
91428+
91429+void __init
91430+grsecurity_init(void)
91431+{
91432+ int j;
91433+ /* create the per-cpu shared pages */
91434+
91435+#ifdef CONFIG_X86
91436+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
91437+#endif
91438+
91439+ for (j = 0; j < 4; j++) {
91440+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
91441+ if (gr_shared_page[j] == NULL) {
91442+ panic("Unable to allocate grsecurity shared page");
91443+ return;
91444+ }
91445+ }
91446+
91447+ /* allocate log buffers */
91448+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
91449+ if (!gr_alert_log_fmt) {
91450+ panic("Unable to allocate grsecurity alert log format buffer");
91451+ return;
91452+ }
91453+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
91454+ if (!gr_audit_log_fmt) {
91455+ panic("Unable to allocate grsecurity audit log format buffer");
91456+ return;
91457+ }
91458+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91459+ if (!gr_alert_log_buf) {
91460+ panic("Unable to allocate grsecurity alert log buffer");
91461+ return;
91462+ }
91463+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91464+ if (!gr_audit_log_buf) {
91465+ panic("Unable to allocate grsecurity audit log buffer");
91466+ return;
91467+ }
91468+
91469+ /* allocate memory for authentication structure */
91470+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
91471+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
91472+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
91473+
91474+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
91475+ panic("Unable to allocate grsecurity authentication structure");
91476+ return;
91477+ }
91478+
91479+#ifdef CONFIG_GRKERNSEC_IO
91480+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
91481+ grsec_disable_privio = 1;
91482+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91483+ grsec_disable_privio = 1;
91484+#else
91485+ grsec_disable_privio = 0;
91486+#endif
91487+#endif
91488+
91489+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
91490+ /* for backward compatibility, tpe_invert always defaults to on if
91491+ enabled in the kernel
91492+ */
91493+ grsec_enable_tpe_invert = 1;
91494+#endif
91495+
91496+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91497+#ifndef CONFIG_GRKERNSEC_SYSCTL
91498+ grsec_lock = 1;
91499+#endif
91500+
91501+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
91502+ grsec_enable_log_rwxmaps = 1;
91503+#endif
91504+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
91505+ grsec_enable_group = 1;
91506+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
91507+#endif
91508+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
91509+ grsec_enable_ptrace_readexec = 1;
91510+#endif
91511+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
91512+ grsec_enable_chdir = 1;
91513+#endif
91514+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
91515+ grsec_enable_harden_ptrace = 1;
91516+#endif
91517+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91518+ grsec_enable_harden_ipc = 1;
91519+#endif
91520+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
91521+ grsec_enable_mount = 1;
91522+#endif
91523+#ifdef CONFIG_GRKERNSEC_LINK
91524+ grsec_enable_link = 1;
91525+#endif
91526+#ifdef CONFIG_GRKERNSEC_BRUTE
91527+ grsec_enable_brute = 1;
91528+#endif
91529+#ifdef CONFIG_GRKERNSEC_DMESG
91530+ grsec_enable_dmesg = 1;
91531+#endif
91532+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91533+ grsec_enable_blackhole = 1;
91534+ grsec_lastack_retries = 4;
91535+#endif
91536+#ifdef CONFIG_GRKERNSEC_FIFO
91537+ grsec_enable_fifo = 1;
91538+#endif
91539+#ifdef CONFIG_GRKERNSEC_EXECLOG
91540+ grsec_enable_execlog = 1;
91541+#endif
91542+#ifdef CONFIG_GRKERNSEC_SETXID
91543+ grsec_enable_setxid = 1;
91544+#endif
91545+#ifdef CONFIG_GRKERNSEC_SIGNAL
91546+ grsec_enable_signal = 1;
91547+#endif
91548+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91549+ grsec_enable_forkfail = 1;
91550+#endif
91551+#ifdef CONFIG_GRKERNSEC_TIME
91552+ grsec_enable_time = 1;
91553+#endif
91554+#ifdef CONFIG_GRKERNSEC_RESLOG
91555+ grsec_resource_logging = 1;
91556+#endif
91557+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
91558+ grsec_enable_chroot_findtask = 1;
91559+#endif
91560+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
91561+ grsec_enable_chroot_unix = 1;
91562+#endif
91563+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
91564+ grsec_enable_chroot_mount = 1;
91565+#endif
91566+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
91567+ grsec_enable_chroot_fchdir = 1;
91568+#endif
91569+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
91570+ grsec_enable_chroot_shmat = 1;
91571+#endif
91572+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
91573+ grsec_enable_audit_ptrace = 1;
91574+#endif
91575+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
91576+ grsec_enable_chroot_double = 1;
91577+#endif
91578+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
91579+ grsec_enable_chroot_pivot = 1;
91580+#endif
91581+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
91582+ grsec_enable_chroot_chdir = 1;
91583+#endif
91584+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
91585+ grsec_enable_chroot_chmod = 1;
91586+#endif
91587+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
91588+ grsec_enable_chroot_mknod = 1;
91589+#endif
91590+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
91591+ grsec_enable_chroot_nice = 1;
91592+#endif
91593+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
91594+ grsec_enable_chroot_execlog = 1;
91595+#endif
91596+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
91597+ grsec_enable_chroot_caps = 1;
91598+#endif
91599+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
91600+ grsec_enable_chroot_rename = 1;
91601+#endif
91602+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
91603+ grsec_enable_chroot_sysctl = 1;
91604+#endif
91605+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
91606+ grsec_enable_symlinkown = 1;
91607+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
91608+#endif
91609+#ifdef CONFIG_GRKERNSEC_TPE
91610+ grsec_enable_tpe = 1;
91611+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
91612+#ifdef CONFIG_GRKERNSEC_TPE_ALL
91613+ grsec_enable_tpe_all = 1;
91614+#endif
91615+#endif
91616+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
91617+ grsec_enable_socket_all = 1;
91618+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
91619+#endif
91620+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
91621+ grsec_enable_socket_client = 1;
91622+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
91623+#endif
91624+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
91625+ grsec_enable_socket_server = 1;
91626+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
91627+#endif
91628+#endif
91629+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
91630+ grsec_deny_new_usb = 1;
91631+#endif
91632+
91633+ return;
91634+}
91635diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
91636new file mode 100644
91637index 0000000..1773300
91638--- /dev/null
91639+++ b/grsecurity/grsec_ipc.c
91640@@ -0,0 +1,48 @@
91641+#include <linux/kernel.h>
91642+#include <linux/mm.h>
91643+#include <linux/sched.h>
91644+#include <linux/file.h>
91645+#include <linux/ipc.h>
91646+#include <linux/ipc_namespace.h>
91647+#include <linux/grsecurity.h>
91648+#include <linux/grinternal.h>
91649+
91650+int
91651+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
91652+{
91653+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91654+ int write;
91655+ int orig_granted_mode;
91656+ kuid_t euid;
91657+ kgid_t egid;
91658+
91659+ if (!grsec_enable_harden_ipc)
91660+ return 1;
91661+
91662+ euid = current_euid();
91663+ egid = current_egid();
91664+
91665+ write = requested_mode & 00002;
91666+ orig_granted_mode = ipcp->mode;
91667+
91668+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
91669+ orig_granted_mode >>= 6;
91670+ else {
91671+ /* if likely wrong permissions, lock to user */
91672+ if (orig_granted_mode & 0007)
91673+ orig_granted_mode = 0;
91674+ /* otherwise do a egid-only check */
91675+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
91676+ orig_granted_mode >>= 3;
91677+ /* otherwise, no access */
91678+ else
91679+ orig_granted_mode = 0;
91680+ }
91681+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
91682+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
91683+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
91684+ return 0;
91685+ }
91686+#endif
91687+ return 1;
91688+}
91689diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
91690new file mode 100644
91691index 0000000..8ef2b75
91692--- /dev/null
91693+++ b/grsecurity/grsec_link.c
91694@@ -0,0 +1,59 @@
91695+#include <linux/kernel.h>
91696+#include <linux/sched.h>
91697+#include <linux/fs.h>
91698+#include <linux/file.h>
91699+#include <linux/grinternal.h>
91700+
91701+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
91702+{
91703+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
91704+ const struct inode *link_inode = d_backing_inode(link->dentry);
91705+
91706+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
91707+ /* ignore root-owned links, e.g. /proc/self */
91708+ gr_is_global_nonroot(link_inode->i_uid) && target &&
91709+ !uid_eq(link_inode->i_uid, target->i_uid)) {
91710+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
91711+ return 1;
91712+ }
91713+#endif
91714+ return 0;
91715+}
91716+
91717+int
91718+gr_handle_follow_link(const struct dentry *dentry, const struct vfsmount *mnt)
91719+{
91720+#ifdef CONFIG_GRKERNSEC_LINK
91721+ struct inode *inode = d_backing_inode(dentry);
91722+ struct inode *parent = d_backing_inode(dentry->d_parent);
91723+ const struct cred *cred = current_cred();
91724+
91725+ if (grsec_enable_link && d_is_symlink(dentry) &&
91726+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
91727+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
91728+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
91729+ return -EACCES;
91730+ }
91731+#endif
91732+ return 0;
91733+}
91734+
91735+int
91736+gr_handle_hardlink(const struct dentry *dentry,
91737+ const struct vfsmount *mnt,
91738+ const struct filename *to)
91739+{
91740+#ifdef CONFIG_GRKERNSEC_LINK
91741+ struct inode *inode = d_backing_inode(dentry);
91742+ const struct cred *cred = current_cred();
91743+
91744+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
91745+ (!d_is_reg(dentry) || is_privileged_binary(dentry) ||
91746+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
91747+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
91748+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
91749+ return -EPERM;
91750+ }
91751+#endif
91752+ return 0;
91753+}
91754diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
91755new file mode 100644
91756index 0000000..dbe0a6b
91757--- /dev/null
91758+++ b/grsecurity/grsec_log.c
91759@@ -0,0 +1,341 @@
91760+#include <linux/kernel.h>
91761+#include <linux/sched.h>
91762+#include <linux/file.h>
91763+#include <linux/tty.h>
91764+#include <linux/fs.h>
91765+#include <linux/mm.h>
91766+#include <linux/grinternal.h>
91767+
91768+#ifdef CONFIG_TREE_PREEMPT_RCU
91769+#define DISABLE_PREEMPT() preempt_disable()
91770+#define ENABLE_PREEMPT() preempt_enable()
91771+#else
91772+#define DISABLE_PREEMPT()
91773+#define ENABLE_PREEMPT()
91774+#endif
91775+
91776+#define BEGIN_LOCKS(x) \
91777+ DISABLE_PREEMPT(); \
91778+ rcu_read_lock(); \
91779+ read_lock(&tasklist_lock); \
91780+ read_lock(&grsec_exec_file_lock); \
91781+ if (x != GR_DO_AUDIT) \
91782+ spin_lock(&grsec_alert_lock); \
91783+ else \
91784+ spin_lock(&grsec_audit_lock)
91785+
91786+#define END_LOCKS(x) \
91787+ if (x != GR_DO_AUDIT) \
91788+ spin_unlock(&grsec_alert_lock); \
91789+ else \
91790+ spin_unlock(&grsec_audit_lock); \
91791+ read_unlock(&grsec_exec_file_lock); \
91792+ read_unlock(&tasklist_lock); \
91793+ rcu_read_unlock(); \
91794+ ENABLE_PREEMPT(); \
91795+ if (x == GR_DONT_AUDIT) \
91796+ gr_handle_alertkill(current)
91797+
91798+enum {
91799+ FLOODING,
91800+ NO_FLOODING
91801+};
91802+
91803+extern char *gr_alert_log_fmt;
91804+extern char *gr_audit_log_fmt;
91805+extern char *gr_alert_log_buf;
91806+extern char *gr_audit_log_buf;
91807+
91808+static int gr_log_start(int audit)
91809+{
91810+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
91811+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
91812+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91813+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
91814+ unsigned long curr_secs = get_seconds();
91815+
91816+ if (audit == GR_DO_AUDIT)
91817+ goto set_fmt;
91818+
91819+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
91820+ grsec_alert_wtime = curr_secs;
91821+ grsec_alert_fyet = 0;
91822+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
91823+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
91824+ grsec_alert_fyet++;
91825+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
91826+ grsec_alert_wtime = curr_secs;
91827+ grsec_alert_fyet++;
91828+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
91829+ return FLOODING;
91830+ }
91831+ else return FLOODING;
91832+
91833+set_fmt:
91834+#endif
91835+ memset(buf, 0, PAGE_SIZE);
91836+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
91837+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
91838+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
91839+ } else if (current->signal->curr_ip) {
91840+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
91841+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
91842+ } else if (gr_acl_is_enabled()) {
91843+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
91844+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
91845+ } else {
91846+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
91847+ strcpy(buf, fmt);
91848+ }
91849+
91850+ return NO_FLOODING;
91851+}
91852+
91853+static void gr_log_middle(int audit, const char *msg, va_list ap)
91854+ __attribute__ ((format (printf, 2, 0)));
91855+
91856+static void gr_log_middle(int audit, const char *msg, va_list ap)
91857+{
91858+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91859+ unsigned int len = strlen(buf);
91860+
91861+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
91862+
91863+ return;
91864+}
91865+
91866+static void gr_log_middle_varargs(int audit, const char *msg, ...)
91867+ __attribute__ ((format (printf, 2, 3)));
91868+
91869+static void gr_log_middle_varargs(int audit, const char *msg, ...)
91870+{
91871+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91872+ unsigned int len = strlen(buf);
91873+ va_list ap;
91874+
91875+ va_start(ap, msg);
91876+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
91877+ va_end(ap);
91878+
91879+ return;
91880+}
91881+
91882+static void gr_log_end(int audit, int append_default)
91883+{
91884+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91885+ if (append_default) {
91886+ struct task_struct *task = current;
91887+ struct task_struct *parent = task->real_parent;
91888+ const struct cred *cred = __task_cred(task);
91889+ const struct cred *pcred = __task_cred(parent);
91890+ unsigned int len = strlen(buf);
91891+
91892+ 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));
91893+ }
91894+
91895+ printk("%s\n", buf);
91896+
91897+ return;
91898+}
91899+
91900+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
91901+{
91902+ int logtype;
91903+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
91904+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
91905+ void *voidptr = NULL;
91906+ int num1 = 0, num2 = 0;
91907+ unsigned long ulong1 = 0, ulong2 = 0;
91908+ struct dentry *dentry = NULL;
91909+ struct vfsmount *mnt = NULL;
91910+ struct file *file = NULL;
91911+ struct task_struct *task = NULL;
91912+ struct vm_area_struct *vma = NULL;
91913+ const struct cred *cred, *pcred;
91914+ va_list ap;
91915+
91916+ BEGIN_LOCKS(audit);
91917+ logtype = gr_log_start(audit);
91918+ if (logtype == FLOODING) {
91919+ END_LOCKS(audit);
91920+ return;
91921+ }
91922+ va_start(ap, argtypes);
91923+ switch (argtypes) {
91924+ case GR_TTYSNIFF:
91925+ task = va_arg(ap, struct task_struct *);
91926+ 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));
91927+ break;
91928+ case GR_SYSCTL_HIDDEN:
91929+ str1 = va_arg(ap, char *);
91930+ gr_log_middle_varargs(audit, msg, result, str1);
91931+ break;
91932+ case GR_RBAC:
91933+ dentry = va_arg(ap, struct dentry *);
91934+ mnt = va_arg(ap, struct vfsmount *);
91935+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
91936+ break;
91937+ case GR_RBAC_STR:
91938+ dentry = va_arg(ap, struct dentry *);
91939+ mnt = va_arg(ap, struct vfsmount *);
91940+ str1 = va_arg(ap, char *);
91941+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
91942+ break;
91943+ case GR_STR_RBAC:
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, result, str1, gr_to_filename(dentry, mnt));
91948+ break;
91949+ case GR_RBAC_MODE2:
91950+ dentry = va_arg(ap, struct dentry *);
91951+ mnt = va_arg(ap, struct vfsmount *);
91952+ str1 = va_arg(ap, char *);
91953+ str2 = va_arg(ap, char *);
91954+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
91955+ break;
91956+ case GR_RBAC_MODE3:
91957+ dentry = va_arg(ap, struct dentry *);
91958+ mnt = va_arg(ap, struct vfsmount *);
91959+ str1 = va_arg(ap, char *);
91960+ str2 = va_arg(ap, char *);
91961+ str3 = va_arg(ap, char *);
91962+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
91963+ break;
91964+ case GR_FILENAME:
91965+ dentry = va_arg(ap, struct dentry *);
91966+ mnt = va_arg(ap, struct vfsmount *);
91967+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
91968+ break;
91969+ case GR_STR_FILENAME:
91970+ str1 = va_arg(ap, char *);
91971+ dentry = va_arg(ap, struct dentry *);
91972+ mnt = va_arg(ap, struct vfsmount *);
91973+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
91974+ break;
91975+ case GR_FILENAME_STR:
91976+ dentry = va_arg(ap, struct dentry *);
91977+ mnt = va_arg(ap, struct vfsmount *);
91978+ str1 = va_arg(ap, char *);
91979+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
91980+ break;
91981+ case GR_FILENAME_TWO_INT:
91982+ dentry = va_arg(ap, struct dentry *);
91983+ mnt = va_arg(ap, struct vfsmount *);
91984+ num1 = va_arg(ap, int);
91985+ num2 = va_arg(ap, int);
91986+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
91987+ break;
91988+ case GR_FILENAME_TWO_INT_STR:
91989+ dentry = va_arg(ap, struct dentry *);
91990+ mnt = va_arg(ap, struct vfsmount *);
91991+ num1 = va_arg(ap, int);
91992+ num2 = va_arg(ap, int);
91993+ str1 = va_arg(ap, char *);
91994+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
91995+ break;
91996+ case GR_TEXTREL:
91997+ file = va_arg(ap, struct file *);
91998+ ulong1 = va_arg(ap, unsigned long);
91999+ ulong2 = va_arg(ap, unsigned long);
92000+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
92001+ break;
92002+ case GR_PTRACE:
92003+ task = va_arg(ap, struct task_struct *);
92004+ 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));
92005+ break;
92006+ case GR_RESOURCE:
92007+ task = va_arg(ap, struct task_struct *);
92008+ cred = __task_cred(task);
92009+ pcred = __task_cred(task->real_parent);
92010+ ulong1 = va_arg(ap, unsigned long);
92011+ str1 = va_arg(ap, char *);
92012+ ulong2 = va_arg(ap, unsigned long);
92013+ 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));
92014+ break;
92015+ case GR_CAP:
92016+ task = va_arg(ap, struct task_struct *);
92017+ cred = __task_cred(task);
92018+ pcred = __task_cred(task->real_parent);
92019+ str1 = va_arg(ap, char *);
92020+ 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));
92021+ break;
92022+ case GR_SIG:
92023+ str1 = va_arg(ap, char *);
92024+ voidptr = va_arg(ap, void *);
92025+ gr_log_middle_varargs(audit, msg, str1, voidptr);
92026+ break;
92027+ case GR_SIG2:
92028+ task = va_arg(ap, struct task_struct *);
92029+ cred = __task_cred(task);
92030+ pcred = __task_cred(task->real_parent);
92031+ num1 = va_arg(ap, int);
92032+ 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));
92033+ break;
92034+ case GR_CRASH1:
92035+ task = va_arg(ap, struct task_struct *);
92036+ cred = __task_cred(task);
92037+ pcred = __task_cred(task->real_parent);
92038+ ulong1 = va_arg(ap, unsigned long);
92039+ 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);
92040+ break;
92041+ case GR_CRASH2:
92042+ task = va_arg(ap, struct task_struct *);
92043+ cred = __task_cred(task);
92044+ pcred = __task_cred(task->real_parent);
92045+ ulong1 = va_arg(ap, unsigned long);
92046+ 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);
92047+ break;
92048+ case GR_RWXMAP:
92049+ file = va_arg(ap, struct file *);
92050+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
92051+ break;
92052+ case GR_RWXMAPVMA:
92053+ vma = va_arg(ap, struct vm_area_struct *);
92054+ if (vma->vm_file)
92055+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
92056+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
92057+ str1 = "<stack>";
92058+ else if (vma->vm_start <= current->mm->brk &&
92059+ vma->vm_end >= current->mm->start_brk)
92060+ str1 = "<heap>";
92061+ else
92062+ str1 = "<anonymous mapping>";
92063+ gr_log_middle_varargs(audit, msg, str1);
92064+ break;
92065+ case GR_PSACCT:
92066+ {
92067+ unsigned int wday, cday;
92068+ __u8 whr, chr;
92069+ __u8 wmin, cmin;
92070+ __u8 wsec, csec;
92071+ char cur_tty[64] = { 0 };
92072+ char parent_tty[64] = { 0 };
92073+
92074+ task = va_arg(ap, struct task_struct *);
92075+ wday = va_arg(ap, unsigned int);
92076+ cday = va_arg(ap, unsigned int);
92077+ whr = va_arg(ap, int);
92078+ chr = va_arg(ap, int);
92079+ wmin = va_arg(ap, int);
92080+ cmin = va_arg(ap, int);
92081+ wsec = va_arg(ap, int);
92082+ csec = va_arg(ap, int);
92083+ ulong1 = va_arg(ap, unsigned long);
92084+ cred = __task_cred(task);
92085+ pcred = __task_cred(task->real_parent);
92086+
92087+ 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));
92088+ }
92089+ break;
92090+ default:
92091+ gr_log_middle(audit, msg, ap);
92092+ }
92093+ va_end(ap);
92094+ // these don't need DEFAULTSECARGS printed on the end
92095+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
92096+ gr_log_end(audit, 0);
92097+ else
92098+ gr_log_end(audit, 1);
92099+ END_LOCKS(audit);
92100+}
92101diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
92102new file mode 100644
92103index 0000000..0e39d8c
92104--- /dev/null
92105+++ b/grsecurity/grsec_mem.c
92106@@ -0,0 +1,48 @@
92107+#include <linux/kernel.h>
92108+#include <linux/sched.h>
92109+#include <linux/mm.h>
92110+#include <linux/mman.h>
92111+#include <linux/module.h>
92112+#include <linux/grinternal.h>
92113+
92114+void gr_handle_msr_write(void)
92115+{
92116+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
92117+ return;
92118+}
92119+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
92120+
92121+void
92122+gr_handle_ioperm(void)
92123+{
92124+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
92125+ return;
92126+}
92127+
92128+void
92129+gr_handle_iopl(void)
92130+{
92131+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
92132+ return;
92133+}
92134+
92135+void
92136+gr_handle_mem_readwrite(u64 from, u64 to)
92137+{
92138+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
92139+ return;
92140+}
92141+
92142+void
92143+gr_handle_vm86(void)
92144+{
92145+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
92146+ return;
92147+}
92148+
92149+void
92150+gr_log_badprocpid(const char *entry)
92151+{
92152+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
92153+ return;
92154+}
92155diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
92156new file mode 100644
92157index 0000000..fe02bf4
92158--- /dev/null
92159+++ b/grsecurity/grsec_mount.c
92160@@ -0,0 +1,65 @@
92161+#include <linux/kernel.h>
92162+#include <linux/sched.h>
92163+#include <linux/mount.h>
92164+#include <linux/major.h>
92165+#include <linux/grsecurity.h>
92166+#include <linux/grinternal.h>
92167+
92168+void
92169+gr_log_remount(const char *devname, const int retval)
92170+{
92171+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92172+ if (grsec_enable_mount && (retval >= 0))
92173+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
92174+#endif
92175+ return;
92176+}
92177+
92178+void
92179+gr_log_unmount(const char *devname, const int retval)
92180+{
92181+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92182+ if (grsec_enable_mount && (retval >= 0))
92183+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
92184+#endif
92185+ return;
92186+}
92187+
92188+void
92189+gr_log_mount(const char *from, struct path *to, const int retval)
92190+{
92191+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92192+ if (grsec_enable_mount && (retval >= 0))
92193+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
92194+#endif
92195+ return;
92196+}
92197+
92198+int
92199+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
92200+{
92201+#ifdef CONFIG_GRKERNSEC_ROFS
92202+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
92203+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
92204+ return -EPERM;
92205+ } else
92206+ return 0;
92207+#endif
92208+ return 0;
92209+}
92210+
92211+int
92212+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
92213+{
92214+#ifdef CONFIG_GRKERNSEC_ROFS
92215+ struct inode *inode = d_backing_inode(dentry);
92216+
92217+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
92218+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
92219+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
92220+ return -EPERM;
92221+ } else
92222+ return 0;
92223+#endif
92224+ return 0;
92225+}
92226diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
92227new file mode 100644
92228index 0000000..6ee9d50
92229--- /dev/null
92230+++ b/grsecurity/grsec_pax.c
92231@@ -0,0 +1,45 @@
92232+#include <linux/kernel.h>
92233+#include <linux/sched.h>
92234+#include <linux/mm.h>
92235+#include <linux/file.h>
92236+#include <linux/grinternal.h>
92237+#include <linux/grsecurity.h>
92238+
92239+void
92240+gr_log_textrel(struct vm_area_struct * vma)
92241+{
92242+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92243+ if (grsec_enable_log_rwxmaps)
92244+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
92245+#endif
92246+ return;
92247+}
92248+
92249+void gr_log_ptgnustack(struct file *file)
92250+{
92251+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92252+ if (grsec_enable_log_rwxmaps)
92253+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
92254+#endif
92255+ return;
92256+}
92257+
92258+void
92259+gr_log_rwxmmap(struct file *file)
92260+{
92261+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92262+ if (grsec_enable_log_rwxmaps)
92263+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
92264+#endif
92265+ return;
92266+}
92267+
92268+void
92269+gr_log_rwxmprotect(struct vm_area_struct *vma)
92270+{
92271+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92272+ if (grsec_enable_log_rwxmaps)
92273+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
92274+#endif
92275+ return;
92276+}
92277diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
92278new file mode 100644
92279index 0000000..2005a3a
92280--- /dev/null
92281+++ b/grsecurity/grsec_proc.c
92282@@ -0,0 +1,20 @@
92283+#include <linux/kernel.h>
92284+#include <linux/sched.h>
92285+#include <linux/grsecurity.h>
92286+#include <linux/grinternal.h>
92287+
92288+int gr_proc_is_restricted(void)
92289+{
92290+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92291+ const struct cred *cred = current_cred();
92292+#endif
92293+
92294+#ifdef CONFIG_GRKERNSEC_PROC_USER
92295+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
92296+ return -EACCES;
92297+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92298+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
92299+ return -EACCES;
92300+#endif
92301+ return 0;
92302+}
92303diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
92304new file mode 100644
92305index 0000000..304c518
92306--- /dev/null
92307+++ b/grsecurity/grsec_ptrace.c
92308@@ -0,0 +1,30 @@
92309+#include <linux/kernel.h>
92310+#include <linux/sched.h>
92311+#include <linux/grinternal.h>
92312+#include <linux/security.h>
92313+
92314+void
92315+gr_audit_ptrace(struct task_struct *task)
92316+{
92317+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
92318+ if (grsec_enable_audit_ptrace)
92319+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
92320+#endif
92321+ return;
92322+}
92323+
92324+int
92325+gr_ptrace_readexec(struct file *file, int unsafe_flags)
92326+{
92327+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
92328+ const struct dentry *dentry = file->f_path.dentry;
92329+ const struct vfsmount *mnt = file->f_path.mnt;
92330+
92331+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
92332+ (inode_permission(d_backing_inode(dentry), MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
92333+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
92334+ return -EACCES;
92335+ }
92336+#endif
92337+ return 0;
92338+}
92339diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
92340new file mode 100644
92341index 0000000..3860c7e
92342--- /dev/null
92343+++ b/grsecurity/grsec_sig.c
92344@@ -0,0 +1,236 @@
92345+#include <linux/kernel.h>
92346+#include <linux/sched.h>
92347+#include <linux/fs.h>
92348+#include <linux/delay.h>
92349+#include <linux/grsecurity.h>
92350+#include <linux/grinternal.h>
92351+#include <linux/hardirq.h>
92352+
92353+char *signames[] = {
92354+ [SIGSEGV] = "Segmentation fault",
92355+ [SIGILL] = "Illegal instruction",
92356+ [SIGABRT] = "Abort",
92357+ [SIGBUS] = "Invalid alignment/Bus error"
92358+};
92359+
92360+void
92361+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
92362+{
92363+#ifdef CONFIG_GRKERNSEC_SIGNAL
92364+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
92365+ (sig == SIGABRT) || (sig == SIGBUS))) {
92366+ if (task_pid_nr(t) == task_pid_nr(current)) {
92367+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
92368+ } else {
92369+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
92370+ }
92371+ }
92372+#endif
92373+ return;
92374+}
92375+
92376+int
92377+gr_handle_signal(const struct task_struct *p, const int sig)
92378+{
92379+#ifdef CONFIG_GRKERNSEC
92380+ /* ignore the 0 signal for protected task checks */
92381+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
92382+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
92383+ return -EPERM;
92384+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
92385+ return -EPERM;
92386+ }
92387+#endif
92388+ return 0;
92389+}
92390+
92391+#ifdef CONFIG_GRKERNSEC
92392+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
92393+
92394+int gr_fake_force_sig(int sig, struct task_struct *t)
92395+{
92396+ unsigned long int flags;
92397+ int ret, blocked, ignored;
92398+ struct k_sigaction *action;
92399+
92400+ spin_lock_irqsave(&t->sighand->siglock, flags);
92401+ action = &t->sighand->action[sig-1];
92402+ ignored = action->sa.sa_handler == SIG_IGN;
92403+ blocked = sigismember(&t->blocked, sig);
92404+ if (blocked || ignored) {
92405+ action->sa.sa_handler = SIG_DFL;
92406+ if (blocked) {
92407+ sigdelset(&t->blocked, sig);
92408+ recalc_sigpending_and_wake(t);
92409+ }
92410+ }
92411+ if (action->sa.sa_handler == SIG_DFL)
92412+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
92413+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
92414+
92415+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
92416+
92417+ return ret;
92418+}
92419+#endif
92420+
92421+#define GR_USER_BAN_TIME (15 * 60)
92422+#define GR_DAEMON_BRUTE_TIME (30 * 60)
92423+
92424+void gr_handle_brute_attach(int dumpable)
92425+{
92426+#ifdef CONFIG_GRKERNSEC_BRUTE
92427+ struct task_struct *p = current;
92428+ kuid_t uid = GLOBAL_ROOT_UID;
92429+ int daemon = 0;
92430+
92431+ if (!grsec_enable_brute)
92432+ return;
92433+
92434+ rcu_read_lock();
92435+ read_lock(&tasklist_lock);
92436+ read_lock(&grsec_exec_file_lock);
92437+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
92438+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
92439+ p->real_parent->brute = 1;
92440+ daemon = 1;
92441+ } else {
92442+ const struct cred *cred = __task_cred(p), *cred2;
92443+ struct task_struct *tsk, *tsk2;
92444+
92445+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
92446+ struct user_struct *user;
92447+
92448+ uid = cred->uid;
92449+
92450+ /* this is put upon execution past expiration */
92451+ user = find_user(uid);
92452+ if (user == NULL)
92453+ goto unlock;
92454+ user->suid_banned = 1;
92455+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
92456+ if (user->suid_ban_expires == ~0UL)
92457+ user->suid_ban_expires--;
92458+
92459+ /* only kill other threads of the same binary, from the same user */
92460+ do_each_thread(tsk2, tsk) {
92461+ cred2 = __task_cred(tsk);
92462+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
92463+ gr_fake_force_sig(SIGKILL, tsk);
92464+ } while_each_thread(tsk2, tsk);
92465+ }
92466+ }
92467+unlock:
92468+ read_unlock(&grsec_exec_file_lock);
92469+ read_unlock(&tasklist_lock);
92470+ rcu_read_unlock();
92471+
92472+ if (gr_is_global_nonroot(uid))
92473+ 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);
92474+ else if (daemon)
92475+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
92476+
92477+#endif
92478+ return;
92479+}
92480+
92481+void gr_handle_brute_check(void)
92482+{
92483+#ifdef CONFIG_GRKERNSEC_BRUTE
92484+ struct task_struct *p = current;
92485+
92486+ if (unlikely(p->brute)) {
92487+ if (!grsec_enable_brute)
92488+ p->brute = 0;
92489+ else if (time_before(get_seconds(), p->brute_expires))
92490+ msleep(30 * 1000);
92491+ }
92492+#endif
92493+ return;
92494+}
92495+
92496+void gr_handle_kernel_exploit(void)
92497+{
92498+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92499+ const struct cred *cred;
92500+ struct task_struct *tsk, *tsk2;
92501+ struct user_struct *user;
92502+ kuid_t uid;
92503+
92504+ if (in_irq() || in_serving_softirq() || in_nmi())
92505+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
92506+
92507+ uid = current_uid();
92508+
92509+ if (gr_is_global_root(uid))
92510+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
92511+ else {
92512+ /* kill all the processes of this user, hold a reference
92513+ to their creds struct, and prevent them from creating
92514+ another process until system reset
92515+ */
92516+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
92517+ GR_GLOBAL_UID(uid));
92518+ /* we intentionally leak this ref */
92519+ user = get_uid(current->cred->user);
92520+ if (user)
92521+ user->kernel_banned = 1;
92522+
92523+ /* kill all processes of this user */
92524+ read_lock(&tasklist_lock);
92525+ do_each_thread(tsk2, tsk) {
92526+ cred = __task_cred(tsk);
92527+ if (uid_eq(cred->uid, uid))
92528+ gr_fake_force_sig(SIGKILL, tsk);
92529+ } while_each_thread(tsk2, tsk);
92530+ read_unlock(&tasklist_lock);
92531+ }
92532+#endif
92533+}
92534+
92535+#ifdef CONFIG_GRKERNSEC_BRUTE
92536+static bool suid_ban_expired(struct user_struct *user)
92537+{
92538+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
92539+ user->suid_banned = 0;
92540+ user->suid_ban_expires = 0;
92541+ free_uid(user);
92542+ return true;
92543+ }
92544+
92545+ return false;
92546+}
92547+#endif
92548+
92549+int gr_process_kernel_exec_ban(void)
92550+{
92551+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92552+ if (unlikely(current->cred->user->kernel_banned))
92553+ return -EPERM;
92554+#endif
92555+ return 0;
92556+}
92557+
92558+int gr_process_kernel_setuid_ban(struct user_struct *user)
92559+{
92560+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92561+ if (unlikely(user->kernel_banned))
92562+ gr_fake_force_sig(SIGKILL, current);
92563+#endif
92564+ return 0;
92565+}
92566+
92567+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
92568+{
92569+#ifdef CONFIG_GRKERNSEC_BRUTE
92570+ struct user_struct *user = current->cred->user;
92571+ if (unlikely(user->suid_banned)) {
92572+ if (suid_ban_expired(user))
92573+ return 0;
92574+ /* disallow execution of suid binaries only */
92575+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
92576+ return -EPERM;
92577+ }
92578+#endif
92579+ return 0;
92580+}
92581diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
92582new file mode 100644
92583index 0000000..a523bd2
92584--- /dev/null
92585+++ b/grsecurity/grsec_sock.c
92586@@ -0,0 +1,244 @@
92587+#include <linux/kernel.h>
92588+#include <linux/module.h>
92589+#include <linux/sched.h>
92590+#include <linux/file.h>
92591+#include <linux/net.h>
92592+#include <linux/in.h>
92593+#include <linux/ip.h>
92594+#include <net/sock.h>
92595+#include <net/inet_sock.h>
92596+#include <linux/grsecurity.h>
92597+#include <linux/grinternal.h>
92598+#include <linux/gracl.h>
92599+
92600+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
92601+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
92602+
92603+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
92604+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
92605+
92606+#ifdef CONFIG_UNIX_MODULE
92607+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
92608+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
92609+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
92610+EXPORT_SYMBOL_GPL(gr_handle_create);
92611+#endif
92612+
92613+#ifdef CONFIG_GRKERNSEC
92614+#define gr_conn_table_size 32749
92615+struct conn_table_entry {
92616+ struct conn_table_entry *next;
92617+ struct signal_struct *sig;
92618+};
92619+
92620+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
92621+DEFINE_SPINLOCK(gr_conn_table_lock);
92622+
92623+extern const char * gr_socktype_to_name(unsigned char type);
92624+extern const char * gr_proto_to_name(unsigned char proto);
92625+extern const char * gr_sockfamily_to_name(unsigned char family);
92626+
92627+static int
92628+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
92629+{
92630+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
92631+}
92632+
92633+static int
92634+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
92635+ __u16 sport, __u16 dport)
92636+{
92637+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
92638+ sig->gr_sport == sport && sig->gr_dport == dport))
92639+ return 1;
92640+ else
92641+ return 0;
92642+}
92643+
92644+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
92645+{
92646+ struct conn_table_entry **match;
92647+ unsigned int index;
92648+
92649+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
92650+ sig->gr_sport, sig->gr_dport,
92651+ gr_conn_table_size);
92652+
92653+ newent->sig = sig;
92654+
92655+ match = &gr_conn_table[index];
92656+ newent->next = *match;
92657+ *match = newent;
92658+
92659+ return;
92660+}
92661+
92662+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
92663+{
92664+ struct conn_table_entry *match, *last = NULL;
92665+ unsigned int index;
92666+
92667+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
92668+ sig->gr_sport, sig->gr_dport,
92669+ gr_conn_table_size);
92670+
92671+ match = gr_conn_table[index];
92672+ while (match && !conn_match(match->sig,
92673+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
92674+ sig->gr_dport)) {
92675+ last = match;
92676+ match = match->next;
92677+ }
92678+
92679+ if (match) {
92680+ if (last)
92681+ last->next = match->next;
92682+ else
92683+ gr_conn_table[index] = NULL;
92684+ kfree(match);
92685+ }
92686+
92687+ return;
92688+}
92689+
92690+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
92691+ __u16 sport, __u16 dport)
92692+{
92693+ struct conn_table_entry *match;
92694+ unsigned int index;
92695+
92696+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
92697+
92698+ match = gr_conn_table[index];
92699+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
92700+ match = match->next;
92701+
92702+ if (match)
92703+ return match->sig;
92704+ else
92705+ return NULL;
92706+}
92707+
92708+#endif
92709+
92710+void gr_update_task_in_ip_table(const struct inet_sock *inet)
92711+{
92712+#ifdef CONFIG_GRKERNSEC
92713+ struct signal_struct *sig = current->signal;
92714+ struct conn_table_entry *newent;
92715+
92716+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
92717+ if (newent == NULL)
92718+ return;
92719+ /* no bh lock needed since we are called with bh disabled */
92720+ spin_lock(&gr_conn_table_lock);
92721+ gr_del_task_from_ip_table_nolock(sig);
92722+ sig->gr_saddr = inet->inet_rcv_saddr;
92723+ sig->gr_daddr = inet->inet_daddr;
92724+ sig->gr_sport = inet->inet_sport;
92725+ sig->gr_dport = inet->inet_dport;
92726+ gr_add_to_task_ip_table_nolock(sig, newent);
92727+ spin_unlock(&gr_conn_table_lock);
92728+#endif
92729+ return;
92730+}
92731+
92732+void gr_del_task_from_ip_table(struct task_struct *task)
92733+{
92734+#ifdef CONFIG_GRKERNSEC
92735+ spin_lock_bh(&gr_conn_table_lock);
92736+ gr_del_task_from_ip_table_nolock(task->signal);
92737+ spin_unlock_bh(&gr_conn_table_lock);
92738+#endif
92739+ return;
92740+}
92741+
92742+void
92743+gr_attach_curr_ip(const struct sock *sk)
92744+{
92745+#ifdef CONFIG_GRKERNSEC
92746+ struct signal_struct *p, *set;
92747+ const struct inet_sock *inet = inet_sk(sk);
92748+
92749+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
92750+ return;
92751+
92752+ set = current->signal;
92753+
92754+ spin_lock_bh(&gr_conn_table_lock);
92755+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
92756+ inet->inet_dport, inet->inet_sport);
92757+ if (unlikely(p != NULL)) {
92758+ set->curr_ip = p->curr_ip;
92759+ set->used_accept = 1;
92760+ gr_del_task_from_ip_table_nolock(p);
92761+ spin_unlock_bh(&gr_conn_table_lock);
92762+ return;
92763+ }
92764+ spin_unlock_bh(&gr_conn_table_lock);
92765+
92766+ set->curr_ip = inet->inet_daddr;
92767+ set->used_accept = 1;
92768+#endif
92769+ return;
92770+}
92771+
92772+int
92773+gr_handle_sock_all(const int family, const int type, const int protocol)
92774+{
92775+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
92776+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
92777+ (family != AF_UNIX)) {
92778+ if (family == AF_INET)
92779+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
92780+ else
92781+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
92782+ return -EACCES;
92783+ }
92784+#endif
92785+ return 0;
92786+}
92787+
92788+int
92789+gr_handle_sock_server(const struct sockaddr *sck)
92790+{
92791+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
92792+ if (grsec_enable_socket_server &&
92793+ in_group_p(grsec_socket_server_gid) &&
92794+ sck && (sck->sa_family != AF_UNIX) &&
92795+ (sck->sa_family != AF_LOCAL)) {
92796+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
92797+ return -EACCES;
92798+ }
92799+#endif
92800+ return 0;
92801+}
92802+
92803+int
92804+gr_handle_sock_server_other(const struct sock *sck)
92805+{
92806+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
92807+ if (grsec_enable_socket_server &&
92808+ in_group_p(grsec_socket_server_gid) &&
92809+ sck && (sck->sk_family != AF_UNIX) &&
92810+ (sck->sk_family != AF_LOCAL)) {
92811+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
92812+ return -EACCES;
92813+ }
92814+#endif
92815+ return 0;
92816+}
92817+
92818+int
92819+gr_handle_sock_client(const struct sockaddr *sck)
92820+{
92821+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
92822+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
92823+ sck && (sck->sa_family != AF_UNIX) &&
92824+ (sck->sa_family != AF_LOCAL)) {
92825+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
92826+ return -EACCES;
92827+ }
92828+#endif
92829+ return 0;
92830+}
92831diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
92832new file mode 100644
92833index 0000000..aaec43c
92834--- /dev/null
92835+++ b/grsecurity/grsec_sysctl.c
92836@@ -0,0 +1,488 @@
92837+#include <linux/kernel.h>
92838+#include <linux/sched.h>
92839+#include <linux/sysctl.h>
92840+#include <linux/grsecurity.h>
92841+#include <linux/grinternal.h>
92842+
92843+int
92844+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
92845+{
92846+#ifdef CONFIG_GRKERNSEC_SYSCTL
92847+ if (dirname == NULL || name == NULL)
92848+ return 0;
92849+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
92850+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
92851+ return -EACCES;
92852+ }
92853+#endif
92854+ return 0;
92855+}
92856+
92857+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
92858+static int __maybe_unused __read_only one = 1;
92859+#endif
92860+
92861+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
92862+ defined(CONFIG_GRKERNSEC_DENYUSB)
92863+struct ctl_table grsecurity_table[] = {
92864+#ifdef CONFIG_GRKERNSEC_SYSCTL
92865+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
92866+#ifdef CONFIG_GRKERNSEC_IO
92867+ {
92868+ .procname = "disable_priv_io",
92869+ .data = &grsec_disable_privio,
92870+ .maxlen = sizeof(int),
92871+ .mode = 0600,
92872+ .proc_handler = &proc_dointvec_secure,
92873+ },
92874+#endif
92875+#endif
92876+#ifdef CONFIG_GRKERNSEC_LINK
92877+ {
92878+ .procname = "linking_restrictions",
92879+ .data = &grsec_enable_link,
92880+ .maxlen = sizeof(int),
92881+ .mode = 0600,
92882+ .proc_handler = &proc_dointvec_secure,
92883+ },
92884+#endif
92885+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
92886+ {
92887+ .procname = "enforce_symlinksifowner",
92888+ .data = &grsec_enable_symlinkown,
92889+ .maxlen = sizeof(int),
92890+ .mode = 0600,
92891+ .proc_handler = &proc_dointvec_secure,
92892+ },
92893+ {
92894+ .procname = "symlinkown_gid",
92895+ .data = &grsec_symlinkown_gid,
92896+ .maxlen = sizeof(int),
92897+ .mode = 0600,
92898+ .proc_handler = &proc_dointvec_secure,
92899+ },
92900+#endif
92901+#ifdef CONFIG_GRKERNSEC_BRUTE
92902+ {
92903+ .procname = "deter_bruteforce",
92904+ .data = &grsec_enable_brute,
92905+ .maxlen = sizeof(int),
92906+ .mode = 0600,
92907+ .proc_handler = &proc_dointvec_secure,
92908+ },
92909+#endif
92910+#ifdef CONFIG_GRKERNSEC_FIFO
92911+ {
92912+ .procname = "fifo_restrictions",
92913+ .data = &grsec_enable_fifo,
92914+ .maxlen = sizeof(int),
92915+ .mode = 0600,
92916+ .proc_handler = &proc_dointvec_secure,
92917+ },
92918+#endif
92919+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
92920+ {
92921+ .procname = "ptrace_readexec",
92922+ .data = &grsec_enable_ptrace_readexec,
92923+ .maxlen = sizeof(int),
92924+ .mode = 0600,
92925+ .proc_handler = &proc_dointvec_secure,
92926+ },
92927+#endif
92928+#ifdef CONFIG_GRKERNSEC_SETXID
92929+ {
92930+ .procname = "consistent_setxid",
92931+ .data = &grsec_enable_setxid,
92932+ .maxlen = sizeof(int),
92933+ .mode = 0600,
92934+ .proc_handler = &proc_dointvec_secure,
92935+ },
92936+#endif
92937+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
92938+ {
92939+ .procname = "ip_blackhole",
92940+ .data = &grsec_enable_blackhole,
92941+ .maxlen = sizeof(int),
92942+ .mode = 0600,
92943+ .proc_handler = &proc_dointvec_secure,
92944+ },
92945+ {
92946+ .procname = "lastack_retries",
92947+ .data = &grsec_lastack_retries,
92948+ .maxlen = sizeof(int),
92949+ .mode = 0600,
92950+ .proc_handler = &proc_dointvec_secure,
92951+ },
92952+#endif
92953+#ifdef CONFIG_GRKERNSEC_EXECLOG
92954+ {
92955+ .procname = "exec_logging",
92956+ .data = &grsec_enable_execlog,
92957+ .maxlen = sizeof(int),
92958+ .mode = 0600,
92959+ .proc_handler = &proc_dointvec_secure,
92960+ },
92961+#endif
92962+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92963+ {
92964+ .procname = "rwxmap_logging",
92965+ .data = &grsec_enable_log_rwxmaps,
92966+ .maxlen = sizeof(int),
92967+ .mode = 0600,
92968+ .proc_handler = &proc_dointvec_secure,
92969+ },
92970+#endif
92971+#ifdef CONFIG_GRKERNSEC_SIGNAL
92972+ {
92973+ .procname = "signal_logging",
92974+ .data = &grsec_enable_signal,
92975+ .maxlen = sizeof(int),
92976+ .mode = 0600,
92977+ .proc_handler = &proc_dointvec_secure,
92978+ },
92979+#endif
92980+#ifdef CONFIG_GRKERNSEC_FORKFAIL
92981+ {
92982+ .procname = "forkfail_logging",
92983+ .data = &grsec_enable_forkfail,
92984+ .maxlen = sizeof(int),
92985+ .mode = 0600,
92986+ .proc_handler = &proc_dointvec_secure,
92987+ },
92988+#endif
92989+#ifdef CONFIG_GRKERNSEC_TIME
92990+ {
92991+ .procname = "timechange_logging",
92992+ .data = &grsec_enable_time,
92993+ .maxlen = sizeof(int),
92994+ .mode = 0600,
92995+ .proc_handler = &proc_dointvec_secure,
92996+ },
92997+#endif
92998+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
92999+ {
93000+ .procname = "chroot_deny_shmat",
93001+ .data = &grsec_enable_chroot_shmat,
93002+ .maxlen = sizeof(int),
93003+ .mode = 0600,
93004+ .proc_handler = &proc_dointvec_secure,
93005+ },
93006+#endif
93007+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
93008+ {
93009+ .procname = "chroot_deny_unix",
93010+ .data = &grsec_enable_chroot_unix,
93011+ .maxlen = sizeof(int),
93012+ .mode = 0600,
93013+ .proc_handler = &proc_dointvec_secure,
93014+ },
93015+#endif
93016+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
93017+ {
93018+ .procname = "chroot_deny_mount",
93019+ .data = &grsec_enable_chroot_mount,
93020+ .maxlen = sizeof(int),
93021+ .mode = 0600,
93022+ .proc_handler = &proc_dointvec_secure,
93023+ },
93024+#endif
93025+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
93026+ {
93027+ .procname = "chroot_deny_fchdir",
93028+ .data = &grsec_enable_chroot_fchdir,
93029+ .maxlen = sizeof(int),
93030+ .mode = 0600,
93031+ .proc_handler = &proc_dointvec_secure,
93032+ },
93033+#endif
93034+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
93035+ {
93036+ .procname = "chroot_deny_chroot",
93037+ .data = &grsec_enable_chroot_double,
93038+ .maxlen = sizeof(int),
93039+ .mode = 0600,
93040+ .proc_handler = &proc_dointvec_secure,
93041+ },
93042+#endif
93043+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
93044+ {
93045+ .procname = "chroot_deny_pivot",
93046+ .data = &grsec_enable_chroot_pivot,
93047+ .maxlen = sizeof(int),
93048+ .mode = 0600,
93049+ .proc_handler = &proc_dointvec_secure,
93050+ },
93051+#endif
93052+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
93053+ {
93054+ .procname = "chroot_enforce_chdir",
93055+ .data = &grsec_enable_chroot_chdir,
93056+ .maxlen = sizeof(int),
93057+ .mode = 0600,
93058+ .proc_handler = &proc_dointvec_secure,
93059+ },
93060+#endif
93061+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
93062+ {
93063+ .procname = "chroot_deny_chmod",
93064+ .data = &grsec_enable_chroot_chmod,
93065+ .maxlen = sizeof(int),
93066+ .mode = 0600,
93067+ .proc_handler = &proc_dointvec_secure,
93068+ },
93069+#endif
93070+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
93071+ {
93072+ .procname = "chroot_deny_mknod",
93073+ .data = &grsec_enable_chroot_mknod,
93074+ .maxlen = sizeof(int),
93075+ .mode = 0600,
93076+ .proc_handler = &proc_dointvec_secure,
93077+ },
93078+#endif
93079+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
93080+ {
93081+ .procname = "chroot_restrict_nice",
93082+ .data = &grsec_enable_chroot_nice,
93083+ .maxlen = sizeof(int),
93084+ .mode = 0600,
93085+ .proc_handler = &proc_dointvec_secure,
93086+ },
93087+#endif
93088+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
93089+ {
93090+ .procname = "chroot_execlog",
93091+ .data = &grsec_enable_chroot_execlog,
93092+ .maxlen = sizeof(int),
93093+ .mode = 0600,
93094+ .proc_handler = &proc_dointvec_secure,
93095+ },
93096+#endif
93097+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
93098+ {
93099+ .procname = "chroot_caps",
93100+ .data = &grsec_enable_chroot_caps,
93101+ .maxlen = sizeof(int),
93102+ .mode = 0600,
93103+ .proc_handler = &proc_dointvec_secure,
93104+ },
93105+#endif
93106+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
93107+ {
93108+ .procname = "chroot_deny_bad_rename",
93109+ .data = &grsec_enable_chroot_rename,
93110+ .maxlen = sizeof(int),
93111+ .mode = 0600,
93112+ .proc_handler = &proc_dointvec_secure,
93113+ },
93114+#endif
93115+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
93116+ {
93117+ .procname = "chroot_deny_sysctl",
93118+ .data = &grsec_enable_chroot_sysctl,
93119+ .maxlen = sizeof(int),
93120+ .mode = 0600,
93121+ .proc_handler = &proc_dointvec_secure,
93122+ },
93123+#endif
93124+#ifdef CONFIG_GRKERNSEC_TPE
93125+ {
93126+ .procname = "tpe",
93127+ .data = &grsec_enable_tpe,
93128+ .maxlen = sizeof(int),
93129+ .mode = 0600,
93130+ .proc_handler = &proc_dointvec_secure,
93131+ },
93132+ {
93133+ .procname = "tpe_gid",
93134+ .data = &grsec_tpe_gid,
93135+ .maxlen = sizeof(int),
93136+ .mode = 0600,
93137+ .proc_handler = &proc_dointvec_secure,
93138+ },
93139+#endif
93140+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93141+ {
93142+ .procname = "tpe_invert",
93143+ .data = &grsec_enable_tpe_invert,
93144+ .maxlen = sizeof(int),
93145+ .mode = 0600,
93146+ .proc_handler = &proc_dointvec_secure,
93147+ },
93148+#endif
93149+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93150+ {
93151+ .procname = "tpe_restrict_all",
93152+ .data = &grsec_enable_tpe_all,
93153+ .maxlen = sizeof(int),
93154+ .mode = 0600,
93155+ .proc_handler = &proc_dointvec_secure,
93156+ },
93157+#endif
93158+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
93159+ {
93160+ .procname = "socket_all",
93161+ .data = &grsec_enable_socket_all,
93162+ .maxlen = sizeof(int),
93163+ .mode = 0600,
93164+ .proc_handler = &proc_dointvec_secure,
93165+ },
93166+ {
93167+ .procname = "socket_all_gid",
93168+ .data = &grsec_socket_all_gid,
93169+ .maxlen = sizeof(int),
93170+ .mode = 0600,
93171+ .proc_handler = &proc_dointvec_secure,
93172+ },
93173+#endif
93174+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
93175+ {
93176+ .procname = "socket_client",
93177+ .data = &grsec_enable_socket_client,
93178+ .maxlen = sizeof(int),
93179+ .mode = 0600,
93180+ .proc_handler = &proc_dointvec_secure,
93181+ },
93182+ {
93183+ .procname = "socket_client_gid",
93184+ .data = &grsec_socket_client_gid,
93185+ .maxlen = sizeof(int),
93186+ .mode = 0600,
93187+ .proc_handler = &proc_dointvec_secure,
93188+ },
93189+#endif
93190+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
93191+ {
93192+ .procname = "socket_server",
93193+ .data = &grsec_enable_socket_server,
93194+ .maxlen = sizeof(int),
93195+ .mode = 0600,
93196+ .proc_handler = &proc_dointvec_secure,
93197+ },
93198+ {
93199+ .procname = "socket_server_gid",
93200+ .data = &grsec_socket_server_gid,
93201+ .maxlen = sizeof(int),
93202+ .mode = 0600,
93203+ .proc_handler = &proc_dointvec_secure,
93204+ },
93205+#endif
93206+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
93207+ {
93208+ .procname = "audit_group",
93209+ .data = &grsec_enable_group,
93210+ .maxlen = sizeof(int),
93211+ .mode = 0600,
93212+ .proc_handler = &proc_dointvec_secure,
93213+ },
93214+ {
93215+ .procname = "audit_gid",
93216+ .data = &grsec_audit_gid,
93217+ .maxlen = sizeof(int),
93218+ .mode = 0600,
93219+ .proc_handler = &proc_dointvec_secure,
93220+ },
93221+#endif
93222+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
93223+ {
93224+ .procname = "audit_chdir",
93225+ .data = &grsec_enable_chdir,
93226+ .maxlen = sizeof(int),
93227+ .mode = 0600,
93228+ .proc_handler = &proc_dointvec_secure,
93229+ },
93230+#endif
93231+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
93232+ {
93233+ .procname = "audit_mount",
93234+ .data = &grsec_enable_mount,
93235+ .maxlen = sizeof(int),
93236+ .mode = 0600,
93237+ .proc_handler = &proc_dointvec_secure,
93238+ },
93239+#endif
93240+#ifdef CONFIG_GRKERNSEC_DMESG
93241+ {
93242+ .procname = "dmesg",
93243+ .data = &grsec_enable_dmesg,
93244+ .maxlen = sizeof(int),
93245+ .mode = 0600,
93246+ .proc_handler = &proc_dointvec_secure,
93247+ },
93248+#endif
93249+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
93250+ {
93251+ .procname = "chroot_findtask",
93252+ .data = &grsec_enable_chroot_findtask,
93253+ .maxlen = sizeof(int),
93254+ .mode = 0600,
93255+ .proc_handler = &proc_dointvec_secure,
93256+ },
93257+#endif
93258+#ifdef CONFIG_GRKERNSEC_RESLOG
93259+ {
93260+ .procname = "resource_logging",
93261+ .data = &grsec_resource_logging,
93262+ .maxlen = sizeof(int),
93263+ .mode = 0600,
93264+ .proc_handler = &proc_dointvec_secure,
93265+ },
93266+#endif
93267+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
93268+ {
93269+ .procname = "audit_ptrace",
93270+ .data = &grsec_enable_audit_ptrace,
93271+ .maxlen = sizeof(int),
93272+ .mode = 0600,
93273+ .proc_handler = &proc_dointvec_secure,
93274+ },
93275+#endif
93276+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
93277+ {
93278+ .procname = "harden_ptrace",
93279+ .data = &grsec_enable_harden_ptrace,
93280+ .maxlen = sizeof(int),
93281+ .mode = 0600,
93282+ .proc_handler = &proc_dointvec_secure,
93283+ },
93284+#endif
93285+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
93286+ {
93287+ .procname = "harden_ipc",
93288+ .data = &grsec_enable_harden_ipc,
93289+ .maxlen = sizeof(int),
93290+ .mode = 0600,
93291+ .proc_handler = &proc_dointvec_secure,
93292+ },
93293+#endif
93294+ {
93295+ .procname = "grsec_lock",
93296+ .data = &grsec_lock,
93297+ .maxlen = sizeof(int),
93298+ .mode = 0600,
93299+ .proc_handler = &proc_dointvec_secure,
93300+ },
93301+#endif
93302+#ifdef CONFIG_GRKERNSEC_ROFS
93303+ {
93304+ .procname = "romount_protect",
93305+ .data = &grsec_enable_rofs,
93306+ .maxlen = sizeof(int),
93307+ .mode = 0600,
93308+ .proc_handler = &proc_dointvec_minmax_secure,
93309+ .extra1 = &one,
93310+ .extra2 = &one,
93311+ },
93312+#endif
93313+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
93314+ {
93315+ .procname = "deny_new_usb",
93316+ .data = &grsec_deny_new_usb,
93317+ .maxlen = sizeof(int),
93318+ .mode = 0600,
93319+ .proc_handler = &proc_dointvec_secure,
93320+ },
93321+#endif
93322+ { }
93323+};
93324+#endif
93325diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
93326new file mode 100644
93327index 0000000..61b514e
93328--- /dev/null
93329+++ b/grsecurity/grsec_time.c
93330@@ -0,0 +1,16 @@
93331+#include <linux/kernel.h>
93332+#include <linux/sched.h>
93333+#include <linux/grinternal.h>
93334+#include <linux/module.h>
93335+
93336+void
93337+gr_log_timechange(void)
93338+{
93339+#ifdef CONFIG_GRKERNSEC_TIME
93340+ if (grsec_enable_time)
93341+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
93342+#endif
93343+ return;
93344+}
93345+
93346+EXPORT_SYMBOL_GPL(gr_log_timechange);
93347diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
93348new file mode 100644
93349index 0000000..9786671
93350--- /dev/null
93351+++ b/grsecurity/grsec_tpe.c
93352@@ -0,0 +1,78 @@
93353+#include <linux/kernel.h>
93354+#include <linux/sched.h>
93355+#include <linux/file.h>
93356+#include <linux/fs.h>
93357+#include <linux/grinternal.h>
93358+
93359+extern int gr_acl_tpe_check(void);
93360+
93361+int
93362+gr_tpe_allow(const struct file *file)
93363+{
93364+#ifdef CONFIG_GRKERNSEC
93365+ struct inode *inode = d_backing_inode(file->f_path.dentry->d_parent);
93366+ struct inode *file_inode = d_backing_inode(file->f_path.dentry);
93367+ const struct cred *cred = current_cred();
93368+ char *msg = NULL;
93369+ char *msg2 = NULL;
93370+
93371+ // never restrict root
93372+ if (gr_is_global_root(cred->uid))
93373+ return 1;
93374+
93375+ if (grsec_enable_tpe) {
93376+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93377+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
93378+ msg = "not being in trusted group";
93379+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
93380+ msg = "being in untrusted group";
93381+#else
93382+ if (in_group_p(grsec_tpe_gid))
93383+ msg = "being in untrusted group";
93384+#endif
93385+ }
93386+ if (!msg && gr_acl_tpe_check())
93387+ msg = "being in untrusted role";
93388+
93389+ // not in any affected group/role
93390+ if (!msg)
93391+ goto next_check;
93392+
93393+ if (gr_is_global_nonroot(inode->i_uid))
93394+ msg2 = "file in non-root-owned directory";
93395+ else if (inode->i_mode & S_IWOTH)
93396+ msg2 = "file in world-writable directory";
93397+ else if (inode->i_mode & S_IWGRP)
93398+ msg2 = "file in group-writable directory";
93399+ else if (file_inode->i_mode & S_IWOTH)
93400+ msg2 = "file is world-writable";
93401+
93402+ if (msg && msg2) {
93403+ char fullmsg[70] = {0};
93404+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
93405+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
93406+ return 0;
93407+ }
93408+ msg = NULL;
93409+next_check:
93410+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93411+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
93412+ return 1;
93413+
93414+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
93415+ msg = "directory not owned by user";
93416+ else if (inode->i_mode & S_IWOTH)
93417+ msg = "file in world-writable directory";
93418+ else if (inode->i_mode & S_IWGRP)
93419+ msg = "file in group-writable directory";
93420+ else if (file_inode->i_mode & S_IWOTH)
93421+ msg = "file is world-writable";
93422+
93423+ if (msg) {
93424+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
93425+ return 0;
93426+ }
93427+#endif
93428+#endif
93429+ return 1;
93430+}
93431diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
93432new file mode 100644
93433index 0000000..ae02d8e
93434--- /dev/null
93435+++ b/grsecurity/grsec_usb.c
93436@@ -0,0 +1,15 @@
93437+#include <linux/kernel.h>
93438+#include <linux/grinternal.h>
93439+#include <linux/module.h>
93440+
93441+int gr_handle_new_usb(void)
93442+{
93443+#ifdef CONFIG_GRKERNSEC_DENYUSB
93444+ if (grsec_deny_new_usb) {
93445+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
93446+ return 1;
93447+ }
93448+#endif
93449+ return 0;
93450+}
93451+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
93452diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
93453new file mode 100644
93454index 0000000..158b330
93455--- /dev/null
93456+++ b/grsecurity/grsum.c
93457@@ -0,0 +1,64 @@
93458+#include <linux/err.h>
93459+#include <linux/kernel.h>
93460+#include <linux/sched.h>
93461+#include <linux/mm.h>
93462+#include <linux/scatterlist.h>
93463+#include <linux/crypto.h>
93464+#include <linux/gracl.h>
93465+
93466+
93467+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
93468+#error "crypto and sha256 must be built into the kernel"
93469+#endif
93470+
93471+int
93472+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
93473+{
93474+ struct crypto_hash *tfm;
93475+ struct hash_desc desc;
93476+ struct scatterlist sg[2];
93477+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
93478+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
93479+ unsigned long *sumptr = (unsigned long *)sum;
93480+ int cryptres;
93481+ int retval = 1;
93482+ volatile int mismatched = 0;
93483+ volatile int dummy = 0;
93484+ unsigned int i;
93485+
93486+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
93487+ if (IS_ERR(tfm)) {
93488+ /* should never happen, since sha256 should be built in */
93489+ memset(entry->pw, 0, GR_PW_LEN);
93490+ return 1;
93491+ }
93492+
93493+ sg_init_table(sg, 2);
93494+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
93495+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
93496+
93497+ desc.tfm = tfm;
93498+ desc.flags = 0;
93499+
93500+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
93501+ temp_sum);
93502+
93503+ memset(entry->pw, 0, GR_PW_LEN);
93504+
93505+ if (cryptres)
93506+ goto out;
93507+
93508+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
93509+ if (sumptr[i] != tmpsumptr[i])
93510+ mismatched = 1;
93511+ else
93512+ dummy = 1; // waste a cycle
93513+
93514+ if (!mismatched)
93515+ retval = dummy - 1;
93516+
93517+out:
93518+ crypto_free_hash(tfm);
93519+
93520+ return retval;
93521+}
93522diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
93523index 5bdab6b..9ae82fe 100644
93524--- a/include/asm-generic/4level-fixup.h
93525+++ b/include/asm-generic/4level-fixup.h
93526@@ -14,8 +14,10 @@
93527 #define pmd_alloc(mm, pud, address) \
93528 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
93529 NULL: pmd_offset(pud, address))
93530+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
93531
93532 #define pud_alloc(mm, pgd, address) (pgd)
93533+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
93534 #define pud_offset(pgd, start) (pgd)
93535 #define pud_none(pud) 0
93536 #define pud_bad(pud) 0
93537diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
93538index b7babf0..1e4b4f1 100644
93539--- a/include/asm-generic/atomic-long.h
93540+++ b/include/asm-generic/atomic-long.h
93541@@ -22,6 +22,12 @@
93542
93543 typedef atomic64_t atomic_long_t;
93544
93545+#ifdef CONFIG_PAX_REFCOUNT
93546+typedef atomic64_unchecked_t atomic_long_unchecked_t;
93547+#else
93548+typedef atomic64_t atomic_long_unchecked_t;
93549+#endif
93550+
93551 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
93552
93553 static inline long atomic_long_read(atomic_long_t *l)
93554@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
93555 return (long)atomic64_read(v);
93556 }
93557
93558+#ifdef CONFIG_PAX_REFCOUNT
93559+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
93560+{
93561+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93562+
93563+ return (long)atomic64_read_unchecked(v);
93564+}
93565+#endif
93566+
93567 static inline void atomic_long_set(atomic_long_t *l, long i)
93568 {
93569 atomic64_t *v = (atomic64_t *)l;
93570@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
93571 atomic64_set(v, i);
93572 }
93573
93574+#ifdef CONFIG_PAX_REFCOUNT
93575+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
93576+{
93577+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93578+
93579+ atomic64_set_unchecked(v, i);
93580+}
93581+#endif
93582+
93583 static inline void atomic_long_inc(atomic_long_t *l)
93584 {
93585 atomic64_t *v = (atomic64_t *)l;
93586@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
93587 atomic64_inc(v);
93588 }
93589
93590+#ifdef CONFIG_PAX_REFCOUNT
93591+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
93592+{
93593+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93594+
93595+ atomic64_inc_unchecked(v);
93596+}
93597+#endif
93598+
93599 static inline void atomic_long_dec(atomic_long_t *l)
93600 {
93601 atomic64_t *v = (atomic64_t *)l;
93602@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
93603 atomic64_dec(v);
93604 }
93605
93606+#ifdef CONFIG_PAX_REFCOUNT
93607+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
93608+{
93609+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93610+
93611+ atomic64_dec_unchecked(v);
93612+}
93613+#endif
93614+
93615 static inline void atomic_long_add(long i, atomic_long_t *l)
93616 {
93617 atomic64_t *v = (atomic64_t *)l;
93618@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
93619 atomic64_add(i, v);
93620 }
93621
93622+#ifdef CONFIG_PAX_REFCOUNT
93623+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
93624+{
93625+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93626+
93627+ atomic64_add_unchecked(i, v);
93628+}
93629+#endif
93630+
93631 static inline void atomic_long_sub(long i, atomic_long_t *l)
93632 {
93633 atomic64_t *v = (atomic64_t *)l;
93634@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
93635 atomic64_sub(i, v);
93636 }
93637
93638+#ifdef CONFIG_PAX_REFCOUNT
93639+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
93640+{
93641+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93642+
93643+ atomic64_sub_unchecked(i, v);
93644+}
93645+#endif
93646+
93647 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
93648 {
93649 atomic64_t *v = (atomic64_t *)l;
93650@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
93651 return atomic64_add_negative(i, v);
93652 }
93653
93654-static inline long atomic_long_add_return(long i, atomic_long_t *l)
93655+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
93656 {
93657 atomic64_t *v = (atomic64_t *)l;
93658
93659 return (long)atomic64_add_return(i, v);
93660 }
93661
93662+#ifdef CONFIG_PAX_REFCOUNT
93663+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
93664+{
93665+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93666+
93667+ return (long)atomic64_add_return_unchecked(i, v);
93668+}
93669+#endif
93670+
93671 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
93672 {
93673 atomic64_t *v = (atomic64_t *)l;
93674@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
93675 return (long)atomic64_inc_return(v);
93676 }
93677
93678+#ifdef CONFIG_PAX_REFCOUNT
93679+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
93680+{
93681+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93682+
93683+ return (long)atomic64_inc_return_unchecked(v);
93684+}
93685+#endif
93686+
93687 static inline long atomic_long_dec_return(atomic_long_t *l)
93688 {
93689 atomic64_t *v = (atomic64_t *)l;
93690@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
93691
93692 typedef atomic_t atomic_long_t;
93693
93694+#ifdef CONFIG_PAX_REFCOUNT
93695+typedef atomic_unchecked_t atomic_long_unchecked_t;
93696+#else
93697+typedef atomic_t atomic_long_unchecked_t;
93698+#endif
93699+
93700 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
93701 static inline long atomic_long_read(atomic_long_t *l)
93702 {
93703@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
93704 return (long)atomic_read(v);
93705 }
93706
93707+#ifdef CONFIG_PAX_REFCOUNT
93708+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
93709+{
93710+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93711+
93712+ return (long)atomic_read_unchecked(v);
93713+}
93714+#endif
93715+
93716 static inline void atomic_long_set(atomic_long_t *l, long i)
93717 {
93718 atomic_t *v = (atomic_t *)l;
93719@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
93720 atomic_set(v, i);
93721 }
93722
93723+#ifdef CONFIG_PAX_REFCOUNT
93724+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
93725+{
93726+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93727+
93728+ atomic_set_unchecked(v, i);
93729+}
93730+#endif
93731+
93732 static inline void atomic_long_inc(atomic_long_t *l)
93733 {
93734 atomic_t *v = (atomic_t *)l;
93735@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
93736 atomic_inc(v);
93737 }
93738
93739+#ifdef CONFIG_PAX_REFCOUNT
93740+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
93741+{
93742+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93743+
93744+ atomic_inc_unchecked(v);
93745+}
93746+#endif
93747+
93748 static inline void atomic_long_dec(atomic_long_t *l)
93749 {
93750 atomic_t *v = (atomic_t *)l;
93751@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
93752 atomic_dec(v);
93753 }
93754
93755+#ifdef CONFIG_PAX_REFCOUNT
93756+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
93757+{
93758+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93759+
93760+ atomic_dec_unchecked(v);
93761+}
93762+#endif
93763+
93764 static inline void atomic_long_add(long i, atomic_long_t *l)
93765 {
93766 atomic_t *v = (atomic_t *)l;
93767@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
93768 atomic_add(i, v);
93769 }
93770
93771+#ifdef CONFIG_PAX_REFCOUNT
93772+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
93773+{
93774+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93775+
93776+ atomic_add_unchecked(i, v);
93777+}
93778+#endif
93779+
93780 static inline void atomic_long_sub(long i, atomic_long_t *l)
93781 {
93782 atomic_t *v = (atomic_t *)l;
93783@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
93784 atomic_sub(i, v);
93785 }
93786
93787+#ifdef CONFIG_PAX_REFCOUNT
93788+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
93789+{
93790+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93791+
93792+ atomic_sub_unchecked(i, v);
93793+}
93794+#endif
93795+
93796 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
93797 {
93798 atomic_t *v = (atomic_t *)l;
93799@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
93800 return atomic_add_negative(i, v);
93801 }
93802
93803-static inline long atomic_long_add_return(long i, atomic_long_t *l)
93804+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
93805 {
93806 atomic_t *v = (atomic_t *)l;
93807
93808 return (long)atomic_add_return(i, v);
93809 }
93810
93811+#ifdef CONFIG_PAX_REFCOUNT
93812+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
93813+{
93814+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93815+
93816+ return (long)atomic_add_return_unchecked(i, v);
93817+}
93818+
93819+#endif
93820+
93821 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
93822 {
93823 atomic_t *v = (atomic_t *)l;
93824@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
93825 return (long)atomic_inc_return(v);
93826 }
93827
93828+#ifdef CONFIG_PAX_REFCOUNT
93829+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
93830+{
93831+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93832+
93833+ return (long)atomic_inc_return_unchecked(v);
93834+}
93835+#endif
93836+
93837 static inline long atomic_long_dec_return(atomic_long_t *l)
93838 {
93839 atomic_t *v = (atomic_t *)l;
93840@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
93841
93842 #endif /* BITS_PER_LONG == 64 */
93843
93844+#ifdef CONFIG_PAX_REFCOUNT
93845+static inline void pax_refcount_needs_these_functions(void)
93846+{
93847+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
93848+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
93849+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
93850+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
93851+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
93852+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
93853+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
93854+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
93855+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
93856+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
93857+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
93858+#ifdef CONFIG_X86
93859+ atomic_clear_mask_unchecked(0, NULL);
93860+ atomic_set_mask_unchecked(0, NULL);
93861+#endif
93862+
93863+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
93864+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
93865+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
93866+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
93867+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
93868+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
93869+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
93870+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
93871+}
93872+#else
93873+#define atomic_read_unchecked(v) atomic_read(v)
93874+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
93875+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
93876+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
93877+#define atomic_inc_unchecked(v) atomic_inc(v)
93878+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
93879+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
93880+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
93881+#define atomic_dec_unchecked(v) atomic_dec(v)
93882+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
93883+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
93884+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
93885+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
93886+
93887+#define atomic_long_read_unchecked(v) atomic_long_read(v)
93888+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
93889+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
93890+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
93891+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
93892+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
93893+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
93894+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
93895+#endif
93896+
93897 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
93898diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
93899index 30ad9c8..c70c170 100644
93900--- a/include/asm-generic/atomic64.h
93901+++ b/include/asm-generic/atomic64.h
93902@@ -16,6 +16,8 @@ typedef struct {
93903 long long counter;
93904 } atomic64_t;
93905
93906+typedef atomic64_t atomic64_unchecked_t;
93907+
93908 #define ATOMIC64_INIT(i) { (i) }
93909
93910 extern long long atomic64_read(const atomic64_t *v);
93911@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
93912 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
93913 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
93914
93915+#define atomic64_read_unchecked(v) atomic64_read(v)
93916+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
93917+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
93918+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
93919+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
93920+#define atomic64_inc_unchecked(v) atomic64_inc(v)
93921+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
93922+#define atomic64_dec_unchecked(v) atomic64_dec(v)
93923+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
93924+
93925 #endif /* _ASM_GENERIC_ATOMIC64_H */
93926diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
93927index f5c40b0..e902f9d 100644
93928--- a/include/asm-generic/barrier.h
93929+++ b/include/asm-generic/barrier.h
93930@@ -82,7 +82,7 @@
93931 do { \
93932 compiletime_assert_atomic_type(*p); \
93933 smp_mb(); \
93934- ACCESS_ONCE(*p) = (v); \
93935+ ACCESS_ONCE_RW(*p) = (v); \
93936 } while (0)
93937
93938 #define smp_load_acquire(p) \
93939diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
93940index a60a7cc..0fe12f2 100644
93941--- a/include/asm-generic/bitops/__fls.h
93942+++ b/include/asm-generic/bitops/__fls.h
93943@@ -9,7 +9,7 @@
93944 *
93945 * Undefined if no set bit exists, so code should check against 0 first.
93946 */
93947-static __always_inline unsigned long __fls(unsigned long word)
93948+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
93949 {
93950 int num = BITS_PER_LONG - 1;
93951
93952diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
93953index 0576d1f..dad6c71 100644
93954--- a/include/asm-generic/bitops/fls.h
93955+++ b/include/asm-generic/bitops/fls.h
93956@@ -9,7 +9,7 @@
93957 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
93958 */
93959
93960-static __always_inline int fls(int x)
93961+static __always_inline int __intentional_overflow(-1) fls(int x)
93962 {
93963 int r = 32;
93964
93965diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
93966index b097cf8..3d40e14 100644
93967--- a/include/asm-generic/bitops/fls64.h
93968+++ b/include/asm-generic/bitops/fls64.h
93969@@ -15,7 +15,7 @@
93970 * at position 64.
93971 */
93972 #if BITS_PER_LONG == 32
93973-static __always_inline int fls64(__u64 x)
93974+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
93975 {
93976 __u32 h = x >> 32;
93977 if (h)
93978@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
93979 return fls(x);
93980 }
93981 #elif BITS_PER_LONG == 64
93982-static __always_inline int fls64(__u64 x)
93983+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
93984 {
93985 if (x == 0)
93986 return 0;
93987diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
93988index 630dd23..8c1dcb6b 100644
93989--- a/include/asm-generic/bug.h
93990+++ b/include/asm-generic/bug.h
93991@@ -62,13 +62,13 @@ struct bug_entry {
93992 * to provide better diagnostics.
93993 */
93994 #ifndef __WARN_TAINT
93995-extern __printf(3, 4)
93996+extern __printf(3, 4) __nocapture(1, 3, 4)
93997 void warn_slowpath_fmt(const char *file, const int line,
93998 const char *fmt, ...);
93999-extern __printf(4, 5)
94000+extern __printf(4, 5) __nocapture(1, 4, 5)
94001 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
94002 const char *fmt, ...);
94003-extern void warn_slowpath_null(const char *file, const int line);
94004+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
94005 #define WANT_WARN_ON_SLOWPATH
94006 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
94007 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
94008diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
94009index 1bfcfe5..e04c5c9 100644
94010--- a/include/asm-generic/cache.h
94011+++ b/include/asm-generic/cache.h
94012@@ -6,7 +6,7 @@
94013 * cache lines need to provide their own cache.h.
94014 */
94015
94016-#define L1_CACHE_SHIFT 5
94017-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
94018+#define L1_CACHE_SHIFT 5UL
94019+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
94020
94021 #endif /* __ASM_GENERIC_CACHE_H */
94022diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
94023index 0d68a1e..b74a761 100644
94024--- a/include/asm-generic/emergency-restart.h
94025+++ b/include/asm-generic/emergency-restart.h
94026@@ -1,7 +1,7 @@
94027 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
94028 #define _ASM_GENERIC_EMERGENCY_RESTART_H
94029
94030-static inline void machine_emergency_restart(void)
94031+static inline __noreturn void machine_emergency_restart(void)
94032 {
94033 machine_restart(NULL);
94034 }
94035diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
94036index 90f99c7..00ce236 100644
94037--- a/include/asm-generic/kmap_types.h
94038+++ b/include/asm-generic/kmap_types.h
94039@@ -2,9 +2,9 @@
94040 #define _ASM_GENERIC_KMAP_TYPES_H
94041
94042 #ifdef __WITH_KM_FENCE
94043-# define KM_TYPE_NR 41
94044+# define KM_TYPE_NR 42
94045 #else
94046-# define KM_TYPE_NR 20
94047+# define KM_TYPE_NR 21
94048 #endif
94049
94050 #endif
94051diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
94052index 9ceb03b..62b0b8f 100644
94053--- a/include/asm-generic/local.h
94054+++ b/include/asm-generic/local.h
94055@@ -23,24 +23,37 @@ typedef struct
94056 atomic_long_t a;
94057 } local_t;
94058
94059+typedef struct {
94060+ atomic_long_unchecked_t a;
94061+} local_unchecked_t;
94062+
94063 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
94064
94065 #define local_read(l) atomic_long_read(&(l)->a)
94066+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
94067 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
94068+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
94069 #define local_inc(l) atomic_long_inc(&(l)->a)
94070+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
94071 #define local_dec(l) atomic_long_dec(&(l)->a)
94072+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
94073 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
94074+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
94075 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
94076+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
94077
94078 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
94079 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
94080 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
94081 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
94082 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
94083+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
94084 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
94085 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
94086+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
94087
94088 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94089+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94090 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
94091 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
94092 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
94093diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
94094index 725612b..9cc513a 100644
94095--- a/include/asm-generic/pgtable-nopmd.h
94096+++ b/include/asm-generic/pgtable-nopmd.h
94097@@ -1,14 +1,19 @@
94098 #ifndef _PGTABLE_NOPMD_H
94099 #define _PGTABLE_NOPMD_H
94100
94101-#ifndef __ASSEMBLY__
94102-
94103 #include <asm-generic/pgtable-nopud.h>
94104
94105-struct mm_struct;
94106-
94107 #define __PAGETABLE_PMD_FOLDED
94108
94109+#define PMD_SHIFT PUD_SHIFT
94110+#define PTRS_PER_PMD 1
94111+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
94112+#define PMD_MASK (~(PMD_SIZE-1))
94113+
94114+#ifndef __ASSEMBLY__
94115+
94116+struct mm_struct;
94117+
94118 /*
94119 * Having the pmd type consist of a pud gets the size right, and allows
94120 * us to conceptually access the pud entry that this pmd is folded into
94121@@ -16,11 +21,6 @@ struct mm_struct;
94122 */
94123 typedef struct { pud_t pud; } pmd_t;
94124
94125-#define PMD_SHIFT PUD_SHIFT
94126-#define PTRS_PER_PMD 1
94127-#define PMD_SIZE (1UL << PMD_SHIFT)
94128-#define PMD_MASK (~(PMD_SIZE-1))
94129-
94130 /*
94131 * The "pud_xxx()" functions here are trivial for a folded two-level
94132 * setup: the pmd is never bad, and a pmd always exists (as it's folded
94133diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
94134index 810431d..0ec4804f 100644
94135--- a/include/asm-generic/pgtable-nopud.h
94136+++ b/include/asm-generic/pgtable-nopud.h
94137@@ -1,10 +1,15 @@
94138 #ifndef _PGTABLE_NOPUD_H
94139 #define _PGTABLE_NOPUD_H
94140
94141-#ifndef __ASSEMBLY__
94142-
94143 #define __PAGETABLE_PUD_FOLDED
94144
94145+#define PUD_SHIFT PGDIR_SHIFT
94146+#define PTRS_PER_PUD 1
94147+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
94148+#define PUD_MASK (~(PUD_SIZE-1))
94149+
94150+#ifndef __ASSEMBLY__
94151+
94152 /*
94153 * Having the pud type consist of a pgd gets the size right, and allows
94154 * us to conceptually access the pgd entry that this pud is folded into
94155@@ -12,11 +17,6 @@
94156 */
94157 typedef struct { pgd_t pgd; } pud_t;
94158
94159-#define PUD_SHIFT PGDIR_SHIFT
94160-#define PTRS_PER_PUD 1
94161-#define PUD_SIZE (1UL << PUD_SHIFT)
94162-#define PUD_MASK (~(PUD_SIZE-1))
94163-
94164 /*
94165 * The "pgd_xxx()" functions here are trivial for a folded two-level
94166 * setup: the pud is never bad, and a pud always exists (as it's folded
94167@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
94168 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
94169
94170 #define pgd_populate(mm, pgd, pud) do { } while (0)
94171+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
94172 /*
94173 * (puds are folded into pgds so this doesn't get actually called,
94174 * but the define is needed for a generic inline function.)
94175diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
94176index 39f1d6a..7dae6fb 100644
94177--- a/include/asm-generic/pgtable.h
94178+++ b/include/asm-generic/pgtable.h
94179@@ -695,6 +695,22 @@ static inline int pmd_protnone(pmd_t pmd)
94180 }
94181 #endif /* CONFIG_NUMA_BALANCING */
94182
94183+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
94184+#ifdef CONFIG_PAX_KERNEXEC
94185+#error KERNEXEC requires pax_open_kernel
94186+#else
94187+static inline unsigned long pax_open_kernel(void) { return 0; }
94188+#endif
94189+#endif
94190+
94191+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
94192+#ifdef CONFIG_PAX_KERNEXEC
94193+#error KERNEXEC requires pax_close_kernel
94194+#else
94195+static inline unsigned long pax_close_kernel(void) { return 0; }
94196+#endif
94197+#endif
94198+
94199 #endif /* CONFIG_MMU */
94200
94201 #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
94202diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
94203index 72d8803..cb9749c 100644
94204--- a/include/asm-generic/uaccess.h
94205+++ b/include/asm-generic/uaccess.h
94206@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
94207 return __clear_user(to, n);
94208 }
94209
94210+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
94211+#ifdef CONFIG_PAX_MEMORY_UDEREF
94212+#error UDEREF requires pax_open_userland
94213+#else
94214+static inline unsigned long pax_open_userland(void) { return 0; }
94215+#endif
94216+#endif
94217+
94218+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
94219+#ifdef CONFIG_PAX_MEMORY_UDEREF
94220+#error UDEREF requires pax_close_userland
94221+#else
94222+static inline unsigned long pax_close_userland(void) { return 0; }
94223+#endif
94224+#endif
94225+
94226 #endif /* __ASM_GENERIC_UACCESS_H */
94227diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
94228index 8bd374d..9590e70 100644
94229--- a/include/asm-generic/vmlinux.lds.h
94230+++ b/include/asm-generic/vmlinux.lds.h
94231@@ -246,6 +246,7 @@
94232 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
94233 VMLINUX_SYMBOL(__start_rodata) = .; \
94234 *(.rodata) *(.rodata.*) \
94235+ *(.data..read_only) \
94236 *(__vermagic) /* Kernel version magic */ \
94237 . = ALIGN(8); \
94238 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
94239@@ -504,6 +505,7 @@
94240 KERNEL_CTORS() \
94241 MCOUNT_REC() \
94242 *(.init.rodata) \
94243+ *(.init.rodata.*) \
94244 FTRACE_EVENTS() \
94245 TRACE_SYSCALLS() \
94246 KPROBE_BLACKLIST() \
94247@@ -525,6 +527,8 @@
94248
94249 #define EXIT_DATA \
94250 *(.exit.data) \
94251+ *(.exit.rodata) \
94252+ *(.exit.rodata.*) \
94253 MEM_DISCARD(exit.data) \
94254 MEM_DISCARD(exit.rodata)
94255
94256@@ -741,17 +745,18 @@
94257 * section in the linker script will go there too. @phdr should have
94258 * a leading colon.
94259 *
94260- * Note that this macros defines __per_cpu_load as an absolute symbol.
94261+ * Note that this macros defines per_cpu_load as an absolute symbol.
94262 * If there is no need to put the percpu section at a predetermined
94263 * address, use PERCPU_SECTION.
94264 */
94265 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
94266- VMLINUX_SYMBOL(__per_cpu_load) = .; \
94267- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
94268+ per_cpu_load = .; \
94269+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
94270 - LOAD_OFFSET) { \
94271+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
94272 PERCPU_INPUT(cacheline) \
94273 } phdr \
94274- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
94275+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
94276
94277 /**
94278 * PERCPU_SECTION - define output section for percpu area, simple version
94279diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
94280index 0ecb768..f910132 100644
94281--- a/include/crypto/algapi.h
94282+++ b/include/crypto/algapi.h
94283@@ -34,7 +34,7 @@ struct crypto_type {
94284 unsigned int maskclear;
94285 unsigned int maskset;
94286 unsigned int tfmsize;
94287-};
94288+} __do_const;
94289
94290 struct crypto_instance {
94291 struct crypto_alg alg;
94292diff --git a/include/drm/drmP.h b/include/drm/drmP.h
94293index 62c40777..f980496 100644
94294--- a/include/drm/drmP.h
94295+++ b/include/drm/drmP.h
94296@@ -59,6 +59,7 @@
94297
94298 #include <asm/mman.h>
94299 #include <asm/pgalloc.h>
94300+#include <asm/local.h>
94301 #include <asm/uaccess.h>
94302
94303 #include <uapi/drm/drm.h>
94304@@ -137,17 +138,18 @@ void drm_err(const char *format, ...);
94305 /*@{*/
94306
94307 /* driver capabilities and requirements mask */
94308-#define DRIVER_USE_AGP 0x1
94309-#define DRIVER_PCI_DMA 0x8
94310-#define DRIVER_SG 0x10
94311-#define DRIVER_HAVE_DMA 0x20
94312-#define DRIVER_HAVE_IRQ 0x40
94313-#define DRIVER_IRQ_SHARED 0x80
94314-#define DRIVER_GEM 0x1000
94315-#define DRIVER_MODESET 0x2000
94316-#define DRIVER_PRIME 0x4000
94317-#define DRIVER_RENDER 0x8000
94318-#define DRIVER_ATOMIC 0x10000
94319+#define DRIVER_USE_AGP 0x1
94320+#define DRIVER_PCI_DMA 0x8
94321+#define DRIVER_SG 0x10
94322+#define DRIVER_HAVE_DMA 0x20
94323+#define DRIVER_HAVE_IRQ 0x40
94324+#define DRIVER_IRQ_SHARED 0x80
94325+#define DRIVER_GEM 0x1000
94326+#define DRIVER_MODESET 0x2000
94327+#define DRIVER_PRIME 0x4000
94328+#define DRIVER_RENDER 0x8000
94329+#define DRIVER_ATOMIC 0x10000
94330+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
94331
94332 /***********************************************************************/
94333 /** \name Macros to make printk easier */
94334@@ -233,10 +235,12 @@ void drm_err(const char *format, ...);
94335 * \param cmd command.
94336 * \param arg argument.
94337 */
94338-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
94339+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
94340+ struct drm_file *file_priv);
94341+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
94342 struct drm_file *file_priv);
94343
94344-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94345+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
94346 unsigned long arg);
94347
94348 #define DRM_IOCTL_NR(n) _IOC_NR(n)
94349@@ -252,9 +256,9 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94350 struct drm_ioctl_desc {
94351 unsigned int cmd;
94352 int flags;
94353- drm_ioctl_t *func;
94354+ drm_ioctl_t func;
94355 const char *name;
94356-};
94357+} __do_const;
94358
94359 /**
94360 * Creates a driver or general drm_ioctl_desc array entry for the given
94361@@ -645,7 +649,8 @@ struct drm_info_list {
94362 int (*show)(struct seq_file*, void*); /** show callback */
94363 u32 driver_features; /**< Required driver features for this entry */
94364 void *data;
94365-};
94366+} __do_const;
94367+typedef struct drm_info_list __no_const drm_info_list_no_const;
94368
94369 /**
94370 * debugfs node structure. This structure represents a debugfs file.
94371@@ -729,7 +734,7 @@ struct drm_device {
94372
94373 /** \name Usage Counters */
94374 /*@{ */
94375- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94376+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94377 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
94378 int buf_use; /**< Buffers in use -- cannot alloc */
94379 atomic_t buf_alloc; /**< Buffer allocation in progress */
94380diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
94381index c8fc187..079d4c2 100644
94382--- a/include/drm/drm_crtc_helper.h
94383+++ b/include/drm/drm_crtc_helper.h
94384@@ -161,7 +161,7 @@ struct drm_encoder_helper_funcs {
94385 int (*atomic_check)(struct drm_encoder *encoder,
94386 struct drm_crtc_state *crtc_state,
94387 struct drm_connector_state *conn_state);
94388-};
94389+} __no_const;
94390
94391 /**
94392 * struct drm_connector_helper_funcs - helper operations for connectors
94393diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
94394index 6133723..4c1fccb 100644
94395--- a/include/drm/i915_pciids.h
94396+++ b/include/drm/i915_pciids.h
94397@@ -37,7 +37,7 @@
94398 */
94399 #define INTEL_VGA_DEVICE(id, info) { \
94400 0x8086, id, \
94401- ~0, ~0, \
94402+ PCI_ANY_ID, PCI_ANY_ID, \
94403 0x030000, 0xff0000, \
94404 (unsigned long) info }
94405
94406diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
94407index 72dcbe8..8db58d7 100644
94408--- a/include/drm/ttm/ttm_memory.h
94409+++ b/include/drm/ttm/ttm_memory.h
94410@@ -48,7 +48,7 @@
94411
94412 struct ttm_mem_shrink {
94413 int (*do_shrink) (struct ttm_mem_shrink *);
94414-};
94415+} __no_const;
94416
94417 /**
94418 * struct ttm_mem_global - Global memory accounting structure.
94419diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
94420index 49a8284..9643967 100644
94421--- a/include/drm/ttm/ttm_page_alloc.h
94422+++ b/include/drm/ttm/ttm_page_alloc.h
94423@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
94424 */
94425 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
94426
94427+struct device;
94428 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94429 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94430
94431diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
94432index 4b840e8..155d235 100644
94433--- a/include/keys/asymmetric-subtype.h
94434+++ b/include/keys/asymmetric-subtype.h
94435@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
94436 /* Verify the signature on a key of this subtype (optional) */
94437 int (*verify_signature)(const struct key *key,
94438 const struct public_key_signature *sig);
94439-};
94440+} __do_const;
94441
94442 /**
94443 * asymmetric_key_subtype - Get the subtype from an asymmetric key
94444diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
94445index c1da539..1dcec55 100644
94446--- a/include/linux/atmdev.h
94447+++ b/include/linux/atmdev.h
94448@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
94449 #endif
94450
94451 struct k_atm_aal_stats {
94452-#define __HANDLE_ITEM(i) atomic_t i
94453+#define __HANDLE_ITEM(i) atomic_unchecked_t i
94454 __AAL_STAT_ITEMS
94455 #undef __HANDLE_ITEM
94456 };
94457@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
94458 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
94459 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
94460 struct module *owner;
94461-};
94462+} __do_const ;
94463
94464 struct atmphy_ops {
94465 int (*start)(struct atm_dev *dev);
94466diff --git a/include/linux/atomic.h b/include/linux/atomic.h
94467index 5b08a85..60922fb 100644
94468--- a/include/linux/atomic.h
94469+++ b/include/linux/atomic.h
94470@@ -12,7 +12,7 @@
94471 * Atomically adds @a to @v, so long as @v was not already @u.
94472 * Returns non-zero if @v was not @u, and zero otherwise.
94473 */
94474-static inline int atomic_add_unless(atomic_t *v, int a, int u)
94475+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
94476 {
94477 return __atomic_add_unless(v, a, u) != u;
94478 }
94479diff --git a/include/linux/audit.h b/include/linux/audit.h
94480index c2e7e3a..8bfc0e1 100644
94481--- a/include/linux/audit.h
94482+++ b/include/linux/audit.h
94483@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
94484 extern unsigned int audit_serial(void);
94485 extern int auditsc_get_stamp(struct audit_context *ctx,
94486 struct timespec *t, unsigned int *serial);
94487-extern int audit_set_loginuid(kuid_t loginuid);
94488+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
94489
94490 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
94491 {
94492diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
94493index 576e463..28fd926 100644
94494--- a/include/linux/binfmts.h
94495+++ b/include/linux/binfmts.h
94496@@ -44,7 +44,7 @@ struct linux_binprm {
94497 unsigned interp_flags;
94498 unsigned interp_data;
94499 unsigned long loader, exec;
94500-};
94501+} __randomize_layout;
94502
94503 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
94504 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
94505@@ -77,8 +77,10 @@ struct linux_binfmt {
94506 int (*load_binary)(struct linux_binprm *);
94507 int (*load_shlib)(struct file *);
94508 int (*core_dump)(struct coredump_params *cprm);
94509+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
94510+ void (*handle_mmap)(struct file *);
94511 unsigned long min_coredump; /* minimal dump size */
94512-};
94513+} __do_const __randomize_layout;
94514
94515 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
94516
94517diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
94518index ea17cca..dd56e56 100644
94519--- a/include/linux/bitmap.h
94520+++ b/include/linux/bitmap.h
94521@@ -295,7 +295,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
94522 return find_first_zero_bit(src, nbits) == nbits;
94523 }
94524
94525-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
94526+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
94527 {
94528 if (small_const_nbits(nbits))
94529 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
94530diff --git a/include/linux/bitops.h b/include/linux/bitops.h
94531index 297f5bd..0b6d1e8 100644
94532--- a/include/linux/bitops.h
94533+++ b/include/linux/bitops.h
94534@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
94535 * @word: value to rotate
94536 * @shift: bits to roll
94537 */
94538-static inline __u32 rol32(__u32 word, unsigned int shift)
94539+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
94540 {
94541 return (word << shift) | (word >> (32 - shift));
94542 }
94543@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
94544 * @word: value to rotate
94545 * @shift: bits to roll
94546 */
94547-static inline __u32 ror32(__u32 word, unsigned int shift)
94548+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
94549 {
94550 return (word >> shift) | (word << (32 - shift));
94551 }
94552@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
94553 return (__s32)(value << shift) >> shift;
94554 }
94555
94556-static inline unsigned fls_long(unsigned long l)
94557+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
94558 {
94559 if (sizeof(l) == 4)
94560 return fls(l);
94561diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
94562index 5d93a66..978c4a0 100644
94563--- a/include/linux/blkdev.h
94564+++ b/include/linux/blkdev.h
94565@@ -1614,7 +1614,7 @@ struct block_device_operations {
94566 /* this callback is with swap_lock and sometimes page table lock held */
94567 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
94568 struct module *owner;
94569-};
94570+} __do_const;
94571
94572 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
94573 unsigned long);
94574diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
94575index afc1343..9735539 100644
94576--- a/include/linux/blktrace_api.h
94577+++ b/include/linux/blktrace_api.h
94578@@ -25,7 +25,7 @@ struct blk_trace {
94579 struct dentry *dropped_file;
94580 struct dentry *msg_file;
94581 struct list_head running_list;
94582- atomic_t dropped;
94583+ atomic_unchecked_t dropped;
94584 };
94585
94586 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
94587diff --git a/include/linux/cache.h b/include/linux/cache.h
94588index 17e7e82..1d7da26 100644
94589--- a/include/linux/cache.h
94590+++ b/include/linux/cache.h
94591@@ -16,6 +16,14 @@
94592 #define __read_mostly
94593 #endif
94594
94595+#ifndef __read_only
94596+#ifdef CONFIG_PAX_KERNEXEC
94597+#error KERNEXEC requires __read_only
94598+#else
94599+#define __read_only __read_mostly
94600+#endif
94601+#endif
94602+
94603 #ifndef ____cacheline_aligned
94604 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
94605 #endif
94606diff --git a/include/linux/capability.h b/include/linux/capability.h
94607index af9f0b9..71a5e5c 100644
94608--- a/include/linux/capability.h
94609+++ b/include/linux/capability.h
94610@@ -237,15 +237,28 @@ static inline bool capable(int cap)
94611 {
94612 return true;
94613 }
94614+static inline bool capable_nolog(int cap)
94615+{
94616+ return true;
94617+}
94618 static inline bool ns_capable(struct user_namespace *ns, int cap)
94619 {
94620 return true;
94621 }
94622+static inline bool ns_capable_nolog(struct user_namespace *ns, int cap)
94623+{
94624+ return true;
94625+}
94626 #endif /* CONFIG_MULTIUSER */
94627 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
94628+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
94629 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
94630+extern bool capable_nolog(int cap);
94631+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
94632
94633 /* audit system wants to get cap info from files as well */
94634 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
94635
94636+extern int is_privileged_binary(const struct dentry *dentry);
94637+
94638 #endif /* !_LINUX_CAPABILITY_H */
94639diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
94640index 8609d57..86e4d79 100644
94641--- a/include/linux/cdrom.h
94642+++ b/include/linux/cdrom.h
94643@@ -87,7 +87,6 @@ struct cdrom_device_ops {
94644
94645 /* driver specifications */
94646 const int capability; /* capability flags */
94647- int n_minors; /* number of active minor devices */
94648 /* handle uniform packets for scsi type devices (scsi,atapi) */
94649 int (*generic_packet) (struct cdrom_device_info *,
94650 struct packet_command *);
94651diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
94652index bda5ec0b4..51d8ea1 100644
94653--- a/include/linux/cleancache.h
94654+++ b/include/linux/cleancache.h
94655@@ -35,7 +35,7 @@ struct cleancache_ops {
94656 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
94657 void (*invalidate_inode)(int, struct cleancache_filekey);
94658 void (*invalidate_fs)(int);
94659-};
94660+} __no_const;
94661
94662 extern int cleancache_register_ops(struct cleancache_ops *ops);
94663 extern void __cleancache_init_fs(struct super_block *);
94664diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
94665index df69531..0180e68 100644
94666--- a/include/linux/clk-provider.h
94667+++ b/include/linux/clk-provider.h
94668@@ -195,6 +195,7 @@ struct clk_ops {
94669 void (*init)(struct clk_hw *hw);
94670 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
94671 };
94672+typedef struct clk_ops __no_const clk_ops_no_const;
94673
94674 /**
94675 * struct clk_init_data - holds init data that's common to all clocks and is
94676@@ -209,7 +210,7 @@ struct clk_ops {
94677 struct clk_init_data {
94678 const char *name;
94679 const struct clk_ops *ops;
94680- const char **parent_names;
94681+ const char * const *parent_names;
94682 u8 num_parents;
94683 unsigned long flags;
94684 };
94685@@ -426,12 +427,12 @@ extern const struct clk_ops clk_mux_ops;
94686 extern const struct clk_ops clk_mux_ro_ops;
94687
94688 struct clk *clk_register_mux(struct device *dev, const char *name,
94689- const char **parent_names, u8 num_parents, unsigned long flags,
94690+ const char * const *parent_names, u8 num_parents, unsigned long flags,
94691 void __iomem *reg, u8 shift, u8 width,
94692 u8 clk_mux_flags, spinlock_t *lock);
94693
94694 struct clk *clk_register_mux_table(struct device *dev, const char *name,
94695- const char **parent_names, u8 num_parents, unsigned long flags,
94696+ const char * const *parent_names, u8 num_parents, unsigned long flags,
94697 void __iomem *reg, u8 shift, u32 mask,
94698 u8 clk_mux_flags, u32 *table, spinlock_t *lock);
94699
94700diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h
94701index 94bad77..a39e810 100644
94702--- a/include/linux/clkdev.h
94703+++ b/include/linux/clkdev.h
94704@@ -32,7 +32,7 @@ struct clk_lookup {
94705 }
94706
94707 struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
94708- const char *dev_fmt, ...);
94709+ const char *dev_fmt, ...) __printf(3, 4);
94710
94711 void clkdev_add(struct clk_lookup *cl);
94712 void clkdev_drop(struct clk_lookup *cl);
94713@@ -40,7 +40,8 @@ void clkdev_drop(struct clk_lookup *cl);
94714 void clkdev_add_table(struct clk_lookup *, size_t);
94715 int clk_add_alias(const char *, const char *, char *, struct device *);
94716
94717-int clk_register_clkdev(struct clk *, const char *, const char *, ...);
94718+int clk_register_clkdev(struct clk *, const char *, const char *, ...)
94719+ __printf(3, 4);
94720 int clk_register_clkdevs(struct clk *, struct clk_lookup *, size_t);
94721
94722 #ifdef CONFIG_COMMON_CLK
94723diff --git a/include/linux/compat.h b/include/linux/compat.h
94724index ab25814..63b52db 100644
94725--- a/include/linux/compat.h
94726+++ b/include/linux/compat.h
94727@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
94728 compat_size_t __user *len_ptr);
94729
94730 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
94731-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
94732+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
94733 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
94734 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
94735 compat_ssize_t msgsz, int msgflg);
94736@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
94737 long compat_sys_msgctl(int first, int second, void __user *uptr);
94738 long compat_sys_shmctl(int first, int second, void __user *uptr);
94739 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
94740- unsigned nsems, const struct compat_timespec __user *timeout);
94741+ compat_long_t nsems, const struct compat_timespec __user *timeout);
94742 asmlinkage long compat_sys_keyctl(u32 option,
94743 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
94744 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
94745@@ -424,7 +424,7 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv,
94746
94747 asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);
94748
94749-extern int compat_printk(const char *fmt, ...);
94750+extern __printf(1, 2) int compat_printk(const char *fmt, ...);
94751 extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat);
94752 extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set);
94753
94754@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
94755 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
94756 compat_ulong_t addr, compat_ulong_t data);
94757 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
94758- compat_long_t addr, compat_long_t data);
94759+ compat_ulong_t addr, compat_ulong_t data);
94760
94761 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
94762 /*
94763diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
94764index 371e560..e2e4e3e 100644
94765--- a/include/linux/compiler-gcc.h
94766+++ b/include/linux/compiler-gcc.h
94767@@ -108,8 +108,8 @@
94768 */
94769 #define __pure __attribute__((pure))
94770 #define __aligned(x) __attribute__((aligned(x)))
94771-#define __printf(a, b) __attribute__((format(printf, a, b)))
94772-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
94773+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
94774+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
94775 #define noinline __attribute__((noinline))
94776 #define __attribute_const__ __attribute__((__const__))
94777 #define __maybe_unused __attribute__((unused))
94778diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
94779index 769e198..7ee7cb5 100644
94780--- a/include/linux/compiler-gcc4.h
94781+++ b/include/linux/compiler-gcc4.h
94782@@ -39,9 +39,38 @@
94783 # define __compiletime_warning(message) __attribute__((warning(message)))
94784 # define __compiletime_error(message) __attribute__((error(message)))
94785 #endif /* __CHECKER__ */
94786+
94787+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
94788+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
94789+#define __bos0(ptr) __bos((ptr), 0)
94790+#define __bos1(ptr) __bos((ptr), 1)
94791 #endif /* GCC_VERSION >= 40300 */
94792
94793 #if GCC_VERSION >= 40500
94794+
94795+#ifdef RANDSTRUCT_PLUGIN
94796+#define __randomize_layout __attribute__((randomize_layout))
94797+#define __no_randomize_layout __attribute__((no_randomize_layout))
94798+#endif
94799+
94800+#ifdef CONSTIFY_PLUGIN
94801+#define __no_const __attribute__((no_const))
94802+#define __do_const __attribute__((do_const))
94803+#endif
94804+
94805+#ifdef SIZE_OVERFLOW_PLUGIN
94806+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
94807+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
94808+#endif
94809+
94810+#ifdef LATENT_ENTROPY_PLUGIN
94811+#define __latent_entropy __attribute__((latent_entropy))
94812+#endif
94813+
94814+#ifdef INITIFY_PLUGIN
94815+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
94816+#endif
94817+
94818 /*
94819 * Mark a position in code as unreachable. This can be used to
94820 * suppress control flow warnings after asm blocks that transfer
94821diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
94822index efee493..8aa8f6b 100644
94823--- a/include/linux/compiler-gcc5.h
94824+++ b/include/linux/compiler-gcc5.h
94825@@ -28,6 +28,34 @@
94826 # define __compiletime_error(message) __attribute__((error(message)))
94827 #endif /* __CHECKER__ */
94828
94829+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
94830+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
94831+#define __bos0(ptr) __bos((ptr), 0)
94832+#define __bos1(ptr) __bos((ptr), 1)
94833+
94834+#ifdef RANDSTRUCT_PLUGIN
94835+#define __randomize_layout __attribute__((randomize_layout))
94836+#define __no_randomize_layout __attribute__((no_randomize_layout))
94837+#endif
94838+
94839+#ifdef CONSTIFY_PLUGIN
94840+#define __no_const __attribute__((no_const))
94841+#define __do_const __attribute__((do_const))
94842+#endif
94843+
94844+#ifdef SIZE_OVERFLOW_PLUGIN
94845+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
94846+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
94847+#endif
94848+
94849+#ifdef LATENT_ENTROPY_PLUGIN
94850+#define __latent_entropy __attribute__((latent_entropy))
94851+#endif
94852+
94853+#ifdef INITIFY_PLUGIN
94854+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
94855+#endif
94856+
94857 /*
94858 * Mark a position in code as unreachable. This can be used to
94859 * suppress control flow warnings after asm blocks that transfer
94860diff --git a/include/linux/compiler.h b/include/linux/compiler.h
94861index 8677225..2d49df1 100644
94862--- a/include/linux/compiler.h
94863+++ b/include/linux/compiler.h
94864@@ -5,11 +5,14 @@
94865
94866 #ifdef __CHECKER__
94867 # define __user __attribute__((noderef, address_space(1)))
94868+# define __force_user __force __user
94869 # define __kernel __attribute__((address_space(0)))
94870+# define __force_kernel __force __kernel
94871 # define __safe __attribute__((safe))
94872 # define __force __attribute__((force))
94873 # define __nocast __attribute__((nocast))
94874 # define __iomem __attribute__((noderef, address_space(2)))
94875+# define __force_iomem __force __iomem
94876 # define __must_hold(x) __attribute__((context(x,1,1)))
94877 # define __acquires(x) __attribute__((context(x,0,1)))
94878 # define __releases(x) __attribute__((context(x,1,0)))
94879@@ -17,20 +20,37 @@
94880 # define __release(x) __context__(x,-1)
94881 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
94882 # define __percpu __attribute__((noderef, address_space(3)))
94883+# define __force_percpu __force __percpu
94884 #ifdef CONFIG_SPARSE_RCU_POINTER
94885 # define __rcu __attribute__((noderef, address_space(4)))
94886+# define __force_rcu __force __rcu
94887 #else
94888 # define __rcu
94889+# define __force_rcu
94890 #endif
94891 extern void __chk_user_ptr(const volatile void __user *);
94892 extern void __chk_io_ptr(const volatile void __iomem *);
94893 #else
94894-# define __user
94895-# define __kernel
94896+# ifdef CHECKER_PLUGIN
94897+//# define __user
94898+//# define __force_user
94899+//# define __kernel
94900+//# define __force_kernel
94901+# else
94902+# ifdef STRUCTLEAK_PLUGIN
94903+# define __user __attribute__((user))
94904+# else
94905+# define __user
94906+# endif
94907+# define __force_user
94908+# define __kernel
94909+# define __force_kernel
94910+# endif
94911 # define __safe
94912 # define __force
94913 # define __nocast
94914 # define __iomem
94915+# define __force_iomem
94916 # define __chk_user_ptr(x) (void)0
94917 # define __chk_io_ptr(x) (void)0
94918 # define __builtin_warning(x, y...) (1)
94919@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
94920 # define __release(x) (void)0
94921 # define __cond_lock(x,c) (c)
94922 # define __percpu
94923+# define __force_percpu
94924 # define __rcu
94925+# define __force_rcu
94926 #endif
94927
94928 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
94929@@ -199,27 +221,27 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
94930 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
94931 {
94932 switch (size) {
94933- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
94934- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
94935- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
94936- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
94937+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
94938+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
94939+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
94940+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
94941 default:
94942 barrier();
94943- __builtin_memcpy((void *)res, (const void *)p, size);
94944+ __builtin_memcpy(res, (const void *)p, size);
94945 barrier();
94946 }
94947 }
94948
94949-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
94950+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
94951 {
94952 switch (size) {
94953- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
94954- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
94955- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
94956- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
94957+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
94958+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
94959+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
94960+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
94961 default:
94962 barrier();
94963- __builtin_memcpy((void *)p, (const void *)res, size);
94964+ __builtin_memcpy((void *)p, res, size);
94965 barrier();
94966 }
94967 }
94968@@ -352,6 +374,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
94969 # define __attribute_const__ /* unimplemented */
94970 #endif
94971
94972+#ifndef __randomize_layout
94973+# define __randomize_layout
94974+#endif
94975+
94976+#ifndef __no_randomize_layout
94977+# define __no_randomize_layout
94978+#endif
94979+
94980+#ifndef __no_const
94981+# define __no_const
94982+#endif
94983+
94984+#ifndef __do_const
94985+# define __do_const
94986+#endif
94987+
94988+#ifndef __size_overflow
94989+# define __size_overflow(...)
94990+#endif
94991+
94992+#ifndef __intentional_overflow
94993+# define __intentional_overflow(...)
94994+#endif
94995+
94996+#ifndef __latent_entropy
94997+# define __latent_entropy
94998+#endif
94999+
95000+#ifndef __nocapture
95001+# define __nocapture(...)
95002+#endif
95003+
95004 /*
95005 * Tell gcc if a function is cold. The compiler will assume any path
95006 * directly leading to the call is unlikely.
95007@@ -361,6 +415,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95008 #define __cold
95009 #endif
95010
95011+#ifndef __alloc_size
95012+#define __alloc_size(...)
95013+#endif
95014+
95015+#ifndef __bos
95016+#define __bos(ptr, arg)
95017+#endif
95018+
95019+#ifndef __bos0
95020+#define __bos0(ptr)
95021+#endif
95022+
95023+#ifndef __bos1
95024+#define __bos1(ptr)
95025+#endif
95026+
95027 /* Simple shorthand for a section definition */
95028 #ifndef __section
95029 # define __section(S) __attribute__ ((__section__(#S)))
95030@@ -375,6 +445,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95031 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
95032 #endif
95033
95034+#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))
95035+
95036 /* Is this type a native word size -- useful for atomic operations */
95037 #ifndef __native_word
95038 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
95039@@ -454,8 +526,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95040 */
95041 #define __ACCESS_ONCE(x) ({ \
95042 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
95043- (volatile typeof(x) *)&(x); })
95044+ (volatile const typeof(x) *)&(x); })
95045 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
95046+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
95047
95048 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
95049 #ifdef CONFIG_KPROBES
95050diff --git a/include/linux/completion.h b/include/linux/completion.h
95051index 5d5aaae..0ea9b84 100644
95052--- a/include/linux/completion.h
95053+++ b/include/linux/completion.h
95054@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
95055
95056 extern void wait_for_completion(struct completion *);
95057 extern void wait_for_completion_io(struct completion *);
95058-extern int wait_for_completion_interruptible(struct completion *x);
95059-extern int wait_for_completion_killable(struct completion *x);
95060+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
95061+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
95062 extern unsigned long wait_for_completion_timeout(struct completion *x,
95063- unsigned long timeout);
95064+ unsigned long timeout) __intentional_overflow(-1);
95065 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
95066- unsigned long timeout);
95067+ unsigned long timeout) __intentional_overflow(-1);
95068 extern long wait_for_completion_interruptible_timeout(
95069- struct completion *x, unsigned long timeout);
95070+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95071 extern long wait_for_completion_killable_timeout(
95072- struct completion *x, unsigned long timeout);
95073+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95074 extern bool try_wait_for_completion(struct completion *x);
95075 extern bool completion_done(struct completion *x);
95076
95077diff --git a/include/linux/configfs.h b/include/linux/configfs.h
95078index 34025df..9c263df 100644
95079--- a/include/linux/configfs.h
95080+++ b/include/linux/configfs.h
95081@@ -64,7 +64,8 @@ struct config_item {
95082 struct dentry *ci_dentry;
95083 };
95084
95085-extern int config_item_set_name(struct config_item *, const char *, ...);
95086+extern __printf(2, 3)
95087+int config_item_set_name(struct config_item *, const char *, ...);
95088
95089 static inline char *config_item_name(struct config_item * item)
95090 {
95091@@ -125,7 +126,7 @@ struct configfs_attribute {
95092 const char *ca_name;
95093 struct module *ca_owner;
95094 umode_t ca_mode;
95095-};
95096+} __do_const;
95097
95098 /*
95099 * Users often need to create attribute structures for their configurable
95100diff --git a/include/linux/cpu.h b/include/linux/cpu.h
95101index c0fb6b1..23c30bd 100644
95102--- a/include/linux/cpu.h
95103+++ b/include/linux/cpu.h
95104@@ -40,9 +40,10 @@ extern void cpu_remove_dev_attr(struct device_attribute *attr);
95105 extern int cpu_add_dev_attr_group(struct attribute_group *attrs);
95106 extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);
95107
95108-extern struct device *cpu_device_create(struct device *parent, void *drvdata,
95109- const struct attribute_group **groups,
95110- const char *fmt, ...);
95111+extern __printf(4, 5)
95112+struct device *cpu_device_create(struct device *parent, void *drvdata,
95113+ const struct attribute_group **groups,
95114+ const char *fmt, ...);
95115 #ifdef CONFIG_HOTPLUG_CPU
95116 extern void unregister_cpu(struct cpu *cpu);
95117 extern ssize_t arch_cpu_probe(const char *, size_t);
95118diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
95119index 2ee4888..0451f5e 100644
95120--- a/include/linux/cpufreq.h
95121+++ b/include/linux/cpufreq.h
95122@@ -207,6 +207,7 @@ struct global_attr {
95123 ssize_t (*store)(struct kobject *a, struct attribute *b,
95124 const char *c, size_t count);
95125 };
95126+typedef struct global_attr __no_const global_attr_no_const;
95127
95128 #define define_one_global_ro(_name) \
95129 static struct global_attr _name = \
95130@@ -278,7 +279,7 @@ struct cpufreq_driver {
95131 bool boost_supported;
95132 bool boost_enabled;
95133 int (*set_boost)(int state);
95134-};
95135+} __do_const;
95136
95137 /* flags */
95138 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
95139diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
95140index 9c5e892..feb34e0 100644
95141--- a/include/linux/cpuidle.h
95142+++ b/include/linux/cpuidle.h
95143@@ -59,7 +59,8 @@ struct cpuidle_state {
95144 void (*enter_freeze) (struct cpuidle_device *dev,
95145 struct cpuidle_driver *drv,
95146 int index);
95147-};
95148+} __do_const;
95149+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
95150
95151 /* Idle State Flags */
95152 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
95153@@ -227,7 +228,7 @@ struct cpuidle_governor {
95154 void (*reflect) (struct cpuidle_device *dev, int index);
95155
95156 struct module *owner;
95157-};
95158+} __do_const;
95159
95160 #ifdef CONFIG_CPU_IDLE
95161 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
95162diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
95163index 59915ea..81ebec0 100644
95164--- a/include/linux/cpumask.h
95165+++ b/include/linux/cpumask.h
95166@@ -127,17 +127,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95167 }
95168
95169 /* Valid inputs for n are -1 and 0. */
95170-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95171+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95172 {
95173 return n+1;
95174 }
95175
95176-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95177+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95178 {
95179 return n+1;
95180 }
95181
95182-static inline unsigned int cpumask_next_and(int n,
95183+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
95184 const struct cpumask *srcp,
95185 const struct cpumask *andp)
95186 {
95187@@ -181,7 +181,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95188 *
95189 * Returns >= nr_cpu_ids if no further cpus set.
95190 */
95191-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95192+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95193 {
95194 /* -1 is a legal arg here. */
95195 if (n != -1)
95196@@ -196,7 +196,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95197 *
95198 * Returns >= nr_cpu_ids if no further cpus unset.
95199 */
95200-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95201+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95202 {
95203 /* -1 is a legal arg here. */
95204 if (n != -1)
95205@@ -204,7 +204,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95206 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
95207 }
95208
95209-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
95210+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
95211 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
95212 unsigned int cpumask_local_spread(unsigned int i, int node);
95213
95214@@ -471,7 +471,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
95215 * cpumask_weight - Count of bits in *srcp
95216 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
95217 */
95218-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
95219+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
95220 {
95221 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
95222 }
95223diff --git a/include/linux/cred.h b/include/linux/cred.h
95224index 8b6c083..51cb9f5 100644
95225--- a/include/linux/cred.h
95226+++ b/include/linux/cred.h
95227@@ -35,7 +35,7 @@ struct group_info {
95228 int nblocks;
95229 kgid_t small_block[NGROUPS_SMALL];
95230 kgid_t *blocks[0];
95231-};
95232+} __randomize_layout;
95233
95234 /**
95235 * get_group_info - Get a reference to a group info structure
95236@@ -152,7 +152,7 @@ struct cred {
95237 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
95238 struct group_info *group_info; /* supplementary groups for euid/fsgid */
95239 struct rcu_head rcu; /* RCU deletion hook */
95240-};
95241+} __randomize_layout;
95242
95243 extern void __put_cred(struct cred *);
95244 extern void exit_creds(struct task_struct *);
95245@@ -210,6 +210,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
95246 static inline void validate_process_creds(void)
95247 {
95248 }
95249+static inline void validate_task_creds(struct task_struct *task)
95250+{
95251+}
95252 #endif
95253
95254 /**
95255@@ -347,6 +350,7 @@ static inline void put_cred(const struct cred *_cred)
95256
95257 #define task_uid(task) (task_cred_xxx((task), uid))
95258 #define task_euid(task) (task_cred_xxx((task), euid))
95259+#define task_securebits(task) (task_cred_xxx((task), securebits))
95260
95261 #define current_cred_xxx(xxx) \
95262 ({ \
95263diff --git a/include/linux/crypto.h b/include/linux/crypto.h
95264index 10df5d2..503d678 100644
95265--- a/include/linux/crypto.h
95266+++ b/include/linux/crypto.h
95267@@ -632,7 +632,7 @@ struct cipher_tfm {
95268 const u8 *key, unsigned int keylen);
95269 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95270 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95271-};
95272+} __no_const;
95273
95274 struct hash_tfm {
95275 int (*init)(struct hash_desc *desc);
95276@@ -653,13 +653,13 @@ struct compress_tfm {
95277 int (*cot_decompress)(struct crypto_tfm *tfm,
95278 const u8 *src, unsigned int slen,
95279 u8 *dst, unsigned int *dlen);
95280-};
95281+} __no_const;
95282
95283 struct rng_tfm {
95284 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
95285 unsigned int dlen);
95286 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
95287-};
95288+} __no_const;
95289
95290 #define crt_ablkcipher crt_u.ablkcipher
95291 #define crt_aead crt_u.aead
95292diff --git a/include/linux/ctype.h b/include/linux/ctype.h
95293index 653589e..4ef254a 100644
95294--- a/include/linux/ctype.h
95295+++ b/include/linux/ctype.h
95296@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
95297 * Fast implementation of tolower() for internal usage. Do not use in your
95298 * code.
95299 */
95300-static inline char _tolower(const char c)
95301+static inline unsigned char _tolower(const unsigned char c)
95302 {
95303 return c | 0x20;
95304 }
95305diff --git a/include/linux/dcache.h b/include/linux/dcache.h
95306index df334cb..e730faa 100644
95307--- a/include/linux/dcache.h
95308+++ b/include/linux/dcache.h
95309@@ -123,6 +123,9 @@ struct dentry {
95310 unsigned long d_time; /* used by d_revalidate */
95311 void *d_fsdata; /* fs-specific data */
95312
95313+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
95314+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
95315+#endif
95316 struct list_head d_lru; /* LRU list */
95317 struct list_head d_child; /* child of parent list */
95318 struct list_head d_subdirs; /* our children */
95319@@ -133,7 +136,7 @@ struct dentry {
95320 struct hlist_node d_alias; /* inode alias list */
95321 struct rcu_head d_rcu;
95322 } d_u;
95323-};
95324+} __randomize_layout;
95325
95326 /*
95327 * dentry->d_lock spinlock nesting subclasses:
95328@@ -319,13 +322,14 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
95329
95330 static inline unsigned d_count(const struct dentry *dentry)
95331 {
95332- return dentry->d_lockref.count;
95333+ return __lockref_read(&dentry->d_lockref);
95334 }
95335
95336 /*
95337 * helper function for dentry_operations.d_dname() members
95338 */
95339-extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95340+extern __printf(4, 5)
95341+char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95342 extern char *simple_dname(struct dentry *, char *, int);
95343
95344 extern char *__d_path(const struct path *, const struct path *, char *, int);
95345@@ -347,7 +351,7 @@ extern char *dentry_path(struct dentry *, char *, int);
95346 static inline struct dentry *dget_dlock(struct dentry *dentry)
95347 {
95348 if (dentry)
95349- dentry->d_lockref.count++;
95350+ __lockref_inc(&dentry->d_lockref);
95351 return dentry;
95352 }
95353
95354diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
95355index 7925bf0..d5143d2 100644
95356--- a/include/linux/decompress/mm.h
95357+++ b/include/linux/decompress/mm.h
95358@@ -77,7 +77,7 @@ static void free(void *where)
95359 * warnings when not needed (indeed large_malloc / large_free are not
95360 * needed by inflate */
95361
95362-#define malloc(a) kmalloc(a, GFP_KERNEL)
95363+#define malloc(a) kmalloc((a), GFP_KERNEL)
95364 #define free(a) kfree(a)
95365
95366 #define large_malloc(a) vmalloc(a)
95367diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
95368index ce447f0..83c66bd 100644
95369--- a/include/linux/devfreq.h
95370+++ b/include/linux/devfreq.h
95371@@ -114,7 +114,7 @@ struct devfreq_governor {
95372 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
95373 int (*event_handler)(struct devfreq *devfreq,
95374 unsigned int event, void *data);
95375-};
95376+} __do_const;
95377
95378 /**
95379 * struct devfreq - Device devfreq structure
95380diff --git a/include/linux/device.h b/include/linux/device.h
95381index 6558af9..48bce1a 100644
95382--- a/include/linux/device.h
95383+++ b/include/linux/device.h
95384@@ -312,7 +312,7 @@ struct subsys_interface {
95385 struct list_head node;
95386 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
95387 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
95388-};
95389+} __do_const;
95390
95391 int subsys_interface_register(struct subsys_interface *sif);
95392 void subsys_interface_unregister(struct subsys_interface *sif);
95393@@ -508,7 +508,7 @@ struct device_type {
95394 void (*release)(struct device *dev);
95395
95396 const struct dev_pm_ops *pm;
95397-};
95398+} __do_const;
95399
95400 /* interface for exporting device attributes */
95401 struct device_attribute {
95402@@ -518,11 +518,12 @@ struct device_attribute {
95403 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
95404 const char *buf, size_t count);
95405 };
95406+typedef struct device_attribute __no_const device_attribute_no_const;
95407
95408 struct dev_ext_attribute {
95409 struct device_attribute attr;
95410 void *var;
95411-};
95412+} __do_const;
95413
95414 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
95415 char *buf);
95416@@ -607,8 +608,9 @@ extern int devres_release_group(struct device *dev, void *id);
95417
95418 /* managed devm_k.alloc/kfree for device drivers */
95419 extern void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);
95420-extern char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95421- va_list ap);
95422+extern __printf(3, 0)
95423+char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95424+ va_list ap);
95425 extern __printf(3, 4)
95426 char *devm_kasprintf(struct device *dev, gfp_t gfp, const char *fmt, ...);
95427 static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
95428@@ -980,12 +982,10 @@ extern int __must_check device_reprobe(struct device *dev);
95429 /*
95430 * Easy functions for dynamically creating devices on the fly
95431 */
95432-extern struct device *device_create_vargs(struct class *cls,
95433- struct device *parent,
95434- dev_t devt,
95435- void *drvdata,
95436- const char *fmt,
95437- va_list vargs);
95438+extern __printf(5, 0)
95439+struct device *device_create_vargs(struct class *cls, struct device *parent,
95440+ dev_t devt, void *drvdata,
95441+ const char *fmt, va_list vargs);
95442 extern __printf(5, 6)
95443 struct device *device_create(struct class *cls, struct device *parent,
95444 dev_t devt, void *drvdata,
95445diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
95446index ac07ff0..edff186 100644
95447--- a/include/linux/dma-mapping.h
95448+++ b/include/linux/dma-mapping.h
95449@@ -64,7 +64,7 @@ struct dma_map_ops {
95450 u64 (*get_required_mask)(struct device *dev);
95451 #endif
95452 int is_phys;
95453-};
95454+} __do_const;
95455
95456 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
95457
95458diff --git a/include/linux/efi.h b/include/linux/efi.h
95459index af5be03..d8a6ae2 100644
95460--- a/include/linux/efi.h
95461+++ b/include/linux/efi.h
95462@@ -1057,6 +1057,7 @@ struct efivar_operations {
95463 efi_set_variable_nonblocking_t *set_variable_nonblocking;
95464 efi_query_variable_store_t *query_variable_store;
95465 };
95466+typedef struct efivar_operations __no_const efivar_operations_no_const;
95467
95468 struct efivars {
95469 /*
95470diff --git a/include/linux/elf.h b/include/linux/elf.h
95471index 20fa8d8..3d0dd18 100644
95472--- a/include/linux/elf.h
95473+++ b/include/linux/elf.h
95474@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
95475 #define elf_note elf32_note
95476 #define elf_addr_t Elf32_Off
95477 #define Elf_Half Elf32_Half
95478+#define elf_dyn Elf32_Dyn
95479
95480 #else
95481
95482@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
95483 #define elf_note elf64_note
95484 #define elf_addr_t Elf64_Off
95485 #define Elf_Half Elf64_Half
95486+#define elf_dyn Elf64_Dyn
95487
95488 #endif
95489
95490diff --git a/include/linux/err.h b/include/linux/err.h
95491index a729120..6ede2c9 100644
95492--- a/include/linux/err.h
95493+++ b/include/linux/err.h
95494@@ -20,12 +20,12 @@
95495
95496 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
95497
95498-static inline void * __must_check ERR_PTR(long error)
95499+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
95500 {
95501 return (void *) error;
95502 }
95503
95504-static inline long __must_check PTR_ERR(__force const void *ptr)
95505+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
95506 {
95507 return (long) ptr;
95508 }
95509diff --git a/include/linux/extcon.h b/include/linux/extcon.h
95510index 36f49c4..a2a1f4c 100644
95511--- a/include/linux/extcon.h
95512+++ b/include/linux/extcon.h
95513@@ -135,7 +135,7 @@ struct extcon_dev {
95514 /* /sys/class/extcon/.../mutually_exclusive/... */
95515 struct attribute_group attr_g_muex;
95516 struct attribute **attrs_muex;
95517- struct device_attribute *d_attrs_muex;
95518+ device_attribute_no_const *d_attrs_muex;
95519 };
95520
95521 /**
95522diff --git a/include/linux/fb.h b/include/linux/fb.h
95523index 043f328..180ccbf 100644
95524--- a/include/linux/fb.h
95525+++ b/include/linux/fb.h
95526@@ -305,7 +305,8 @@ struct fb_ops {
95527 /* called at KDB enter and leave time to prepare the console */
95528 int (*fb_debug_enter)(struct fb_info *info);
95529 int (*fb_debug_leave)(struct fb_info *info);
95530-};
95531+} __do_const;
95532+typedef struct fb_ops __no_const fb_ops_no_const;
95533
95534 #ifdef CONFIG_FB_TILEBLITTING
95535 #define FB_TILE_CURSOR_NONE 0
95536diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
95537index 230f87b..1fd0485 100644
95538--- a/include/linux/fdtable.h
95539+++ b/include/linux/fdtable.h
95540@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
95541 void put_files_struct(struct files_struct *fs);
95542 void reset_files_struct(struct files_struct *);
95543 int unshare_files(struct files_struct **);
95544-struct files_struct *dup_fd(struct files_struct *, int *);
95545+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
95546 void do_close_on_exec(struct files_struct *);
95547 int iterate_fd(struct files_struct *, unsigned,
95548 int (*)(const void *, struct file *, unsigned),
95549diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
95550index 8293262..2b3b8bd 100644
95551--- a/include/linux/frontswap.h
95552+++ b/include/linux/frontswap.h
95553@@ -11,7 +11,7 @@ struct frontswap_ops {
95554 int (*load)(unsigned, pgoff_t, struct page *);
95555 void (*invalidate_page)(unsigned, pgoff_t);
95556 void (*invalidate_area)(unsigned);
95557-};
95558+} __no_const;
95559
95560 extern bool frontswap_enabled;
95561 extern struct frontswap_ops *
95562diff --git a/include/linux/fs.h b/include/linux/fs.h
95563index 571aab9..03a5b06 100644
95564--- a/include/linux/fs.h
95565+++ b/include/linux/fs.h
95566@@ -437,7 +437,7 @@ struct address_space {
95567 spinlock_t private_lock; /* for use by the address_space */
95568 struct list_head private_list; /* ditto */
95569 void *private_data; /* ditto */
95570-} __attribute__((aligned(sizeof(long))));
95571+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
95572 /*
95573 * On most architectures that alignment is already the case; but
95574 * must be enforced here for CRIS, to let the least significant bit
95575@@ -480,7 +480,7 @@ struct block_device {
95576 int bd_fsfreeze_count;
95577 /* Mutex for freeze */
95578 struct mutex bd_fsfreeze_mutex;
95579-};
95580+} __randomize_layout;
95581
95582 /*
95583 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
95584@@ -666,7 +666,7 @@ struct inode {
95585 #endif
95586
95587 void *i_private; /* fs or device private pointer */
95588-};
95589+} __randomize_layout;
95590
95591 static inline int inode_unhashed(struct inode *inode)
95592 {
95593@@ -861,7 +861,7 @@ struct file {
95594 struct list_head f_tfile_llink;
95595 #endif /* #ifdef CONFIG_EPOLL */
95596 struct address_space *f_mapping;
95597-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
95598+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
95599
95600 struct file_handle {
95601 __u32 handle_bytes;
95602@@ -990,7 +990,7 @@ struct file_lock {
95603 int state; /* state of grant or error if -ve */
95604 } afs;
95605 } fl_u;
95606-};
95607+} __randomize_layout;
95608
95609 struct file_lock_context {
95610 spinlock_t flc_lock;
95611@@ -1351,7 +1351,7 @@ struct super_block {
95612 * Indicates how deep in a filesystem stack this SB is
95613 */
95614 int s_stack_depth;
95615-};
95616+} __randomize_layout;
95617
95618 extern struct timespec current_fs_time(struct super_block *sb);
95619
95620@@ -1603,7 +1603,8 @@ struct file_operations {
95621 #ifndef CONFIG_MMU
95622 unsigned (*mmap_capabilities)(struct file *);
95623 #endif
95624-};
95625+} __do_const __randomize_layout;
95626+typedef struct file_operations __no_const file_operations_no_const;
95627
95628 struct inode_operations {
95629 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
95630@@ -2303,7 +2304,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
95631 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
95632 unsigned int count, const char *name,
95633 const struct file_operations *fops);
95634-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95635+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95636 unsigned int count, const char *name);
95637 extern void unregister_chrdev_region(dev_t, unsigned);
95638 extern void chrdev_show(struct seq_file *,off_t);
95639@@ -2989,4 +2990,14 @@ static inline bool dir_relax(struct inode *inode)
95640 return !IS_DEADDIR(inode);
95641 }
95642
95643+static inline bool is_sidechannel_device(const struct inode *inode)
95644+{
95645+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
95646+ umode_t mode = inode->i_mode;
95647+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
95648+#else
95649+ return false;
95650+#endif
95651+}
95652+
95653 #endif /* _LINUX_FS_H */
95654diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
95655index 0efc3e6..fd23610 100644
95656--- a/include/linux/fs_struct.h
95657+++ b/include/linux/fs_struct.h
95658@@ -6,13 +6,13 @@
95659 #include <linux/seqlock.h>
95660
95661 struct fs_struct {
95662- int users;
95663+ atomic_t users;
95664 spinlock_t lock;
95665 seqcount_t seq;
95666 int umask;
95667 int in_exec;
95668 struct path root, pwd;
95669-};
95670+} __randomize_layout;
95671
95672 extern struct kmem_cache *fs_cachep;
95673
95674diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
95675index 7714849..a4a5c7a 100644
95676--- a/include/linux/fscache-cache.h
95677+++ b/include/linux/fscache-cache.h
95678@@ -113,7 +113,7 @@ struct fscache_operation {
95679 fscache_operation_release_t release;
95680 };
95681
95682-extern atomic_t fscache_op_debug_id;
95683+extern atomic_unchecked_t fscache_op_debug_id;
95684 extern void fscache_op_work_func(struct work_struct *work);
95685
95686 extern void fscache_enqueue_operation(struct fscache_operation *);
95687@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
95688 INIT_WORK(&op->work, fscache_op_work_func);
95689 atomic_set(&op->usage, 1);
95690 op->state = FSCACHE_OP_ST_INITIALISED;
95691- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
95692+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
95693 op->processor = processor;
95694 op->release = release;
95695 INIT_LIST_HEAD(&op->pend_link);
95696diff --git a/include/linux/fscache.h b/include/linux/fscache.h
95697index 115bb81..e7b812b 100644
95698--- a/include/linux/fscache.h
95699+++ b/include/linux/fscache.h
95700@@ -152,7 +152,7 @@ struct fscache_cookie_def {
95701 * - this is mandatory for any object that may have data
95702 */
95703 void (*now_uncached)(void *cookie_netfs_data);
95704-};
95705+} __do_const;
95706
95707 /*
95708 * fscache cached network filesystem type
95709diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
95710index 7ee1774..72505b8 100644
95711--- a/include/linux/fsnotify.h
95712+++ b/include/linux/fsnotify.h
95713@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
95714 struct inode *inode = file_inode(file);
95715 __u32 mask = FS_ACCESS;
95716
95717+ if (is_sidechannel_device(inode))
95718+ return;
95719+
95720 if (S_ISDIR(inode->i_mode))
95721 mask |= FS_ISDIR;
95722
95723@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
95724 struct inode *inode = file_inode(file);
95725 __u32 mask = FS_MODIFY;
95726
95727+ if (is_sidechannel_device(inode))
95728+ return;
95729+
95730 if (S_ISDIR(inode->i_mode))
95731 mask |= FS_ISDIR;
95732
95733@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
95734 */
95735 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
95736 {
95737- return kstrdup(name, GFP_KERNEL);
95738+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
95739 }
95740
95741 /*
95742diff --git a/include/linux/genhd.h b/include/linux/genhd.h
95743index ec274e0..e678159 100644
95744--- a/include/linux/genhd.h
95745+++ b/include/linux/genhd.h
95746@@ -194,7 +194,7 @@ struct gendisk {
95747 struct kobject *slave_dir;
95748
95749 struct timer_rand_state *random;
95750- atomic_t sync_io; /* RAID */
95751+ atomic_unchecked_t sync_io; /* RAID */
95752 struct disk_events *ev;
95753 #ifdef CONFIG_BLK_DEV_INTEGRITY
95754 struct blk_integrity *integrity;
95755@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
95756 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
95757
95758 /* drivers/char/random.c */
95759-extern void add_disk_randomness(struct gendisk *disk);
95760+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
95761 extern void rand_initialize_disk(struct gendisk *disk);
95762
95763 static inline sector_t get_start_sect(struct block_device *bdev)
95764diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
95765index 667c311..abac2a7 100644
95766--- a/include/linux/genl_magic_func.h
95767+++ b/include/linux/genl_magic_func.h
95768@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
95769 },
95770
95771 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
95772-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
95773+static struct genl_ops ZZZ_genl_ops[] = {
95774 #include GENL_MAGIC_INCLUDE_FILE
95775 };
95776
95777diff --git a/include/linux/gfp.h b/include/linux/gfp.h
95778index 15928f0..90b31d7 100644
95779--- a/include/linux/gfp.h
95780+++ b/include/linux/gfp.h
95781@@ -35,6 +35,13 @@ struct vm_area_struct;
95782 #define ___GFP_NO_KSWAPD 0x400000u
95783 #define ___GFP_OTHER_NODE 0x800000u
95784 #define ___GFP_WRITE 0x1000000u
95785+
95786+#ifdef CONFIG_PAX_USERCOPY_SLABS
95787+#define ___GFP_USERCOPY 0x2000000u
95788+#else
95789+#define ___GFP_USERCOPY 0
95790+#endif
95791+
95792 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
95793
95794 /*
95795@@ -94,6 +101,7 @@ struct vm_area_struct;
95796 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
95797 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
95798 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
95799+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
95800
95801 /*
95802 * This may seem redundant, but it's a way of annotating false positives vs.
95803@@ -101,7 +109,7 @@ struct vm_area_struct;
95804 */
95805 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
95806
95807-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
95808+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
95809 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
95810
95811 /* This equals 0, but use constants in case they ever change */
95812@@ -146,6 +154,8 @@ struct vm_area_struct;
95813 /* 4GB DMA on some platforms */
95814 #define GFP_DMA32 __GFP_DMA32
95815
95816+#define GFP_USERCOPY __GFP_USERCOPY
95817+
95818 /* Convert GFP flags to their corresponding migrate type */
95819 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
95820 {
95821diff --git a/include/linux/gracl.h b/include/linux/gracl.h
95822new file mode 100644
95823index 0000000..91858e4
95824--- /dev/null
95825+++ b/include/linux/gracl.h
95826@@ -0,0 +1,342 @@
95827+#ifndef GR_ACL_H
95828+#define GR_ACL_H
95829+
95830+#include <linux/grdefs.h>
95831+#include <linux/resource.h>
95832+#include <linux/capability.h>
95833+#include <linux/dcache.h>
95834+#include <asm/resource.h>
95835+
95836+/* Major status information */
95837+
95838+#define GR_VERSION "grsecurity 3.1"
95839+#define GRSECURITY_VERSION 0x3100
95840+
95841+enum {
95842+ GR_SHUTDOWN = 0,
95843+ GR_ENABLE = 1,
95844+ GR_SPROLE = 2,
95845+ GR_OLDRELOAD = 3,
95846+ GR_SEGVMOD = 4,
95847+ GR_STATUS = 5,
95848+ GR_UNSPROLE = 6,
95849+ GR_PASSSET = 7,
95850+ GR_SPROLEPAM = 8,
95851+ GR_RELOAD = 9,
95852+};
95853+
95854+/* Password setup definitions
95855+ * kernel/grhash.c */
95856+enum {
95857+ GR_PW_LEN = 128,
95858+ GR_SALT_LEN = 16,
95859+ GR_SHA_LEN = 32,
95860+};
95861+
95862+enum {
95863+ GR_SPROLE_LEN = 64,
95864+};
95865+
95866+enum {
95867+ GR_NO_GLOB = 0,
95868+ GR_REG_GLOB,
95869+ GR_CREATE_GLOB
95870+};
95871+
95872+#define GR_NLIMITS 32
95873+
95874+/* Begin Data Structures */
95875+
95876+struct sprole_pw {
95877+ unsigned char *rolename;
95878+ unsigned char salt[GR_SALT_LEN];
95879+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
95880+};
95881+
95882+struct name_entry {
95883+ __u32 key;
95884+ u64 inode;
95885+ dev_t device;
95886+ char *name;
95887+ __u16 len;
95888+ __u8 deleted;
95889+ struct name_entry *prev;
95890+ struct name_entry *next;
95891+};
95892+
95893+struct inodev_entry {
95894+ struct name_entry *nentry;
95895+ struct inodev_entry *prev;
95896+ struct inodev_entry *next;
95897+};
95898+
95899+struct acl_role_db {
95900+ struct acl_role_label **r_hash;
95901+ __u32 r_size;
95902+};
95903+
95904+struct inodev_db {
95905+ struct inodev_entry **i_hash;
95906+ __u32 i_size;
95907+};
95908+
95909+struct name_db {
95910+ struct name_entry **n_hash;
95911+ __u32 n_size;
95912+};
95913+
95914+struct crash_uid {
95915+ uid_t uid;
95916+ unsigned long expires;
95917+};
95918+
95919+struct gr_hash_struct {
95920+ void **table;
95921+ void **nametable;
95922+ void *first;
95923+ __u32 table_size;
95924+ __u32 used_size;
95925+ int type;
95926+};
95927+
95928+/* Userspace Grsecurity ACL data structures */
95929+
95930+struct acl_subject_label {
95931+ char *filename;
95932+ u64 inode;
95933+ dev_t device;
95934+ __u32 mode;
95935+ kernel_cap_t cap_mask;
95936+ kernel_cap_t cap_lower;
95937+ kernel_cap_t cap_invert_audit;
95938+
95939+ struct rlimit res[GR_NLIMITS];
95940+ __u32 resmask;
95941+
95942+ __u8 user_trans_type;
95943+ __u8 group_trans_type;
95944+ uid_t *user_transitions;
95945+ gid_t *group_transitions;
95946+ __u16 user_trans_num;
95947+ __u16 group_trans_num;
95948+
95949+ __u32 sock_families[2];
95950+ __u32 ip_proto[8];
95951+ __u32 ip_type;
95952+ struct acl_ip_label **ips;
95953+ __u32 ip_num;
95954+ __u32 inaddr_any_override;
95955+
95956+ __u32 crashes;
95957+ unsigned long expires;
95958+
95959+ struct acl_subject_label *parent_subject;
95960+ struct gr_hash_struct *hash;
95961+ struct acl_subject_label *prev;
95962+ struct acl_subject_label *next;
95963+
95964+ struct acl_object_label **obj_hash;
95965+ __u32 obj_hash_size;
95966+ __u16 pax_flags;
95967+};
95968+
95969+struct role_allowed_ip {
95970+ __u32 addr;
95971+ __u32 netmask;
95972+
95973+ struct role_allowed_ip *prev;
95974+ struct role_allowed_ip *next;
95975+};
95976+
95977+struct role_transition {
95978+ char *rolename;
95979+
95980+ struct role_transition *prev;
95981+ struct role_transition *next;
95982+};
95983+
95984+struct acl_role_label {
95985+ char *rolename;
95986+ uid_t uidgid;
95987+ __u16 roletype;
95988+
95989+ __u16 auth_attempts;
95990+ unsigned long expires;
95991+
95992+ struct acl_subject_label *root_label;
95993+ struct gr_hash_struct *hash;
95994+
95995+ struct acl_role_label *prev;
95996+ struct acl_role_label *next;
95997+
95998+ struct role_transition *transitions;
95999+ struct role_allowed_ip *allowed_ips;
96000+ uid_t *domain_children;
96001+ __u16 domain_child_num;
96002+
96003+ umode_t umask;
96004+
96005+ struct acl_subject_label **subj_hash;
96006+ __u32 subj_hash_size;
96007+};
96008+
96009+struct user_acl_role_db {
96010+ struct acl_role_label **r_table;
96011+ __u32 num_pointers; /* Number of allocations to track */
96012+ __u32 num_roles; /* Number of roles */
96013+ __u32 num_domain_children; /* Number of domain children */
96014+ __u32 num_subjects; /* Number of subjects */
96015+ __u32 num_objects; /* Number of objects */
96016+};
96017+
96018+struct acl_object_label {
96019+ char *filename;
96020+ u64 inode;
96021+ dev_t device;
96022+ __u32 mode;
96023+
96024+ struct acl_subject_label *nested;
96025+ struct acl_object_label *globbed;
96026+
96027+ /* next two structures not used */
96028+
96029+ struct acl_object_label *prev;
96030+ struct acl_object_label *next;
96031+};
96032+
96033+struct acl_ip_label {
96034+ char *iface;
96035+ __u32 addr;
96036+ __u32 netmask;
96037+ __u16 low, high;
96038+ __u8 mode;
96039+ __u32 type;
96040+ __u32 proto[8];
96041+
96042+ /* next two structures not used */
96043+
96044+ struct acl_ip_label *prev;
96045+ struct acl_ip_label *next;
96046+};
96047+
96048+struct gr_arg {
96049+ struct user_acl_role_db role_db;
96050+ unsigned char pw[GR_PW_LEN];
96051+ unsigned char salt[GR_SALT_LEN];
96052+ unsigned char sum[GR_SHA_LEN];
96053+ unsigned char sp_role[GR_SPROLE_LEN];
96054+ struct sprole_pw *sprole_pws;
96055+ dev_t segv_device;
96056+ u64 segv_inode;
96057+ uid_t segv_uid;
96058+ __u16 num_sprole_pws;
96059+ __u16 mode;
96060+};
96061+
96062+struct gr_arg_wrapper {
96063+ struct gr_arg *arg;
96064+ __u32 version;
96065+ __u32 size;
96066+};
96067+
96068+struct subject_map {
96069+ struct acl_subject_label *user;
96070+ struct acl_subject_label *kernel;
96071+ struct subject_map *prev;
96072+ struct subject_map *next;
96073+};
96074+
96075+struct acl_subj_map_db {
96076+ struct subject_map **s_hash;
96077+ __u32 s_size;
96078+};
96079+
96080+struct gr_policy_state {
96081+ struct sprole_pw **acl_special_roles;
96082+ __u16 num_sprole_pws;
96083+ struct acl_role_label *kernel_role;
96084+ struct acl_role_label *role_list;
96085+ struct acl_role_label *default_role;
96086+ struct acl_role_db acl_role_set;
96087+ struct acl_subj_map_db subj_map_set;
96088+ struct name_db name_set;
96089+ struct inodev_db inodev_set;
96090+};
96091+
96092+struct gr_alloc_state {
96093+ unsigned long alloc_stack_next;
96094+ unsigned long alloc_stack_size;
96095+ void **alloc_stack;
96096+};
96097+
96098+struct gr_reload_state {
96099+ struct gr_policy_state oldpolicy;
96100+ struct gr_alloc_state oldalloc;
96101+ struct gr_policy_state newpolicy;
96102+ struct gr_alloc_state newalloc;
96103+ struct gr_policy_state *oldpolicy_ptr;
96104+ struct gr_alloc_state *oldalloc_ptr;
96105+ unsigned char oldmode;
96106+};
96107+
96108+/* End Data Structures Section */
96109+
96110+/* Hash functions generated by empirical testing by Brad Spengler
96111+ Makes good use of the low bits of the inode. Generally 0-1 times
96112+ in loop for successful match. 0-3 for unsuccessful match.
96113+ Shift/add algorithm with modulus of table size and an XOR*/
96114+
96115+static __inline__ unsigned int
96116+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
96117+{
96118+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
96119+}
96120+
96121+ static __inline__ unsigned int
96122+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
96123+{
96124+ return ((const unsigned long)userp % sz);
96125+}
96126+
96127+static __inline__ unsigned int
96128+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
96129+{
96130+ unsigned int rem;
96131+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
96132+ return rem;
96133+}
96134+
96135+static __inline__ unsigned int
96136+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
96137+{
96138+ return full_name_hash((const unsigned char *)name, len) % sz;
96139+}
96140+
96141+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
96142+ subj = NULL; \
96143+ iter = 0; \
96144+ while (iter < role->subj_hash_size) { \
96145+ if (subj == NULL) \
96146+ subj = role->subj_hash[iter]; \
96147+ if (subj == NULL) { \
96148+ iter++; \
96149+ continue; \
96150+ }
96151+
96152+#define FOR_EACH_SUBJECT_END(subj,iter) \
96153+ subj = subj->next; \
96154+ if (subj == NULL) \
96155+ iter++; \
96156+ }
96157+
96158+
96159+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
96160+ subj = role->hash->first; \
96161+ while (subj != NULL) {
96162+
96163+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
96164+ subj = subj->next; \
96165+ }
96166+
96167+#endif
96168+
96169diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
96170new file mode 100644
96171index 0000000..af64092
96172--- /dev/null
96173+++ b/include/linux/gracl_compat.h
96174@@ -0,0 +1,156 @@
96175+#ifndef GR_ACL_COMPAT_H
96176+#define GR_ACL_COMPAT_H
96177+
96178+#include <linux/resource.h>
96179+#include <asm/resource.h>
96180+
96181+struct sprole_pw_compat {
96182+ compat_uptr_t rolename;
96183+ unsigned char salt[GR_SALT_LEN];
96184+ unsigned char sum[GR_SHA_LEN];
96185+};
96186+
96187+struct gr_hash_struct_compat {
96188+ compat_uptr_t table;
96189+ compat_uptr_t nametable;
96190+ compat_uptr_t first;
96191+ __u32 table_size;
96192+ __u32 used_size;
96193+ int type;
96194+};
96195+
96196+struct acl_subject_label_compat {
96197+ compat_uptr_t filename;
96198+ compat_u64 inode;
96199+ __u32 device;
96200+ __u32 mode;
96201+ kernel_cap_t cap_mask;
96202+ kernel_cap_t cap_lower;
96203+ kernel_cap_t cap_invert_audit;
96204+
96205+ struct compat_rlimit res[GR_NLIMITS];
96206+ __u32 resmask;
96207+
96208+ __u8 user_trans_type;
96209+ __u8 group_trans_type;
96210+ compat_uptr_t user_transitions;
96211+ compat_uptr_t group_transitions;
96212+ __u16 user_trans_num;
96213+ __u16 group_trans_num;
96214+
96215+ __u32 sock_families[2];
96216+ __u32 ip_proto[8];
96217+ __u32 ip_type;
96218+ compat_uptr_t ips;
96219+ __u32 ip_num;
96220+ __u32 inaddr_any_override;
96221+
96222+ __u32 crashes;
96223+ compat_ulong_t expires;
96224+
96225+ compat_uptr_t parent_subject;
96226+ compat_uptr_t hash;
96227+ compat_uptr_t prev;
96228+ compat_uptr_t next;
96229+
96230+ compat_uptr_t obj_hash;
96231+ __u32 obj_hash_size;
96232+ __u16 pax_flags;
96233+};
96234+
96235+struct role_allowed_ip_compat {
96236+ __u32 addr;
96237+ __u32 netmask;
96238+
96239+ compat_uptr_t prev;
96240+ compat_uptr_t next;
96241+};
96242+
96243+struct role_transition_compat {
96244+ compat_uptr_t rolename;
96245+
96246+ compat_uptr_t prev;
96247+ compat_uptr_t next;
96248+};
96249+
96250+struct acl_role_label_compat {
96251+ compat_uptr_t rolename;
96252+ uid_t uidgid;
96253+ __u16 roletype;
96254+
96255+ __u16 auth_attempts;
96256+ compat_ulong_t expires;
96257+
96258+ compat_uptr_t root_label;
96259+ compat_uptr_t hash;
96260+
96261+ compat_uptr_t prev;
96262+ compat_uptr_t next;
96263+
96264+ compat_uptr_t transitions;
96265+ compat_uptr_t allowed_ips;
96266+ compat_uptr_t domain_children;
96267+ __u16 domain_child_num;
96268+
96269+ umode_t umask;
96270+
96271+ compat_uptr_t subj_hash;
96272+ __u32 subj_hash_size;
96273+};
96274+
96275+struct user_acl_role_db_compat {
96276+ compat_uptr_t r_table;
96277+ __u32 num_pointers;
96278+ __u32 num_roles;
96279+ __u32 num_domain_children;
96280+ __u32 num_subjects;
96281+ __u32 num_objects;
96282+};
96283+
96284+struct acl_object_label_compat {
96285+ compat_uptr_t filename;
96286+ compat_u64 inode;
96287+ __u32 device;
96288+ __u32 mode;
96289+
96290+ compat_uptr_t nested;
96291+ compat_uptr_t globbed;
96292+
96293+ compat_uptr_t prev;
96294+ compat_uptr_t next;
96295+};
96296+
96297+struct acl_ip_label_compat {
96298+ compat_uptr_t iface;
96299+ __u32 addr;
96300+ __u32 netmask;
96301+ __u16 low, high;
96302+ __u8 mode;
96303+ __u32 type;
96304+ __u32 proto[8];
96305+
96306+ compat_uptr_t prev;
96307+ compat_uptr_t next;
96308+};
96309+
96310+struct gr_arg_compat {
96311+ struct user_acl_role_db_compat role_db;
96312+ unsigned char pw[GR_PW_LEN];
96313+ unsigned char salt[GR_SALT_LEN];
96314+ unsigned char sum[GR_SHA_LEN];
96315+ unsigned char sp_role[GR_SPROLE_LEN];
96316+ compat_uptr_t sprole_pws;
96317+ __u32 segv_device;
96318+ compat_u64 segv_inode;
96319+ uid_t segv_uid;
96320+ __u16 num_sprole_pws;
96321+ __u16 mode;
96322+};
96323+
96324+struct gr_arg_wrapper_compat {
96325+ compat_uptr_t arg;
96326+ __u32 version;
96327+ __u32 size;
96328+};
96329+
96330+#endif
96331diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
96332new file mode 100644
96333index 0000000..323ecf2
96334--- /dev/null
96335+++ b/include/linux/gralloc.h
96336@@ -0,0 +1,9 @@
96337+#ifndef __GRALLOC_H
96338+#define __GRALLOC_H
96339+
96340+void acl_free_all(void);
96341+int acl_alloc_stack_init(unsigned long size);
96342+void *acl_alloc(unsigned long len);
96343+void *acl_alloc_num(unsigned long num, unsigned long len);
96344+
96345+#endif
96346diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
96347new file mode 100644
96348index 0000000..be66033
96349--- /dev/null
96350+++ b/include/linux/grdefs.h
96351@@ -0,0 +1,140 @@
96352+#ifndef GRDEFS_H
96353+#define GRDEFS_H
96354+
96355+/* Begin grsecurity status declarations */
96356+
96357+enum {
96358+ GR_READY = 0x01,
96359+ GR_STATUS_INIT = 0x00 // disabled state
96360+};
96361+
96362+/* Begin ACL declarations */
96363+
96364+/* Role flags */
96365+
96366+enum {
96367+ GR_ROLE_USER = 0x0001,
96368+ GR_ROLE_GROUP = 0x0002,
96369+ GR_ROLE_DEFAULT = 0x0004,
96370+ GR_ROLE_SPECIAL = 0x0008,
96371+ GR_ROLE_AUTH = 0x0010,
96372+ GR_ROLE_NOPW = 0x0020,
96373+ GR_ROLE_GOD = 0x0040,
96374+ GR_ROLE_LEARN = 0x0080,
96375+ GR_ROLE_TPE = 0x0100,
96376+ GR_ROLE_DOMAIN = 0x0200,
96377+ GR_ROLE_PAM = 0x0400,
96378+ GR_ROLE_PERSIST = 0x0800
96379+};
96380+
96381+/* ACL Subject and Object mode flags */
96382+enum {
96383+ GR_DELETED = 0x80000000
96384+};
96385+
96386+/* ACL Object-only mode flags */
96387+enum {
96388+ GR_READ = 0x00000001,
96389+ GR_APPEND = 0x00000002,
96390+ GR_WRITE = 0x00000004,
96391+ GR_EXEC = 0x00000008,
96392+ GR_FIND = 0x00000010,
96393+ GR_INHERIT = 0x00000020,
96394+ GR_SETID = 0x00000040,
96395+ GR_CREATE = 0x00000080,
96396+ GR_DELETE = 0x00000100,
96397+ GR_LINK = 0x00000200,
96398+ GR_AUDIT_READ = 0x00000400,
96399+ GR_AUDIT_APPEND = 0x00000800,
96400+ GR_AUDIT_WRITE = 0x00001000,
96401+ GR_AUDIT_EXEC = 0x00002000,
96402+ GR_AUDIT_FIND = 0x00004000,
96403+ GR_AUDIT_INHERIT= 0x00008000,
96404+ GR_AUDIT_SETID = 0x00010000,
96405+ GR_AUDIT_CREATE = 0x00020000,
96406+ GR_AUDIT_DELETE = 0x00040000,
96407+ GR_AUDIT_LINK = 0x00080000,
96408+ GR_PTRACERD = 0x00100000,
96409+ GR_NOPTRACE = 0x00200000,
96410+ GR_SUPPRESS = 0x00400000,
96411+ GR_NOLEARN = 0x00800000,
96412+ GR_INIT_TRANSFER= 0x01000000
96413+};
96414+
96415+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
96416+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
96417+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
96418+
96419+/* ACL subject-only mode flags */
96420+enum {
96421+ GR_KILL = 0x00000001,
96422+ GR_VIEW = 0x00000002,
96423+ GR_PROTECTED = 0x00000004,
96424+ GR_LEARN = 0x00000008,
96425+ GR_OVERRIDE = 0x00000010,
96426+ /* just a placeholder, this mode is only used in userspace */
96427+ GR_DUMMY = 0x00000020,
96428+ GR_PROTSHM = 0x00000040,
96429+ GR_KILLPROC = 0x00000080,
96430+ GR_KILLIPPROC = 0x00000100,
96431+ /* just a placeholder, this mode is only used in userspace */
96432+ GR_NOTROJAN = 0x00000200,
96433+ GR_PROTPROCFD = 0x00000400,
96434+ GR_PROCACCT = 0x00000800,
96435+ GR_RELAXPTRACE = 0x00001000,
96436+ //GR_NESTED = 0x00002000,
96437+ GR_INHERITLEARN = 0x00004000,
96438+ GR_PROCFIND = 0x00008000,
96439+ GR_POVERRIDE = 0x00010000,
96440+ GR_KERNELAUTH = 0x00020000,
96441+ GR_ATSECURE = 0x00040000,
96442+ GR_SHMEXEC = 0x00080000
96443+};
96444+
96445+enum {
96446+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
96447+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
96448+ GR_PAX_ENABLE_MPROTECT = 0x0004,
96449+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
96450+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
96451+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
96452+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
96453+ GR_PAX_DISABLE_MPROTECT = 0x0400,
96454+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
96455+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
96456+};
96457+
96458+enum {
96459+ GR_ID_USER = 0x01,
96460+ GR_ID_GROUP = 0x02,
96461+};
96462+
96463+enum {
96464+ GR_ID_ALLOW = 0x01,
96465+ GR_ID_DENY = 0x02,
96466+};
96467+
96468+#define GR_CRASH_RES 31
96469+#define GR_UIDTABLE_MAX 500
96470+
96471+/* begin resource learning section */
96472+enum {
96473+ GR_RLIM_CPU_BUMP = 60,
96474+ GR_RLIM_FSIZE_BUMP = 50000,
96475+ GR_RLIM_DATA_BUMP = 10000,
96476+ GR_RLIM_STACK_BUMP = 1000,
96477+ GR_RLIM_CORE_BUMP = 10000,
96478+ GR_RLIM_RSS_BUMP = 500000,
96479+ GR_RLIM_NPROC_BUMP = 1,
96480+ GR_RLIM_NOFILE_BUMP = 5,
96481+ GR_RLIM_MEMLOCK_BUMP = 50000,
96482+ GR_RLIM_AS_BUMP = 500000,
96483+ GR_RLIM_LOCKS_BUMP = 2,
96484+ GR_RLIM_SIGPENDING_BUMP = 5,
96485+ GR_RLIM_MSGQUEUE_BUMP = 10000,
96486+ GR_RLIM_NICE_BUMP = 1,
96487+ GR_RLIM_RTPRIO_BUMP = 1,
96488+ GR_RLIM_RTTIME_BUMP = 1000000
96489+};
96490+
96491+#endif
96492diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
96493new file mode 100644
96494index 0000000..fb1de5d
96495--- /dev/null
96496+++ b/include/linux/grinternal.h
96497@@ -0,0 +1,230 @@
96498+#ifndef __GRINTERNAL_H
96499+#define __GRINTERNAL_H
96500+
96501+#ifdef CONFIG_GRKERNSEC
96502+
96503+#include <linux/fs.h>
96504+#include <linux/mnt_namespace.h>
96505+#include <linux/nsproxy.h>
96506+#include <linux/gracl.h>
96507+#include <linux/grdefs.h>
96508+#include <linux/grmsg.h>
96509+
96510+void gr_add_learn_entry(const char *fmt, ...)
96511+ __attribute__ ((format (printf, 1, 2)));
96512+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
96513+ const struct vfsmount *mnt);
96514+__u32 gr_check_create(const struct dentry *new_dentry,
96515+ const struct dentry *parent,
96516+ const struct vfsmount *mnt, const __u32 mode);
96517+int gr_check_protected_task(const struct task_struct *task);
96518+__u32 to_gr_audit(const __u32 reqmode);
96519+int gr_set_acls(const int type);
96520+int gr_acl_is_enabled(void);
96521+char gr_roletype_to_char(void);
96522+
96523+void gr_handle_alertkill(struct task_struct *task);
96524+char *gr_to_filename(const struct dentry *dentry,
96525+ const struct vfsmount *mnt);
96526+char *gr_to_filename1(const struct dentry *dentry,
96527+ const struct vfsmount *mnt);
96528+char *gr_to_filename2(const struct dentry *dentry,
96529+ const struct vfsmount *mnt);
96530+char *gr_to_filename3(const struct dentry *dentry,
96531+ const struct vfsmount *mnt);
96532+
96533+extern int grsec_enable_ptrace_readexec;
96534+extern int grsec_enable_harden_ptrace;
96535+extern int grsec_enable_link;
96536+extern int grsec_enable_fifo;
96537+extern int grsec_enable_execve;
96538+extern int grsec_enable_shm;
96539+extern int grsec_enable_execlog;
96540+extern int grsec_enable_signal;
96541+extern int grsec_enable_audit_ptrace;
96542+extern int grsec_enable_forkfail;
96543+extern int grsec_enable_time;
96544+extern int grsec_enable_rofs;
96545+extern int grsec_deny_new_usb;
96546+extern int grsec_enable_chroot_shmat;
96547+extern int grsec_enable_chroot_mount;
96548+extern int grsec_enable_chroot_double;
96549+extern int grsec_enable_chroot_pivot;
96550+extern int grsec_enable_chroot_chdir;
96551+extern int grsec_enable_chroot_chmod;
96552+extern int grsec_enable_chroot_mknod;
96553+extern int grsec_enable_chroot_fchdir;
96554+extern int grsec_enable_chroot_nice;
96555+extern int grsec_enable_chroot_execlog;
96556+extern int grsec_enable_chroot_caps;
96557+extern int grsec_enable_chroot_rename;
96558+extern int grsec_enable_chroot_sysctl;
96559+extern int grsec_enable_chroot_unix;
96560+extern int grsec_enable_symlinkown;
96561+extern kgid_t grsec_symlinkown_gid;
96562+extern int grsec_enable_tpe;
96563+extern kgid_t grsec_tpe_gid;
96564+extern int grsec_enable_tpe_all;
96565+extern int grsec_enable_tpe_invert;
96566+extern int grsec_enable_socket_all;
96567+extern kgid_t grsec_socket_all_gid;
96568+extern int grsec_enable_socket_client;
96569+extern kgid_t grsec_socket_client_gid;
96570+extern int grsec_enable_socket_server;
96571+extern kgid_t grsec_socket_server_gid;
96572+extern kgid_t grsec_audit_gid;
96573+extern int grsec_enable_group;
96574+extern int grsec_enable_log_rwxmaps;
96575+extern int grsec_enable_mount;
96576+extern int grsec_enable_chdir;
96577+extern int grsec_resource_logging;
96578+extern int grsec_enable_blackhole;
96579+extern int grsec_lastack_retries;
96580+extern int grsec_enable_brute;
96581+extern int grsec_enable_harden_ipc;
96582+extern int grsec_lock;
96583+
96584+extern spinlock_t grsec_alert_lock;
96585+extern unsigned long grsec_alert_wtime;
96586+extern unsigned long grsec_alert_fyet;
96587+
96588+extern spinlock_t grsec_audit_lock;
96589+
96590+extern rwlock_t grsec_exec_file_lock;
96591+
96592+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
96593+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
96594+ (tsk)->exec_file->f_path.mnt) : "/")
96595+
96596+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
96597+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
96598+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96599+
96600+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
96601+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
96602+ (tsk)->exec_file->f_path.mnt) : "/")
96603+
96604+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
96605+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
96606+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96607+
96608+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
96609+
96610+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
96611+
96612+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
96613+{
96614+ if (file1 && file2) {
96615+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
96616+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
96617+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
96618+ return true;
96619+ }
96620+
96621+ return false;
96622+}
96623+
96624+#define GR_CHROOT_CAPS {{ \
96625+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
96626+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
96627+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
96628+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
96629+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
96630+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
96631+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
96632+
96633+#define security_learn(normal_msg,args...) \
96634+({ \
96635+ read_lock(&grsec_exec_file_lock); \
96636+ gr_add_learn_entry(normal_msg "\n", ## args); \
96637+ read_unlock(&grsec_exec_file_lock); \
96638+})
96639+
96640+enum {
96641+ GR_DO_AUDIT,
96642+ GR_DONT_AUDIT,
96643+ /* used for non-audit messages that we shouldn't kill the task on */
96644+ GR_DONT_AUDIT_GOOD
96645+};
96646+
96647+enum {
96648+ GR_TTYSNIFF,
96649+ GR_RBAC,
96650+ GR_RBAC_STR,
96651+ GR_STR_RBAC,
96652+ GR_RBAC_MODE2,
96653+ GR_RBAC_MODE3,
96654+ GR_FILENAME,
96655+ GR_SYSCTL_HIDDEN,
96656+ GR_NOARGS,
96657+ GR_ONE_INT,
96658+ GR_ONE_INT_TWO_STR,
96659+ GR_ONE_STR,
96660+ GR_STR_INT,
96661+ GR_TWO_STR_INT,
96662+ GR_TWO_INT,
96663+ GR_TWO_U64,
96664+ GR_THREE_INT,
96665+ GR_FIVE_INT_TWO_STR,
96666+ GR_TWO_STR,
96667+ GR_THREE_STR,
96668+ GR_FOUR_STR,
96669+ GR_STR_FILENAME,
96670+ GR_FILENAME_STR,
96671+ GR_FILENAME_TWO_INT,
96672+ GR_FILENAME_TWO_INT_STR,
96673+ GR_TEXTREL,
96674+ GR_PTRACE,
96675+ GR_RESOURCE,
96676+ GR_CAP,
96677+ GR_SIG,
96678+ GR_SIG2,
96679+ GR_CRASH1,
96680+ GR_CRASH2,
96681+ GR_PSACCT,
96682+ GR_RWXMAP,
96683+ GR_RWXMAPVMA
96684+};
96685+
96686+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
96687+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
96688+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
96689+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
96690+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
96691+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
96692+#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)
96693+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
96694+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
96695+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
96696+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
96697+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
96698+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
96699+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
96700+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
96701+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
96702+#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)
96703+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
96704+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
96705+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
96706+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
96707+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
96708+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
96709+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
96710+#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)
96711+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
96712+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
96713+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
96714+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
96715+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
96716+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
96717+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
96718+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
96719+#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)
96720+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
96721+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
96722+
96723+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
96724+
96725+#endif
96726+
96727+#endif
96728diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
96729new file mode 100644
96730index 0000000..26ef560
96731--- /dev/null
96732+++ b/include/linux/grmsg.h
96733@@ -0,0 +1,118 @@
96734+#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"
96735+#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"
96736+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
96737+#define GR_STOPMOD_MSG "denied modification of module state by "
96738+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
96739+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
96740+#define GR_IOPERM_MSG "denied use of ioperm() by "
96741+#define GR_IOPL_MSG "denied use of iopl() by "
96742+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
96743+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
96744+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
96745+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
96746+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
96747+#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"
96748+#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"
96749+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
96750+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
96751+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
96752+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
96753+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
96754+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
96755+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
96756+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
96757+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
96758+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
96759+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
96760+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
96761+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
96762+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
96763+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
96764+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
96765+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
96766+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
96767+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
96768+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
96769+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
96770+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
96771+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
96772+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
96773+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
96774+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
96775+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
96776+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
96777+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
96778+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
96779+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
96780+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
96781+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
96782+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
96783+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
96784+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
96785+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
96786+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
96787+#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"
96788+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
96789+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
96790+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
96791+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
96792+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
96793+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
96794+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
96795+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
96796+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
96797+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
96798+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
96799+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
96800+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
96801+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
96802+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
96803+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
96804+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
96805+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
96806+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
96807+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
96808+#define GR_FAILFORK_MSG "failed fork with errno %s by "
96809+#define GR_NICE_CHROOT_MSG "denied priority change by "
96810+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
96811+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
96812+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
96813+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
96814+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
96815+#define GR_TIME_MSG "time set by "
96816+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
96817+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
96818+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
96819+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
96820+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
96821+#define GR_BIND_MSG "denied bind() by "
96822+#define GR_CONNECT_MSG "denied connect() by "
96823+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
96824+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
96825+#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"
96826+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
96827+#define GR_CAP_ACL_MSG "use of %s denied for "
96828+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
96829+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
96830+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
96831+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
96832+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
96833+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
96834+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
96835+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
96836+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
96837+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
96838+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
96839+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
96840+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
96841+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
96842+#define GR_VM86_MSG "denied use of vm86 by "
96843+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
96844+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
96845+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
96846+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
96847+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
96848+#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 "
96849+#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 "
96850+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
96851+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
96852diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
96853new file mode 100644
96854index 0000000..085a746
96855--- /dev/null
96856+++ b/include/linux/grsecurity.h
96857@@ -0,0 +1,247 @@
96858+#ifndef GR_SECURITY_H
96859+#define GR_SECURITY_H
96860+#include <linux/fs.h>
96861+#include <linux/fs_struct.h>
96862+#include <linux/binfmts.h>
96863+#include <linux/gracl.h>
96864+
96865+/* notify of brain-dead configs */
96866+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
96867+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
96868+#endif
96869+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
96870+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
96871+#endif
96872+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
96873+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
96874+#endif
96875+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
96876+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
96877+#endif
96878+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
96879+#error "CONFIG_PAX enabled, but no PaX options are enabled."
96880+#endif
96881+
96882+int gr_handle_new_usb(void);
96883+
96884+void gr_handle_brute_attach(int dumpable);
96885+void gr_handle_brute_check(void);
96886+void gr_handle_kernel_exploit(void);
96887+
96888+char gr_roletype_to_char(void);
96889+
96890+int gr_proc_is_restricted(void);
96891+
96892+int gr_acl_enable_at_secure(void);
96893+
96894+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
96895+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
96896+
96897+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
96898+
96899+void gr_del_task_from_ip_table(struct task_struct *p);
96900+
96901+int gr_pid_is_chrooted(struct task_struct *p);
96902+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
96903+int gr_handle_chroot_nice(void);
96904+int gr_handle_chroot_sysctl(const int op);
96905+int gr_handle_chroot_setpriority(struct task_struct *p,
96906+ const int niceval);
96907+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
96908+int gr_chroot_fhandle(void);
96909+int gr_handle_chroot_chroot(const struct dentry *dentry,
96910+ const struct vfsmount *mnt);
96911+void gr_handle_chroot_chdir(const struct path *path);
96912+int gr_handle_chroot_chmod(const struct dentry *dentry,
96913+ const struct vfsmount *mnt, const int mode);
96914+int gr_handle_chroot_mknod(const struct dentry *dentry,
96915+ const struct vfsmount *mnt, const int mode);
96916+int gr_handle_chroot_mount(const struct dentry *dentry,
96917+ const struct vfsmount *mnt,
96918+ const char *dev_name);
96919+int gr_handle_chroot_pivot(void);
96920+int gr_handle_chroot_unix(const pid_t pid);
96921+
96922+int gr_handle_rawio(const struct inode *inode);
96923+
96924+void gr_handle_ioperm(void);
96925+void gr_handle_iopl(void);
96926+void gr_handle_msr_write(void);
96927+
96928+umode_t gr_acl_umask(void);
96929+
96930+int gr_tpe_allow(const struct file *file);
96931+
96932+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
96933+void gr_clear_chroot_entries(struct task_struct *task);
96934+
96935+void gr_log_forkfail(const int retval);
96936+void gr_log_timechange(void);
96937+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
96938+void gr_log_chdir(const struct dentry *dentry,
96939+ const struct vfsmount *mnt);
96940+void gr_log_chroot_exec(const struct dentry *dentry,
96941+ const struct vfsmount *mnt);
96942+void gr_log_remount(const char *devname, const int retval);
96943+void gr_log_unmount(const char *devname, const int retval);
96944+void gr_log_mount(const char *from, struct path *to, const int retval);
96945+void gr_log_textrel(struct vm_area_struct *vma);
96946+void gr_log_ptgnustack(struct file *file);
96947+void gr_log_rwxmmap(struct file *file);
96948+void gr_log_rwxmprotect(struct vm_area_struct *vma);
96949+
96950+int gr_handle_follow_link(const struct dentry *dentry,
96951+ const struct vfsmount *mnt);
96952+int gr_handle_fifo(const struct dentry *dentry,
96953+ const struct vfsmount *mnt,
96954+ const struct dentry *dir, const int flag,
96955+ const int acc_mode);
96956+int gr_handle_hardlink(const struct dentry *dentry,
96957+ const struct vfsmount *mnt,
96958+ const struct filename *to);
96959+
96960+int gr_is_capable(const int cap);
96961+int gr_is_capable_nolog(const int cap);
96962+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
96963+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
96964+
96965+void gr_copy_label(struct task_struct *tsk);
96966+void gr_handle_crash(struct task_struct *task, const int sig);
96967+int gr_handle_signal(const struct task_struct *p, const int sig);
96968+int gr_check_crash_uid(const kuid_t uid);
96969+int gr_check_protected_task(const struct task_struct *task);
96970+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
96971+int gr_acl_handle_mmap(const struct file *file,
96972+ const unsigned long prot);
96973+int gr_acl_handle_mprotect(const struct file *file,
96974+ const unsigned long prot);
96975+int gr_check_hidden_task(const struct task_struct *tsk);
96976+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
96977+ const struct vfsmount *mnt);
96978+__u32 gr_acl_handle_utime(const struct dentry *dentry,
96979+ const struct vfsmount *mnt);
96980+__u32 gr_acl_handle_access(const struct dentry *dentry,
96981+ const struct vfsmount *mnt, const int fmode);
96982+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
96983+ const struct vfsmount *mnt, umode_t *mode);
96984+__u32 gr_acl_handle_chown(const struct dentry *dentry,
96985+ const struct vfsmount *mnt);
96986+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
96987+ const struct vfsmount *mnt);
96988+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
96989+ const struct vfsmount *mnt);
96990+int gr_handle_ptrace(struct task_struct *task, const long request);
96991+int gr_handle_proc_ptrace(struct task_struct *task);
96992+__u32 gr_acl_handle_execve(const struct dentry *dentry,
96993+ const struct vfsmount *mnt);
96994+int gr_check_crash_exec(const struct file *filp);
96995+int gr_acl_is_enabled(void);
96996+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
96997+ const kgid_t gid);
96998+int gr_set_proc_label(const struct dentry *dentry,
96999+ const struct vfsmount *mnt,
97000+ const int unsafe_flags);
97001+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
97002+ const struct vfsmount *mnt);
97003+__u32 gr_acl_handle_open(const struct dentry *dentry,
97004+ const struct vfsmount *mnt, int acc_mode);
97005+__u32 gr_acl_handle_creat(const struct dentry *dentry,
97006+ const struct dentry *p_dentry,
97007+ const struct vfsmount *p_mnt,
97008+ int open_flags, int acc_mode, const int imode);
97009+void gr_handle_create(const struct dentry *dentry,
97010+ const struct vfsmount *mnt);
97011+void gr_handle_proc_create(const struct dentry *dentry,
97012+ const struct inode *inode);
97013+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
97014+ const struct dentry *parent_dentry,
97015+ const struct vfsmount *parent_mnt,
97016+ const int mode);
97017+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
97018+ const struct dentry *parent_dentry,
97019+ const struct vfsmount *parent_mnt);
97020+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
97021+ const struct vfsmount *mnt);
97022+void gr_handle_delete(const u64 ino, const dev_t dev);
97023+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
97024+ const struct vfsmount *mnt);
97025+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
97026+ const struct dentry *parent_dentry,
97027+ const struct vfsmount *parent_mnt,
97028+ const struct filename *from);
97029+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
97030+ const struct dentry *parent_dentry,
97031+ const struct vfsmount *parent_mnt,
97032+ const struct dentry *old_dentry,
97033+ const struct vfsmount *old_mnt, const struct filename *to);
97034+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
97035+int gr_acl_handle_rename(struct dentry *new_dentry,
97036+ struct dentry *parent_dentry,
97037+ const struct vfsmount *parent_mnt,
97038+ struct dentry *old_dentry,
97039+ struct inode *old_parent_inode,
97040+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
97041+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
97042+ struct dentry *old_dentry,
97043+ struct dentry *new_dentry,
97044+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
97045+__u32 gr_check_link(const struct dentry *new_dentry,
97046+ const struct dentry *parent_dentry,
97047+ const struct vfsmount *parent_mnt,
97048+ const struct dentry *old_dentry,
97049+ const struct vfsmount *old_mnt);
97050+int gr_acl_handle_filldir(const struct file *file, const char *name,
97051+ const unsigned int namelen, const u64 ino);
97052+
97053+__u32 gr_acl_handle_unix(const struct dentry *dentry,
97054+ const struct vfsmount *mnt);
97055+void gr_acl_handle_exit(void);
97056+void gr_acl_handle_psacct(struct task_struct *task, const long code);
97057+int gr_acl_handle_procpidmem(const struct task_struct *task);
97058+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
97059+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
97060+void gr_audit_ptrace(struct task_struct *task);
97061+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
97062+u64 gr_get_ino_from_dentry(struct dentry *dentry);
97063+void gr_put_exec_file(struct task_struct *task);
97064+
97065+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
97066+
97067+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97068+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97069+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
97070+ struct dentry *newdentry, struct vfsmount *newmnt);
97071+
97072+#ifdef CONFIG_GRKERNSEC_RESLOG
97073+extern void gr_log_resource(const struct task_struct *task, const int res,
97074+ const unsigned long wanted, const int gt);
97075+#else
97076+static inline void gr_log_resource(const struct task_struct *task, const int res,
97077+ const unsigned long wanted, const int gt)
97078+{
97079+}
97080+#endif
97081+
97082+#ifdef CONFIG_GRKERNSEC
97083+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
97084+void gr_handle_vm86(void);
97085+void gr_handle_mem_readwrite(u64 from, u64 to);
97086+
97087+void gr_log_badprocpid(const char *entry);
97088+
97089+extern int grsec_enable_dmesg;
97090+extern int grsec_disable_privio;
97091+
97092+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
97093+extern kgid_t grsec_proc_gid;
97094+#endif
97095+
97096+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
97097+extern int grsec_enable_chroot_findtask;
97098+#endif
97099+#ifdef CONFIG_GRKERNSEC_SETXID
97100+extern int grsec_enable_setxid;
97101+#endif
97102+#endif
97103+
97104+#endif
97105diff --git a/include/linux/grsock.h b/include/linux/grsock.h
97106new file mode 100644
97107index 0000000..e7ffaaf
97108--- /dev/null
97109+++ b/include/linux/grsock.h
97110@@ -0,0 +1,19 @@
97111+#ifndef __GRSOCK_H
97112+#define __GRSOCK_H
97113+
97114+extern void gr_attach_curr_ip(const struct sock *sk);
97115+extern int gr_handle_sock_all(const int family, const int type,
97116+ const int protocol);
97117+extern int gr_handle_sock_server(const struct sockaddr *sck);
97118+extern int gr_handle_sock_server_other(const struct sock *sck);
97119+extern int gr_handle_sock_client(const struct sockaddr *sck);
97120+extern int gr_search_connect(struct socket * sock,
97121+ struct sockaddr_in * addr);
97122+extern int gr_search_bind(struct socket * sock,
97123+ struct sockaddr_in * addr);
97124+extern int gr_search_listen(struct socket * sock);
97125+extern int gr_search_accept(struct socket * sock);
97126+extern int gr_search_socket(const int domain, const int type,
97127+ const int protocol);
97128+
97129+#endif
97130diff --git a/include/linux/highmem.h b/include/linux/highmem.h
97131index 9286a46..373f27f 100644
97132--- a/include/linux/highmem.h
97133+++ b/include/linux/highmem.h
97134@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
97135 kunmap_atomic(kaddr);
97136 }
97137
97138+static inline void sanitize_highpage(struct page *page)
97139+{
97140+ void *kaddr;
97141+ unsigned long flags;
97142+
97143+ local_irq_save(flags);
97144+ kaddr = kmap_atomic(page);
97145+ clear_page(kaddr);
97146+ kunmap_atomic(kaddr);
97147+ local_irq_restore(flags);
97148+}
97149+
97150 static inline void zero_user_segments(struct page *page,
97151 unsigned start1, unsigned end1,
97152 unsigned start2, unsigned end2)
97153diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
97154index 1c7b89a..7dda400 100644
97155--- a/include/linux/hwmon-sysfs.h
97156+++ b/include/linux/hwmon-sysfs.h
97157@@ -25,7 +25,8 @@
97158 struct sensor_device_attribute{
97159 struct device_attribute dev_attr;
97160 int index;
97161-};
97162+} __do_const;
97163+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
97164 #define to_sensor_dev_attr(_dev_attr) \
97165 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
97166
97167@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
97168 struct device_attribute dev_attr;
97169 u8 index;
97170 u8 nr;
97171-};
97172+} __do_const;
97173+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
97174 #define to_sensor_dev_attr_2(_dev_attr) \
97175 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
97176
97177diff --git a/include/linux/i2c.h b/include/linux/i2c.h
97178index e83a738..8b323fa 100644
97179--- a/include/linux/i2c.h
97180+++ b/include/linux/i2c.h
97181@@ -409,6 +409,7 @@ struct i2c_algorithm {
97182 int (*unreg_slave)(struct i2c_client *client);
97183 #endif
97184 };
97185+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
97186
97187 /**
97188 * struct i2c_bus_recovery_info - I2C bus recovery information
97189diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
97190index 66a7d76..5e68d20 100644
97191--- a/include/linux/if_pppox.h
97192+++ b/include/linux/if_pppox.h
97193@@ -78,7 +78,7 @@ struct pppox_proto {
97194 int (*ioctl)(struct socket *sock, unsigned int cmd,
97195 unsigned long arg);
97196 struct module *owner;
97197-};
97198+} __do_const;
97199
97200 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
97201 extern void unregister_pppox_proto(int proto_num);
97202diff --git a/include/linux/init.h b/include/linux/init.h
97203index 21b6d76..4a6775c 100644
97204--- a/include/linux/init.h
97205+++ b/include/linux/init.h
97206@@ -37,9 +37,17 @@
97207 * section.
97208 */
97209
97210+#define add_init_latent_entropy __latent_entropy
97211+
97212+#ifdef CONFIG_MEMORY_HOTPLUG
97213+#define add_meminit_latent_entropy
97214+#else
97215+#define add_meminit_latent_entropy __latent_entropy
97216+#endif
97217+
97218 /* These are for everybody (although not all archs will actually
97219 discard it in modules) */
97220-#define __init __section(.init.text) __cold notrace
97221+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
97222 #define __initdata __section(.init.data)
97223 #define __initconst __constsection(.init.rodata)
97224 #define __exitdata __section(.exit.data)
97225@@ -100,7 +108,7 @@
97226 #define __cpuexitconst
97227
97228 /* Used for MEMORY_HOTPLUG */
97229-#define __meminit __section(.meminit.text) __cold notrace
97230+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
97231 #define __meminitdata __section(.meminit.data)
97232 #define __meminitconst __constsection(.meminit.rodata)
97233 #define __memexit __section(.memexit.text) __exitused __cold notrace
97234diff --git a/include/linux/init_task.h b/include/linux/init_task.h
97235index 696d223..6d6b39f 100644
97236--- a/include/linux/init_task.h
97237+++ b/include/linux/init_task.h
97238@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
97239
97240 #define INIT_TASK_COMM "swapper"
97241
97242+#ifdef CONFIG_X86
97243+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
97244+#else
97245+#define INIT_TASK_THREAD_INFO
97246+#endif
97247+
97248 #ifdef CONFIG_RT_MUTEXES
97249 # define INIT_RT_MUTEXES(tsk) \
97250 .pi_waiters = RB_ROOT, \
97251@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
97252 RCU_POINTER_INITIALIZER(cred, &init_cred), \
97253 .comm = INIT_TASK_COMM, \
97254 .thread = INIT_THREAD, \
97255+ INIT_TASK_THREAD_INFO \
97256 .fs = &init_fs, \
97257 .files = &init_files, \
97258 .signal = &init_signals, \
97259diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
97260index 950ae45..df6ac60 100644
97261--- a/include/linux/interrupt.h
97262+++ b/include/linux/interrupt.h
97263@@ -432,8 +432,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
97264
97265 struct softirq_action
97266 {
97267- void (*action)(struct softirq_action *);
97268-};
97269+ void (*action)(void);
97270+} __no_const;
97271
97272 asmlinkage void do_softirq(void);
97273 asmlinkage void __do_softirq(void);
97274@@ -447,7 +447,7 @@ static inline void do_softirq_own_stack(void)
97275 }
97276 #endif
97277
97278-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
97279+extern void open_softirq(int nr, void (*action)(void));
97280 extern void softirq_init(void);
97281 extern void __raise_softirq_irqoff(unsigned int nr);
97282
97283diff --git a/include/linux/iommu.h b/include/linux/iommu.h
97284index 0546b87..46fd5b6 100644
97285--- a/include/linux/iommu.h
97286+++ b/include/linux/iommu.h
97287@@ -174,7 +174,7 @@ struct iommu_ops {
97288
97289 unsigned long pgsize_bitmap;
97290 void *priv;
97291-};
97292+} __do_const;
97293
97294 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
97295 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
97296@@ -234,7 +234,7 @@ extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr,
97297 void *data);
97298 struct device *iommu_device_create(struct device *parent, void *drvdata,
97299 const struct attribute_group **groups,
97300- const char *fmt, ...);
97301+ const char *fmt, ...) __printf(4, 5);
97302 void iommu_device_destroy(struct device *dev);
97303 int iommu_device_link(struct device *dev, struct device *link);
97304 void iommu_device_unlink(struct device *dev, struct device *link);
97305diff --git a/include/linux/ioport.h b/include/linux/ioport.h
97306index 388e3ae..d7e45a1 100644
97307--- a/include/linux/ioport.h
97308+++ b/include/linux/ioport.h
97309@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
97310 int adjust_resource(struct resource *res, resource_size_t start,
97311 resource_size_t size);
97312 resource_size_t resource_alignment(struct resource *res);
97313-static inline resource_size_t resource_size(const struct resource *res)
97314+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
97315 {
97316 return res->end - res->start + 1;
97317 }
97318diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
97319index 1eee6bc..9cf4912 100644
97320--- a/include/linux/ipc_namespace.h
97321+++ b/include/linux/ipc_namespace.h
97322@@ -60,7 +60,7 @@ struct ipc_namespace {
97323 struct user_namespace *user_ns;
97324
97325 struct ns_common ns;
97326-};
97327+} __randomize_layout;
97328
97329 extern struct ipc_namespace init_ipc_ns;
97330 extern atomic_t nr_ipc_ns;
97331diff --git a/include/linux/irq.h b/include/linux/irq.h
97332index 62c6901..827f8f6 100644
97333--- a/include/linux/irq.h
97334+++ b/include/linux/irq.h
97335@@ -370,7 +370,8 @@ struct irq_chip {
97336 int (*irq_set_irqchip_state)(struct irq_data *data, enum irqchip_irq_state which, bool state);
97337
97338 unsigned long flags;
97339-};
97340+} __do_const;
97341+typedef struct irq_chip __no_const irq_chip_no_const;
97342
97343 /*
97344 * irq_chip specific flags
97345diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
97346index dd1109f..4f4fdda 100644
97347--- a/include/linux/irqdesc.h
97348+++ b/include/linux/irqdesc.h
97349@@ -61,7 +61,7 @@ struct irq_desc {
97350 unsigned int irq_count; /* For detecting broken IRQs */
97351 unsigned long last_unhandled; /* Aging timer for unhandled count */
97352 unsigned int irqs_unhandled;
97353- atomic_t threads_handled;
97354+ atomic_unchecked_t threads_handled;
97355 int threads_handled_last;
97356 raw_spinlock_t lock;
97357 struct cpumask *percpu_enabled;
97358diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
97359index 676d730..8d3a1ad 100644
97360--- a/include/linux/irqdomain.h
97361+++ b/include/linux/irqdomain.h
97362@@ -40,6 +40,7 @@ struct device_node;
97363 struct irq_domain;
97364 struct of_device_id;
97365 struct irq_chip;
97366+typedef struct irq_chip __no_const irq_chip_no_const;
97367 struct irq_data;
97368
97369 /* Number of irqs reserved for a legacy isa controller */
97370diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
97371index c367cbd..c9b79e6 100644
97372--- a/include/linux/jiffies.h
97373+++ b/include/linux/jiffies.h
97374@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
97375 /*
97376 * Convert various time units to each other:
97377 */
97378-extern unsigned int jiffies_to_msecs(const unsigned long j);
97379-extern unsigned int jiffies_to_usecs(const unsigned long j);
97380+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
97381+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
97382
97383-static inline u64 jiffies_to_nsecs(const unsigned long j)
97384+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
97385 {
97386 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
97387 }
97388
97389-extern unsigned long msecs_to_jiffies(const unsigned int m);
97390-extern unsigned long usecs_to_jiffies(const unsigned int u);
97391+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
97392+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
97393 extern unsigned long timespec_to_jiffies(const struct timespec *value);
97394 extern void jiffies_to_timespec(const unsigned long jiffies,
97395- struct timespec *value);
97396-extern unsigned long timeval_to_jiffies(const struct timeval *value);
97397+ struct timespec *value) __intentional_overflow(-1);
97398+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
97399 extern void jiffies_to_timeval(const unsigned long jiffies,
97400 struct timeval *value);
97401
97402diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
97403index 6883e19..e854fcb 100644
97404--- a/include/linux/kallsyms.h
97405+++ b/include/linux/kallsyms.h
97406@@ -15,7 +15,8 @@
97407
97408 struct module;
97409
97410-#ifdef CONFIG_KALLSYMS
97411+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
97412+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
97413 /* Lookup the address for a symbol. Returns 0 if not found. */
97414 unsigned long kallsyms_lookup_name(const char *name);
97415
97416@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
97417 /* Stupid that this does nothing, but I didn't create this mess. */
97418 #define __print_symbol(fmt, addr)
97419 #endif /*CONFIG_KALLSYMS*/
97420+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
97421+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
97422+extern unsigned long kallsyms_lookup_name(const char *name);
97423+extern void __print_symbol(const char *fmt, unsigned long address);
97424+extern int sprint_backtrace(char *buffer, unsigned long address);
97425+extern int sprint_symbol(char *buffer, unsigned long address);
97426+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
97427+const char *kallsyms_lookup(unsigned long addr,
97428+ unsigned long *symbolsize,
97429+ unsigned long *offset,
97430+ char **modname, char *namebuf);
97431+extern int kallsyms_lookup_size_offset(unsigned long addr,
97432+ unsigned long *symbolsize,
97433+ unsigned long *offset);
97434+#endif
97435
97436 /* This macro allows us to keep printk typechecking */
97437 static __printf(1, 2)
97438diff --git a/include/linux/kernel.h b/include/linux/kernel.h
97439index 3a5b48e..240107b 100644
97440--- a/include/linux/kernel.h
97441+++ b/include/linux/kernel.h
97442@@ -390,7 +390,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
97443 /* Obsolete, do not use. Use kstrto<foo> instead */
97444
97445 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
97446-extern long simple_strtol(const char *,char **,unsigned int);
97447+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
97448 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
97449 extern long long simple_strtoll(const char *,char **,unsigned int);
97450
97451@@ -410,7 +410,8 @@ extern __printf(3, 0)
97452 int vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
97453 extern __printf(2, 3)
97454 char *kasprintf(gfp_t gfp, const char *fmt, ...);
97455-extern char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97456+extern __printf(2, 0)
97457+char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97458
97459 extern __scanf(2, 3)
97460 int sscanf(const char *, const char *, ...);
97461@@ -681,10 +682,10 @@ do { \
97462 __ftrace_vprintk(_THIS_IP_, fmt, vargs); \
97463 } while (0)
97464
97465-extern int
97466+extern __printf(2, 0) int
97467 __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap);
97468
97469-extern int
97470+extern __printf(2, 0) int
97471 __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap);
97472
97473 extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);
97474@@ -704,7 +705,7 @@ int trace_printk(const char *fmt, ...)
97475 {
97476 return 0;
97477 }
97478-static inline int
97479+static __printf(1, 0) inline int
97480 ftrace_vprintk(const char *fmt, va_list ap)
97481 {
97482 return 0;
97483diff --git a/include/linux/key-type.h b/include/linux/key-type.h
97484index ff9f1d3..6712be5 100644
97485--- a/include/linux/key-type.h
97486+++ b/include/linux/key-type.h
97487@@ -152,7 +152,7 @@ struct key_type {
97488 /* internal fields */
97489 struct list_head link; /* link in types list */
97490 struct lock_class_key lock_class; /* key->sem lock class */
97491-};
97492+} __do_const;
97493
97494 extern struct key_type key_type_keyring;
97495
97496diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
97497index e465bb1..19f605fd 100644
97498--- a/include/linux/kgdb.h
97499+++ b/include/linux/kgdb.h
97500@@ -52,7 +52,7 @@ extern int kgdb_connected;
97501 extern int kgdb_io_module_registered;
97502
97503 extern atomic_t kgdb_setting_breakpoint;
97504-extern atomic_t kgdb_cpu_doing_single_step;
97505+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
97506
97507 extern struct task_struct *kgdb_usethread;
97508 extern struct task_struct *kgdb_contthread;
97509@@ -254,7 +254,7 @@ struct kgdb_arch {
97510 void (*correct_hw_break)(void);
97511
97512 void (*enable_nmi)(bool on);
97513-};
97514+} __do_const;
97515
97516 /**
97517 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
97518@@ -279,7 +279,7 @@ struct kgdb_io {
97519 void (*pre_exception) (void);
97520 void (*post_exception) (void);
97521 int is_console;
97522-};
97523+} __do_const;
97524
97525 extern struct kgdb_arch arch_kgdb_ops;
97526
97527diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
97528index d0a1f99..0bd8b7c 100644
97529--- a/include/linux/kmemleak.h
97530+++ b/include/linux/kmemleak.h
97531@@ -27,7 +27,7 @@
97532
97533 extern void kmemleak_init(void) __ref;
97534 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97535- gfp_t gfp) __ref;
97536+ gfp_t gfp) __ref __size_overflow(2);
97537 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size,
97538 gfp_t gfp) __ref;
97539 extern void kmemleak_free(const void *ptr) __ref;
97540@@ -63,7 +63,7 @@ static inline void kmemleak_erase(void **ptr)
97541 static inline void kmemleak_init(void)
97542 {
97543 }
97544-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97545+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
97546 gfp_t gfp)
97547 {
97548 }
97549diff --git a/include/linux/kmod.h b/include/linux/kmod.h
97550index 0555cc6..40116ce 100644
97551--- a/include/linux/kmod.h
97552+++ b/include/linux/kmod.h
97553@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
97554 * usually useless though. */
97555 extern __printf(2, 3)
97556 int __request_module(bool wait, const char *name, ...);
97557+extern __printf(3, 4)
97558+int ___request_module(bool wait, char *param_name, const char *name, ...);
97559 #define request_module(mod...) __request_module(true, mod)
97560 #define request_module_nowait(mod...) __request_module(false, mod)
97561 #define try_then_request_module(x, mod...) \
97562@@ -57,6 +59,9 @@ struct subprocess_info {
97563 struct work_struct work;
97564 struct completion *complete;
97565 char *path;
97566+#ifdef CONFIG_GRKERNSEC
97567+ char *origpath;
97568+#endif
97569 char **argv;
97570 char **envp;
97571 int wait;
97572diff --git a/include/linux/kobject.h b/include/linux/kobject.h
97573index 2d61b90..3d69945 100644
97574--- a/include/linux/kobject.h
97575+++ b/include/linux/kobject.h
97576@@ -80,8 +80,9 @@ struct kobject {
97577
97578 extern __printf(2, 3)
97579 int kobject_set_name(struct kobject *kobj, const char *name, ...);
97580-extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97581- va_list vargs);
97582+extern __printf(2, 0)
97583+int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97584+ va_list vargs);
97585
97586 static inline const char *kobject_name(const struct kobject *kobj)
97587 {
97588@@ -118,7 +119,7 @@ struct kobj_type {
97589 struct attribute **default_attrs;
97590 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
97591 const void *(*namespace)(struct kobject *kobj);
97592-};
97593+} __do_const;
97594
97595 struct kobj_uevent_env {
97596 char *argv[3];
97597@@ -142,6 +143,7 @@ struct kobj_attribute {
97598 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
97599 const char *buf, size_t count);
97600 };
97601+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
97602
97603 extern const struct sysfs_ops kobj_sysfs_ops;
97604
97605@@ -169,7 +171,7 @@ struct kset {
97606 spinlock_t list_lock;
97607 struct kobject kobj;
97608 const struct kset_uevent_ops *uevent_ops;
97609-};
97610+} __randomize_layout;
97611
97612 extern void kset_init(struct kset *kset);
97613 extern int __must_check kset_register(struct kset *kset);
97614diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
97615index df32d25..fb52e27 100644
97616--- a/include/linux/kobject_ns.h
97617+++ b/include/linux/kobject_ns.h
97618@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
97619 const void *(*netlink_ns)(struct sock *sk);
97620 const void *(*initial_ns)(void);
97621 void (*drop_ns)(void *);
97622-};
97623+} __do_const;
97624
97625 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
97626 int kobj_ns_type_registered(enum kobj_ns_type type);
97627diff --git a/include/linux/kref.h b/include/linux/kref.h
97628index 484604d..0f6c5b6 100644
97629--- a/include/linux/kref.h
97630+++ b/include/linux/kref.h
97631@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
97632 static inline int kref_sub(struct kref *kref, unsigned int count,
97633 void (*release)(struct kref *kref))
97634 {
97635- WARN_ON(release == NULL);
97636+ BUG_ON(release == NULL);
97637
97638 if (atomic_sub_and_test((int) count, &kref->refcount)) {
97639 release(kref);
97640diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
97641index ad45054..7c54663 100644
97642--- a/include/linux/kvm_host.h
97643+++ b/include/linux/kvm_host.h
97644@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
97645 {
97646 }
97647 #endif
97648-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97649+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97650 struct module *module);
97651 void kvm_exit(void);
97652
97653@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
97654 struct kvm_guest_debug *dbg);
97655 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
97656
97657-int kvm_arch_init(void *opaque);
97658+int kvm_arch_init(const void *opaque);
97659 void kvm_arch_exit(void);
97660
97661 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
97662diff --git a/include/linux/libata.h b/include/linux/libata.h
97663index e0e3378..38e206f 100644
97664--- a/include/linux/libata.h
97665+++ b/include/linux/libata.h
97666@@ -991,7 +991,7 @@ struct ata_port_operations {
97667 * fields must be pointers.
97668 */
97669 const struct ata_port_operations *inherits;
97670-};
97671+} __do_const;
97672
97673 struct ata_port_info {
97674 unsigned long flags;
97675diff --git a/include/linux/linkage.h b/include/linux/linkage.h
97676index a6a42dd..6c5ebce 100644
97677--- a/include/linux/linkage.h
97678+++ b/include/linux/linkage.h
97679@@ -36,6 +36,7 @@
97680 #endif
97681
97682 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
97683+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
97684 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
97685
97686 /*
97687diff --git a/include/linux/list.h b/include/linux/list.h
97688index feb773c..98f3075 100644
97689--- a/include/linux/list.h
97690+++ b/include/linux/list.h
97691@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
97692 extern void list_del(struct list_head *entry);
97693 #endif
97694
97695+extern void __pax_list_add(struct list_head *new,
97696+ struct list_head *prev,
97697+ struct list_head *next);
97698+static inline void pax_list_add(struct list_head *new, struct list_head *head)
97699+{
97700+ __pax_list_add(new, head, head->next);
97701+}
97702+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
97703+{
97704+ __pax_list_add(new, head->prev, head);
97705+}
97706+extern void pax_list_del(struct list_head *entry);
97707+
97708 /**
97709 * list_replace - replace old entry by new one
97710 * @old : the element to be replaced
97711@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
97712 INIT_LIST_HEAD(entry);
97713 }
97714
97715+extern void pax_list_del_init(struct list_head *entry);
97716+
97717 /**
97718 * list_move - delete from one list and add as another's head
97719 * @list: the entry to move
97720diff --git a/include/linux/lockref.h b/include/linux/lockref.h
97721index b10b122..d37b3de 100644
97722--- a/include/linux/lockref.h
97723+++ b/include/linux/lockref.h
97724@@ -28,7 +28,7 @@ struct lockref {
97725 #endif
97726 struct {
97727 spinlock_t lock;
97728- int count;
97729+ atomic_t count;
97730 };
97731 };
97732 };
97733@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
97734 extern int lockref_get_not_dead(struct lockref *);
97735
97736 /* Must be called under spinlock for reliable results */
97737-static inline int __lockref_is_dead(const struct lockref *l)
97738+static inline int __lockref_is_dead(const struct lockref *lockref)
97739 {
97740- return ((int)l->count < 0);
97741+ return atomic_read(&lockref->count) < 0;
97742+}
97743+
97744+static inline int __lockref_read(const struct lockref *lockref)
97745+{
97746+ return atomic_read(&lockref->count);
97747+}
97748+
97749+static inline void __lockref_set(struct lockref *lockref, int count)
97750+{
97751+ atomic_set(&lockref->count, count);
97752+}
97753+
97754+static inline void __lockref_inc(struct lockref *lockref)
97755+{
97756+ atomic_inc(&lockref->count);
97757+}
97758+
97759+static inline void __lockref_dec(struct lockref *lockref)
97760+{
97761+ atomic_dec(&lockref->count);
97762 }
97763
97764 #endif /* __LINUX_LOCKREF_H */
97765diff --git a/include/linux/math64.h b/include/linux/math64.h
97766index c45c089..298841c 100644
97767--- a/include/linux/math64.h
97768+++ b/include/linux/math64.h
97769@@ -15,7 +15,7 @@
97770 * This is commonly provided by 32bit archs to provide an optimized 64bit
97771 * divide.
97772 */
97773-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97774+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97775 {
97776 *remainder = dividend % divisor;
97777 return dividend / divisor;
97778@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
97779 /**
97780 * div64_u64 - unsigned 64bit divide with 64bit divisor
97781 */
97782-static inline u64 div64_u64(u64 dividend, u64 divisor)
97783+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
97784 {
97785 return dividend / divisor;
97786 }
97787@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
97788 #define div64_ul(x, y) div_u64((x), (y))
97789
97790 #ifndef div_u64_rem
97791-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97792+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97793 {
97794 *remainder = do_div(dividend, divisor);
97795 return dividend;
97796@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
97797 #endif
97798
97799 #ifndef div64_u64
97800-extern u64 div64_u64(u64 dividend, u64 divisor);
97801+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
97802 #endif
97803
97804 #ifndef div64_s64
97805@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
97806 * divide.
97807 */
97808 #ifndef div_u64
97809-static inline u64 div_u64(u64 dividend, u32 divisor)
97810+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
97811 {
97812 u32 remainder;
97813 return div_u64_rem(dividend, divisor, &remainder);
97814diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
97815index 3d385c8..deacb6a 100644
97816--- a/include/linux/mempolicy.h
97817+++ b/include/linux/mempolicy.h
97818@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
97819 }
97820
97821 #define vma_policy(vma) ((vma)->vm_policy)
97822+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
97823+{
97824+ vma->vm_policy = pol;
97825+}
97826
97827 static inline void mpol_get(struct mempolicy *pol)
97828 {
97829@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
97830 }
97831
97832 #define vma_policy(vma) NULL
97833+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
97834+{
97835+}
97836
97837 static inline int
97838 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
97839diff --git a/include/linux/mm.h b/include/linux/mm.h
97840index 0755b9f..2960e96 100644
97841--- a/include/linux/mm.h
97842+++ b/include/linux/mm.h
97843@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
97844
97845 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
97846 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
97847+
97848+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97849+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
97850+#endif
97851+
97852 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
97853 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
97854 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
97855@@ -257,8 +262,8 @@ struct vm_operations_struct {
97856 /* called by access_process_vm when get_user_pages() fails, typically
97857 * for use by special VMAs that can switch between memory and hardware
97858 */
97859- int (*access)(struct vm_area_struct *vma, unsigned long addr,
97860- void *buf, int len, int write);
97861+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
97862+ void *buf, size_t len, int write);
97863
97864 /* Called by the /proc/PID/maps code to ask the vma whether it
97865 * has a special name. Returning non-NULL will also cause this
97866@@ -296,6 +301,7 @@ struct vm_operations_struct {
97867 struct page *(*find_special_page)(struct vm_area_struct *vma,
97868 unsigned long addr);
97869 };
97870+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
97871
97872 struct mmu_gather;
97873 struct inode;
97874@@ -1131,8 +1137,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
97875 unsigned long *pfn);
97876 int follow_phys(struct vm_area_struct *vma, unsigned long address,
97877 unsigned int flags, unsigned long *prot, resource_size_t *phys);
97878-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97879- void *buf, int len, int write);
97880+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97881+ void *buf, size_t len, int write);
97882
97883 static inline void unmap_shared_mapping_range(struct address_space *mapping,
97884 loff_t const holebegin, loff_t const holelen)
97885@@ -1172,9 +1178,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
97886 }
97887 #endif
97888
97889-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
97890-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97891- void *buf, int len, int write);
97892+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
97893+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
97894+ void *buf, size_t len, int write);
97895
97896 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
97897 unsigned long start, unsigned long nr_pages,
97898@@ -1219,34 +1225,6 @@ int clear_page_dirty_for_io(struct page *page);
97899
97900 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
97901
97902-/* Is the vma a continuation of the stack vma above it? */
97903-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
97904-{
97905- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
97906-}
97907-
97908-static inline int stack_guard_page_start(struct vm_area_struct *vma,
97909- unsigned long addr)
97910-{
97911- return (vma->vm_flags & VM_GROWSDOWN) &&
97912- (vma->vm_start == addr) &&
97913- !vma_growsdown(vma->vm_prev, addr);
97914-}
97915-
97916-/* Is the vma a continuation of the stack vma below it? */
97917-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
97918-{
97919- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
97920-}
97921-
97922-static inline int stack_guard_page_end(struct vm_area_struct *vma,
97923- unsigned long addr)
97924-{
97925- return (vma->vm_flags & VM_GROWSUP) &&
97926- (vma->vm_end == addr) &&
97927- !vma_growsup(vma->vm_next, addr);
97928-}
97929-
97930 extern struct task_struct *task_of_stack(struct task_struct *task,
97931 struct vm_area_struct *vma, bool in_group);
97932
97933@@ -1369,8 +1347,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
97934 {
97935 return 0;
97936 }
97937+
97938+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
97939+ unsigned long address)
97940+{
97941+ return 0;
97942+}
97943 #else
97944 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
97945+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
97946 #endif
97947
97948 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
97949@@ -1380,6 +1365,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
97950 return 0;
97951 }
97952
97953+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
97954+ unsigned long address)
97955+{
97956+ return 0;
97957+}
97958+
97959 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
97960
97961 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
97962@@ -1392,6 +1383,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
97963
97964 #else
97965 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
97966+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
97967
97968 static inline void mm_nr_pmds_init(struct mm_struct *mm)
97969 {
97970@@ -1429,11 +1421,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
97971 NULL: pud_offset(pgd, address);
97972 }
97973
97974+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
97975+{
97976+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
97977+ NULL: pud_offset(pgd, address);
97978+}
97979+
97980 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
97981 {
97982 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
97983 NULL: pmd_offset(pud, address);
97984 }
97985+
97986+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
97987+{
97988+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
97989+ NULL: pmd_offset(pud, address);
97990+}
97991 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
97992
97993 #if USE_SPLIT_PTE_PTLOCKS
97994@@ -1810,12 +1814,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
97995 bool *need_rmap_locks);
97996 extern void exit_mmap(struct mm_struct *);
97997
97998+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
97999+extern void gr_learn_resource(const struct task_struct *task, const int res,
98000+ const unsigned long wanted, const int gt);
98001+#else
98002+static inline void gr_learn_resource(const struct task_struct *task, const int res,
98003+ const unsigned long wanted, const int gt)
98004+{
98005+}
98006+#endif
98007+
98008 static inline int check_data_rlimit(unsigned long rlim,
98009 unsigned long new,
98010 unsigned long start,
98011 unsigned long end_data,
98012 unsigned long start_data)
98013 {
98014+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
98015 if (rlim < RLIM_INFINITY) {
98016 if (((new - start) + (end_data - start_data)) > rlim)
98017 return -ENOSPC;
98018@@ -1840,7 +1855,7 @@ extern int install_special_mapping(struct mm_struct *mm,
98019 unsigned long addr, unsigned long len,
98020 unsigned long flags, struct page **pages);
98021
98022-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
98023+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
98024
98025 extern unsigned long mmap_region(struct file *file, unsigned long addr,
98026 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
98027@@ -1848,6 +1863,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
98028 unsigned long len, unsigned long prot, unsigned long flags,
98029 unsigned long pgoff, unsigned long *populate);
98030 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
98031+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
98032
98033 #ifdef CONFIG_MMU
98034 extern int __mm_populate(unsigned long addr, unsigned long len,
98035@@ -1876,10 +1892,11 @@ struct vm_unmapped_area_info {
98036 unsigned long high_limit;
98037 unsigned long align_mask;
98038 unsigned long align_offset;
98039+ unsigned long threadstack_offset;
98040 };
98041
98042-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
98043-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98044+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
98045+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
98046
98047 /*
98048 * Search for an unmapped address range.
98049@@ -1891,7 +1908,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98050 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
98051 */
98052 static inline unsigned long
98053-vm_unmapped_area(struct vm_unmapped_area_info *info)
98054+vm_unmapped_area(const struct vm_unmapped_area_info *info)
98055 {
98056 if (info->flags & VM_UNMAPPED_AREA_TOPDOWN)
98057 return unmapped_area_topdown(info);
98058@@ -1953,6 +1970,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
98059 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
98060 struct vm_area_struct **pprev);
98061
98062+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
98063+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
98064+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
98065+
98066 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
98067 NULL if none. Assume start_addr < end_addr. */
98068 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
98069@@ -1982,10 +2003,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
98070 }
98071
98072 #ifdef CONFIG_MMU
98073-pgprot_t vm_get_page_prot(unsigned long vm_flags);
98074+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
98075 void vma_set_page_prot(struct vm_area_struct *vma);
98076 #else
98077-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
98078+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
98079 {
98080 return __pgprot(0);
98081 }
98082@@ -2047,6 +2068,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
98083 static inline void vm_stat_account(struct mm_struct *mm,
98084 unsigned long flags, struct file *file, long pages)
98085 {
98086+
98087+#ifdef CONFIG_PAX_RANDMMAP
98088+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
98089+#endif
98090+
98091 mm->total_vm += pages;
98092 }
98093 #endif /* CONFIG_PROC_FS */
98094@@ -2149,7 +2175,7 @@ extern int unpoison_memory(unsigned long pfn);
98095 extern int sysctl_memory_failure_early_kill;
98096 extern int sysctl_memory_failure_recovery;
98097 extern void shake_page(struct page *p, int access);
98098-extern atomic_long_t num_poisoned_pages;
98099+extern atomic_long_unchecked_t num_poisoned_pages;
98100 extern int soft_offline_page(struct page *page, int flags);
98101
98102 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
98103@@ -2200,5 +2226,11 @@ void __init setup_nr_node_ids(void);
98104 static inline void setup_nr_node_ids(void) {}
98105 #endif
98106
98107+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98108+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
98109+#else
98110+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
98111+#endif
98112+
98113 #endif /* __KERNEL__ */
98114 #endif /* _LINUX_MM_H */
98115diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
98116index 8d37e26..6a6f55b 100644
98117--- a/include/linux/mm_types.h
98118+++ b/include/linux/mm_types.h
98119@@ -313,7 +313,9 @@ struct vm_area_struct {
98120 #ifdef CONFIG_NUMA
98121 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
98122 #endif
98123-};
98124+
98125+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
98126+} __randomize_layout;
98127
98128 struct core_thread {
98129 struct task_struct *task;
98130@@ -466,7 +468,25 @@ struct mm_struct {
98131 /* address of the bounds directory */
98132 void __user *bd_addr;
98133 #endif
98134-};
98135+
98136+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
98137+ unsigned long pax_flags;
98138+#endif
98139+
98140+#ifdef CONFIG_PAX_DLRESOLVE
98141+ unsigned long call_dl_resolve;
98142+#endif
98143+
98144+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
98145+ unsigned long call_syscall;
98146+#endif
98147+
98148+#ifdef CONFIG_PAX_ASLR
98149+ unsigned long delta_mmap; /* randomized offset */
98150+ unsigned long delta_stack; /* randomized offset */
98151+#endif
98152+
98153+} __randomize_layout;
98154
98155 static inline void mm_init_cpumask(struct mm_struct *mm)
98156 {
98157diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
98158index c5d5278..85cd5ce 100644
98159--- a/include/linux/mmiotrace.h
98160+++ b/include/linux/mmiotrace.h
98161@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
98162 /* Called from ioremap.c */
98163 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
98164 void __iomem *addr);
98165-extern void mmiotrace_iounmap(volatile void __iomem *addr);
98166+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
98167
98168 /* For anyone to insert markers. Remember trailing newline. */
98169 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
98170@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
98171 {
98172 }
98173
98174-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
98175+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
98176 {
98177 }
98178
98179@@ -106,6 +106,6 @@ extern void enable_mmiotrace(void);
98180 extern void disable_mmiotrace(void);
98181 extern void mmio_trace_rw(struct mmiotrace_rw *rw);
98182 extern void mmio_trace_mapping(struct mmiotrace_map *map);
98183-extern int mmio_trace_printk(const char *fmt, va_list args);
98184+extern __printf(1, 0) int mmio_trace_printk(const char *fmt, va_list args);
98185
98186 #endif /* _LINUX_MMIOTRACE_H */
98187diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
98188index 54d74f6..0728424 100644
98189--- a/include/linux/mmzone.h
98190+++ b/include/linux/mmzone.h
98191@@ -526,7 +526,7 @@ struct zone {
98192
98193 ZONE_PADDING(_pad3_)
98194 /* Zone statistics */
98195- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98196+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98197 } ____cacheline_internodealigned_in_smp;
98198
98199 enum zone_flags {
98200diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
98201index 3bfd567..72e7d8f 100644
98202--- a/include/linux/mod_devicetable.h
98203+++ b/include/linux/mod_devicetable.h
98204@@ -139,7 +139,7 @@ struct usb_device_id {
98205 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
98206 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
98207
98208-#define HID_ANY_ID (~0)
98209+#define HID_ANY_ID (~0U)
98210 #define HID_BUS_ANY 0xffff
98211 #define HID_GROUP_ANY 0x0000
98212
98213@@ -470,7 +470,7 @@ struct dmi_system_id {
98214 const char *ident;
98215 struct dmi_strmatch matches[4];
98216 void *driver_data;
98217-};
98218+} __do_const;
98219 /*
98220 * struct dmi_device_id appears during expansion of
98221 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
98222diff --git a/include/linux/module.h b/include/linux/module.h
98223index c883b86..516812e 100644
98224--- a/include/linux/module.h
98225+++ b/include/linux/module.h
98226@@ -17,9 +17,11 @@
98227 #include <linux/moduleparam.h>
98228 #include <linux/jump_label.h>
98229 #include <linux/export.h>
98230+#include <linux/fs.h>
98231
98232 #include <linux/percpu.h>
98233 #include <asm/module.h>
98234+#include <asm/pgtable.h>
98235
98236 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
98237 #define MODULE_SIG_STRING "~Module signature appended~\n"
98238@@ -42,7 +44,7 @@ struct module_kobject {
98239 struct kobject *drivers_dir;
98240 struct module_param_attrs *mp;
98241 struct completion *kobj_completion;
98242-};
98243+} __randomize_layout;
98244
98245 struct module_attribute {
98246 struct attribute attr;
98247@@ -54,12 +56,13 @@ struct module_attribute {
98248 int (*test)(struct module *);
98249 void (*free)(struct module *);
98250 };
98251+typedef struct module_attribute __no_const module_attribute_no_const;
98252
98253 struct module_version_attribute {
98254 struct module_attribute mattr;
98255 const char *module_name;
98256 const char *version;
98257-} __attribute__ ((__aligned__(sizeof(void *))));
98258+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
98259
98260 extern ssize_t __modver_version_show(struct module_attribute *,
98261 struct module_kobject *, char *);
98262@@ -221,7 +224,7 @@ struct module {
98263
98264 /* Sysfs stuff. */
98265 struct module_kobject mkobj;
98266- struct module_attribute *modinfo_attrs;
98267+ module_attribute_no_const *modinfo_attrs;
98268 const char *version;
98269 const char *srcversion;
98270 struct kobject *holders_dir;
98271@@ -270,19 +273,16 @@ struct module {
98272 int (*init)(void);
98273
98274 /* If this is non-NULL, vfree after init() returns */
98275- void *module_init;
98276+ void *module_init_rx, *module_init_rw;
98277
98278 /* Here is the actual code + data, vfree'd on unload. */
98279- void *module_core;
98280+ void *module_core_rx, *module_core_rw;
98281
98282 /* Here are the sizes of the init and core sections */
98283- unsigned int init_size, core_size;
98284+ unsigned int init_size_rw, core_size_rw;
98285
98286 /* The size of the executable code in each section. */
98287- unsigned int init_text_size, core_text_size;
98288-
98289- /* Size of RO sections of the module (text+rodata) */
98290- unsigned int init_ro_size, core_ro_size;
98291+ unsigned int init_size_rx, core_size_rx;
98292
98293 /* Arch-specific module values */
98294 struct mod_arch_specific arch;
98295@@ -340,6 +340,10 @@ struct module {
98296 unsigned int num_trace_events;
98297 struct trace_enum_map **trace_enums;
98298 unsigned int num_trace_enums;
98299+ struct file_operations trace_id;
98300+ struct file_operations trace_enable;
98301+ struct file_operations trace_format;
98302+ struct file_operations trace_filter;
98303 #endif
98304 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
98305 unsigned int num_ftrace_callsites;
98306@@ -367,7 +371,7 @@ struct module {
98307 ctor_fn_t *ctors;
98308 unsigned int num_ctors;
98309 #endif
98310-};
98311+} __randomize_layout;
98312 #ifndef MODULE_ARCH_INIT
98313 #define MODULE_ARCH_INIT {}
98314 #endif
98315@@ -388,18 +392,48 @@ bool is_module_address(unsigned long addr);
98316 bool is_module_percpu_address(unsigned long addr);
98317 bool is_module_text_address(unsigned long addr);
98318
98319+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
98320+{
98321+
98322+#ifdef CONFIG_PAX_KERNEXEC
98323+ if (ktla_ktva(addr) >= (unsigned long)start &&
98324+ ktla_ktva(addr) < (unsigned long)start + size)
98325+ return 1;
98326+#endif
98327+
98328+ return ((void *)addr >= start && (void *)addr < start + size);
98329+}
98330+
98331+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
98332+{
98333+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
98334+}
98335+
98336+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
98337+{
98338+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
98339+}
98340+
98341+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
98342+{
98343+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
98344+}
98345+
98346+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
98347+{
98348+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
98349+}
98350+
98351 static inline bool within_module_core(unsigned long addr,
98352 const struct module *mod)
98353 {
98354- return (unsigned long)mod->module_core <= addr &&
98355- addr < (unsigned long)mod->module_core + mod->core_size;
98356+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
98357 }
98358
98359 static inline bool within_module_init(unsigned long addr,
98360 const struct module *mod)
98361 {
98362- return (unsigned long)mod->module_init <= addr &&
98363- addr < (unsigned long)mod->module_init + mod->init_size;
98364+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
98365 }
98366
98367 static inline bool within_module(unsigned long addr, const struct module *mod)
98368diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
98369index 4d0cb9b..3169ac7 100644
98370--- a/include/linux/moduleloader.h
98371+++ b/include/linux/moduleloader.h
98372@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
98373 sections. Returns NULL on failure. */
98374 void *module_alloc(unsigned long size);
98375
98376+#ifdef CONFIG_PAX_KERNEXEC
98377+void *module_alloc_exec(unsigned long size);
98378+#else
98379+#define module_alloc_exec(x) module_alloc(x)
98380+#endif
98381+
98382 /* Free memory returned from module_alloc. */
98383 void module_memfree(void *module_region);
98384
98385+#ifdef CONFIG_PAX_KERNEXEC
98386+void module_memfree_exec(void *module_region);
98387+#else
98388+#define module_memfree_exec(x) module_memfree((x))
98389+#endif
98390+
98391 /*
98392 * Apply the given relocation to the (simplified) ELF. Return -error
98393 * or 0.
98394@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
98395 unsigned int relsec,
98396 struct module *me)
98397 {
98398+#ifdef CONFIG_MODULES
98399 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98400 module_name(me));
98401+#endif
98402 return -ENOEXEC;
98403 }
98404 #endif
98405@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
98406 unsigned int relsec,
98407 struct module *me)
98408 {
98409+#ifdef CONFIG_MODULES
98410 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98411 module_name(me));
98412+#endif
98413 return -ENOEXEC;
98414 }
98415 #endif
98416diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
98417index 1c9effa..1160bdd 100644
98418--- a/include/linux/moduleparam.h
98419+++ b/include/linux/moduleparam.h
98420@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
98421 * @len is usually just sizeof(string).
98422 */
98423 #define module_param_string(name, string, len, perm) \
98424- static const struct kparam_string __param_string_##name \
98425+ static const struct kparam_string __param_string_##name __used \
98426 = { len, string }; \
98427 __module_param_call(MODULE_PARAM_PREFIX, name, \
98428 &param_ops_string, \
98429@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
98430 */
98431 #define module_param_array_named(name, array, type, nump, perm) \
98432 param_check_##type(name, &(array)[0]); \
98433- static const struct kparam_array __param_arr_##name \
98434+ static const struct kparam_array __param_arr_##name __used \
98435 = { .max = ARRAY_SIZE(array), .num = nump, \
98436 .ops = &param_ops_##type, \
98437 .elemsize = sizeof(array[0]), .elem = array }; \
98438diff --git a/include/linux/mount.h b/include/linux/mount.h
98439index f822c3c..958ca0a 100644
98440--- a/include/linux/mount.h
98441+++ b/include/linux/mount.h
98442@@ -67,7 +67,7 @@ struct vfsmount {
98443 struct dentry *mnt_root; /* root of the mounted tree */
98444 struct super_block *mnt_sb; /* pointer to superblock */
98445 int mnt_flags;
98446-};
98447+} __randomize_layout;
98448
98449 struct file; /* forward dec */
98450 struct path;
98451diff --git a/include/linux/namei.h b/include/linux/namei.h
98452index c899077..b9a2010 100644
98453--- a/include/linux/namei.h
98454+++ b/include/linux/namei.h
98455@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
98456 extern void unlock_rename(struct dentry *, struct dentry *);
98457
98458 extern void nd_jump_link(struct nameidata *nd, struct path *path);
98459-extern void nd_set_link(struct nameidata *nd, char *path);
98460-extern char *nd_get_link(struct nameidata *nd);
98461+extern void nd_set_link(struct nameidata *nd, const char *path);
98462+extern const char *nd_get_link(const struct nameidata *nd);
98463
98464 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
98465 {
98466diff --git a/include/linux/net.h b/include/linux/net.h
98467index 738ea48..409dc09 100644
98468--- a/include/linux/net.h
98469+++ b/include/linux/net.h
98470@@ -190,7 +190,7 @@ struct net_proto_family {
98471 int (*create)(struct net *net, struct socket *sock,
98472 int protocol, int kern);
98473 struct module *owner;
98474-};
98475+} __do_const;
98476
98477 struct iovec;
98478 struct kvec;
98479diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
98480index 05b9a69..4d7e300 100644
98481--- a/include/linux/netdevice.h
98482+++ b/include/linux/netdevice.h
98483@@ -1208,6 +1208,7 @@ struct net_device_ops {
98484 u32 maxrate);
98485 int (*ndo_get_iflink)(const struct net_device *dev);
98486 };
98487+typedef struct net_device_ops __no_const net_device_ops_no_const;
98488
98489 /**
98490 * enum net_device_priv_flags - &struct net_device priv_flags
98491@@ -1515,7 +1516,7 @@ struct net_device {
98492 unsigned long base_addr;
98493 int irq;
98494
98495- atomic_t carrier_changes;
98496+ atomic_unchecked_t carrier_changes;
98497
98498 /*
98499 * Some hardware also needs these fields (state,dev_list,
98500@@ -1554,8 +1555,8 @@ struct net_device {
98501
98502 struct net_device_stats stats;
98503
98504- atomic_long_t rx_dropped;
98505- atomic_long_t tx_dropped;
98506+ atomic_long_unchecked_t rx_dropped;
98507+ atomic_long_unchecked_t tx_dropped;
98508
98509 #ifdef CONFIG_WIRELESS_EXT
98510 const struct iw_handler_def * wireless_handlers;
98511diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
98512index 63560d0..64aba5c 100644
98513--- a/include/linux/netfilter.h
98514+++ b/include/linux/netfilter.h
98515@@ -113,7 +113,7 @@ struct nf_sockopt_ops {
98516 #endif
98517 /* Use the module struct to lock set/get code in place */
98518 struct module *owner;
98519-};
98520+} __do_const;
98521
98522 /* Function to register/unregister hook points. */
98523 int nf_register_hook(struct nf_hook_ops *reg);
98524diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
98525index e955d47..04a5338 100644
98526--- a/include/linux/netfilter/nfnetlink.h
98527+++ b/include/linux/netfilter/nfnetlink.h
98528@@ -19,7 +19,7 @@ struct nfnl_callback {
98529 const struct nlattr * const cda[]);
98530 const struct nla_policy *policy; /* netlink attribute policy */
98531 const u_int16_t attr_count; /* number of nlattr's */
98532-};
98533+} __do_const;
98534
98535 struct nfnetlink_subsystem {
98536 const char *name;
98537diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
98538new file mode 100644
98539index 0000000..33f4af8
98540--- /dev/null
98541+++ b/include/linux/netfilter/xt_gradm.h
98542@@ -0,0 +1,9 @@
98543+#ifndef _LINUX_NETFILTER_XT_GRADM_H
98544+#define _LINUX_NETFILTER_XT_GRADM_H 1
98545+
98546+struct xt_gradm_mtinfo {
98547+ __u16 flags;
98548+ __u16 invflags;
98549+};
98550+
98551+#endif
98552diff --git a/include/linux/nls.h b/include/linux/nls.h
98553index 520681b..2b7fabb 100644
98554--- a/include/linux/nls.h
98555+++ b/include/linux/nls.h
98556@@ -31,7 +31,7 @@ struct nls_table {
98557 const unsigned char *charset2upper;
98558 struct module *owner;
98559 struct nls_table *next;
98560-};
98561+} __do_const;
98562
98563 /* this value hold the maximum octet of charset */
98564 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
98565@@ -46,7 +46,7 @@ enum utf16_endian {
98566 /* nls_base.c */
98567 extern int __register_nls(struct nls_table *, struct module *);
98568 extern int unregister_nls(struct nls_table *);
98569-extern struct nls_table *load_nls(char *);
98570+extern struct nls_table *load_nls(const char *);
98571 extern void unload_nls(struct nls_table *);
98572 extern struct nls_table *load_nls_default(void);
98573 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
98574diff --git a/include/linux/notifier.h b/include/linux/notifier.h
98575index d14a4c3..a078786 100644
98576--- a/include/linux/notifier.h
98577+++ b/include/linux/notifier.h
98578@@ -54,7 +54,8 @@ struct notifier_block {
98579 notifier_fn_t notifier_call;
98580 struct notifier_block __rcu *next;
98581 int priority;
98582-};
98583+} __do_const;
98584+typedef struct notifier_block __no_const notifier_block_no_const;
98585
98586 struct atomic_notifier_head {
98587 spinlock_t lock;
98588diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
98589index b2a0f15..4d7da32 100644
98590--- a/include/linux/oprofile.h
98591+++ b/include/linux/oprofile.h
98592@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
98593 int oprofilefs_create_ro_ulong(struct dentry * root,
98594 char const * name, ulong * val);
98595
98596-/** Create a file for read-only access to an atomic_t. */
98597+/** Create a file for read-only access to an atomic_unchecked_t. */
98598 int oprofilefs_create_ro_atomic(struct dentry * root,
98599- char const * name, atomic_t * val);
98600+ char const * name, atomic_unchecked_t * val);
98601
98602 /** create a directory */
98603 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
98604diff --git a/include/linux/padata.h b/include/linux/padata.h
98605index 4386946..f50c615 100644
98606--- a/include/linux/padata.h
98607+++ b/include/linux/padata.h
98608@@ -129,7 +129,7 @@ struct parallel_data {
98609 struct padata_serial_queue __percpu *squeue;
98610 atomic_t reorder_objects;
98611 atomic_t refcnt;
98612- atomic_t seq_nr;
98613+ atomic_unchecked_t seq_nr;
98614 struct padata_cpumask cpumask;
98615 spinlock_t lock ____cacheline_aligned;
98616 unsigned int processed;
98617diff --git a/include/linux/path.h b/include/linux/path.h
98618index d137218..be0c176 100644
98619--- a/include/linux/path.h
98620+++ b/include/linux/path.h
98621@@ -1,13 +1,15 @@
98622 #ifndef _LINUX_PATH_H
98623 #define _LINUX_PATH_H
98624
98625+#include <linux/compiler.h>
98626+
98627 struct dentry;
98628 struct vfsmount;
98629
98630 struct path {
98631 struct vfsmount *mnt;
98632 struct dentry *dentry;
98633-};
98634+} __randomize_layout;
98635
98636 extern void path_get(const struct path *);
98637 extern void path_put(const struct path *);
98638diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
98639index 8c78950..0d74ed9 100644
98640--- a/include/linux/pci_hotplug.h
98641+++ b/include/linux/pci_hotplug.h
98642@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
98643 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
98644 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
98645 int (*reset_slot) (struct hotplug_slot *slot, int probe);
98646-};
98647+} __do_const;
98648+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
98649
98650 /**
98651 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
98652diff --git a/include/linux/percpu.h b/include/linux/percpu.h
98653index caebf2a..4c3ae9d 100644
98654--- a/include/linux/percpu.h
98655+++ b/include/linux/percpu.h
98656@@ -34,7 +34,7 @@
98657 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
98658 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
98659 */
98660-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
98661+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
98662 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
98663
98664 /*
98665diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
98666index d8a82a8..8b580f0 100644
98667--- a/include/linux/perf_event.h
98668+++ b/include/linux/perf_event.h
98669@@ -379,8 +379,8 @@ struct perf_event {
98670
98671 enum perf_event_active_state state;
98672 unsigned int attach_state;
98673- local64_t count;
98674- atomic64_t child_count;
98675+ local64_t count; /* PaX: fix it one day */
98676+ atomic64_unchecked_t child_count;
98677
98678 /*
98679 * These are the total time in nanoseconds that the event
98680@@ -431,8 +431,8 @@ struct perf_event {
98681 * These accumulate total time (in nanoseconds) that children
98682 * events have been enabled and running, respectively.
98683 */
98684- atomic64_t child_total_time_enabled;
98685- atomic64_t child_total_time_running;
98686+ atomic64_unchecked_t child_total_time_enabled;
98687+ atomic64_unchecked_t child_total_time_running;
98688
98689 /*
98690 * Protect attach/detach and child_list:
98691@@ -812,7 +812,7 @@ static inline void perf_event_task_sched_out(struct task_struct *prev,
98692
98693 static inline u64 __perf_event_count(struct perf_event *event)
98694 {
98695- return local64_read(&event->count) + atomic64_read(&event->child_count);
98696+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
98697 }
98698
98699 extern void perf_event_mmap(struct vm_area_struct *vma);
98700@@ -836,7 +836,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
98701 entry->ip[entry->nr++] = ip;
98702 }
98703
98704-extern int sysctl_perf_event_paranoid;
98705+extern int sysctl_perf_event_legitimately_concerned;
98706 extern int sysctl_perf_event_mlock;
98707 extern int sysctl_perf_event_sample_rate;
98708 extern int sysctl_perf_cpu_time_max_percent;
98709@@ -851,19 +851,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
98710 loff_t *ppos);
98711
98712
98713+static inline bool perf_paranoid_any(void)
98714+{
98715+ return sysctl_perf_event_legitimately_concerned > 2;
98716+}
98717+
98718 static inline bool perf_paranoid_tracepoint_raw(void)
98719 {
98720- return sysctl_perf_event_paranoid > -1;
98721+ return sysctl_perf_event_legitimately_concerned > -1;
98722 }
98723
98724 static inline bool perf_paranoid_cpu(void)
98725 {
98726- return sysctl_perf_event_paranoid > 0;
98727+ return sysctl_perf_event_legitimately_concerned > 0;
98728 }
98729
98730 static inline bool perf_paranoid_kernel(void)
98731 {
98732- return sysctl_perf_event_paranoid > 1;
98733+ return sysctl_perf_event_legitimately_concerned > 1;
98734 }
98735
98736 extern void perf_event_init(void);
98737@@ -1017,7 +1022,7 @@ struct perf_pmu_events_attr {
98738 struct device_attribute attr;
98739 u64 id;
98740 const char *event_str;
98741-};
98742+} __do_const;
98743
98744 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
98745 char *page);
98746diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
98747index 918b117..7af374b7 100644
98748--- a/include/linux/pid_namespace.h
98749+++ b/include/linux/pid_namespace.h
98750@@ -45,7 +45,7 @@ struct pid_namespace {
98751 int hide_pid;
98752 int reboot; /* group exit code if this pidns was rebooted */
98753 struct ns_common ns;
98754-};
98755+} __randomize_layout;
98756
98757 extern struct pid_namespace init_pid_ns;
98758
98759diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
98760index eb8b8ac..62649e1 100644
98761--- a/include/linux/pipe_fs_i.h
98762+++ b/include/linux/pipe_fs_i.h
98763@@ -47,10 +47,10 @@ struct pipe_inode_info {
98764 struct mutex mutex;
98765 wait_queue_head_t wait;
98766 unsigned int nrbufs, curbuf, buffers;
98767- unsigned int readers;
98768- unsigned int writers;
98769- unsigned int files;
98770- unsigned int waiting_writers;
98771+ atomic_t readers;
98772+ atomic_t writers;
98773+ atomic_t files;
98774+ atomic_t waiting_writers;
98775 unsigned int r_counter;
98776 unsigned int w_counter;
98777 struct page *tmp_page;
98778diff --git a/include/linux/pm.h b/include/linux/pm.h
98779index 2d29c64..1b25b2a 100644
98780--- a/include/linux/pm.h
98781+++ b/include/linux/pm.h
98782@@ -616,6 +616,7 @@ struct dev_pm_domain {
98783 void (*sync)(struct device *dev);
98784 void (*dismiss)(struct device *dev);
98785 };
98786+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
98787
98788 /*
98789 * The PM_EVENT_ messages are also used by drivers implementing the legacy
98790diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
98791index 681ccb0..a90e0b7 100644
98792--- a/include/linux/pm_domain.h
98793+++ b/include/linux/pm_domain.h
98794@@ -39,11 +39,11 @@ struct gpd_dev_ops {
98795 int (*save_state)(struct device *dev);
98796 int (*restore_state)(struct device *dev);
98797 bool (*active_wakeup)(struct device *dev);
98798-};
98799+} __no_const;
98800
98801 struct gpd_cpuidle_data {
98802 unsigned int saved_exit_latency;
98803- struct cpuidle_state *idle_state;
98804+ cpuidle_state_no_const *idle_state;
98805 };
98806
98807 struct generic_pm_domain {
98808diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
98809index 30e84d4..22278b4 100644
98810--- a/include/linux/pm_runtime.h
98811+++ b/include/linux/pm_runtime.h
98812@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
98813
98814 static inline void pm_runtime_mark_last_busy(struct device *dev)
98815 {
98816- ACCESS_ONCE(dev->power.last_busy) = jiffies;
98817+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
98818 }
98819
98820 static inline bool pm_runtime_is_irq_safe(struct device *dev)
98821diff --git a/include/linux/pnp.h b/include/linux/pnp.h
98822index 5df733b..d55f252 100644
98823--- a/include/linux/pnp.h
98824+++ b/include/linux/pnp.h
98825@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
98826 struct pnp_fixup {
98827 char id[7];
98828 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
98829-};
98830+} __do_const;
98831
98832 /* config parameters */
98833 #define PNP_CONFIG_NORMAL 0x0001
98834diff --git a/include/linux/poison.h b/include/linux/poison.h
98835index 2110a81..13a11bb 100644
98836--- a/include/linux/poison.h
98837+++ b/include/linux/poison.h
98838@@ -19,8 +19,8 @@
98839 * under normal circumstances, used to verify that nobody uses
98840 * non-initialized list entries.
98841 */
98842-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
98843-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
98844+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
98845+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
98846
98847 /********** include/linux/timer.h **********/
98848 /*
98849diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
98850index d8b187c3..9a9257a 100644
98851--- a/include/linux/power/smartreflex.h
98852+++ b/include/linux/power/smartreflex.h
98853@@ -238,7 +238,7 @@ struct omap_sr_class_data {
98854 int (*notify)(struct omap_sr *sr, u32 status);
98855 u8 notify_flags;
98856 u8 class_type;
98857-};
98858+} __do_const;
98859
98860 /**
98861 * struct omap_sr_nvalue_table - Smartreflex n-target value info
98862diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
98863index 4ea1d37..80f4b33 100644
98864--- a/include/linux/ppp-comp.h
98865+++ b/include/linux/ppp-comp.h
98866@@ -84,7 +84,7 @@ struct compressor {
98867 struct module *owner;
98868 /* Extra skb space needed by the compressor algorithm */
98869 unsigned int comp_extra;
98870-};
98871+} __do_const;
98872
98873 /*
98874 * The return value from decompress routine is the length of the
98875diff --git a/include/linux/preempt.h b/include/linux/preempt.h
98876index de83b4e..c4b997d 100644
98877--- a/include/linux/preempt.h
98878+++ b/include/linux/preempt.h
98879@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
98880 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
98881 #endif
98882
98883+#define raw_preempt_count_add(val) __preempt_count_add(val)
98884+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
98885+
98886 #define __preempt_count_inc() __preempt_count_add(1)
98887 #define __preempt_count_dec() __preempt_count_sub(1)
98888
98889 #define preempt_count_inc() preempt_count_add(1)
98890+#define raw_preempt_count_inc() raw_preempt_count_add(1)
98891 #define preempt_count_dec() preempt_count_sub(1)
98892+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
98893
98894 #ifdef CONFIG_PREEMPT_COUNT
98895
98896@@ -41,6 +46,12 @@ do { \
98897 barrier(); \
98898 } while (0)
98899
98900+#define raw_preempt_disable() \
98901+do { \
98902+ raw_preempt_count_inc(); \
98903+ barrier(); \
98904+} while (0)
98905+
98906 #define sched_preempt_enable_no_resched() \
98907 do { \
98908 barrier(); \
98909@@ -49,6 +60,12 @@ do { \
98910
98911 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
98912
98913+#define raw_preempt_enable_no_resched() \
98914+do { \
98915+ barrier(); \
98916+ raw_preempt_count_dec(); \
98917+} while (0)
98918+
98919 #ifdef CONFIG_PREEMPT
98920 #define preempt_enable() \
98921 do { \
98922@@ -113,8 +130,10 @@ do { \
98923 * region.
98924 */
98925 #define preempt_disable() barrier()
98926+#define raw_preempt_disable() barrier()
98927 #define sched_preempt_enable_no_resched() barrier()
98928 #define preempt_enable_no_resched() barrier()
98929+#define raw_preempt_enable_no_resched() barrier()
98930 #define preempt_enable() barrier()
98931 #define preempt_check_resched() do { } while (0)
98932
98933@@ -128,11 +147,13 @@ do { \
98934 /*
98935 * Modules have no business playing preemption tricks.
98936 */
98937+#ifndef CONFIG_PAX_KERNEXEC
98938 #undef sched_preempt_enable_no_resched
98939 #undef preempt_enable_no_resched
98940 #undef preempt_enable_no_resched_notrace
98941 #undef preempt_check_resched
98942 #endif
98943+#endif
98944
98945 #define preempt_set_need_resched() \
98946 do { \
98947diff --git a/include/linux/printk.h b/include/linux/printk.h
98948index 9b30871..1aebc2d 100644
98949--- a/include/linux/printk.h
98950+++ b/include/linux/printk.h
98951@@ -120,7 +120,8 @@ static inline __printf(1, 2) __cold
98952 void early_printk(const char *s, ...) { }
98953 #endif
98954
98955-typedef int(*printk_func_t)(const char *fmt, va_list args);
98956+typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args);
98957+extern int kptr_restrict;
98958
98959 #ifdef CONFIG_PRINTK
98960 asmlinkage __printf(5, 0)
98961@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
98962
98963 extern int printk_delay_msec;
98964 extern int dmesg_restrict;
98965-extern int kptr_restrict;
98966
98967 extern void wake_up_klogd(void);
98968
98969@@ -164,7 +164,7 @@ char *log_buf_addr_get(void);
98970 u32 log_buf_len_get(void);
98971 void log_buf_kexec_setup(void);
98972 void __init setup_log_buf(int early);
98973-void dump_stack_set_arch_desc(const char *fmt, ...);
98974+__printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);
98975 void dump_stack_print_info(const char *log_lvl);
98976 void show_regs_print_info(const char *log_lvl);
98977 #else
98978@@ -215,7 +215,7 @@ static inline void setup_log_buf(int early)
98979 {
98980 }
98981
98982-static inline void dump_stack_set_arch_desc(const char *fmt, ...)
98983+static inline __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...)
98984 {
98985 }
98986
98987diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
98988index b97bf2e..f14c92d4 100644
98989--- a/include/linux/proc_fs.h
98990+++ b/include/linux/proc_fs.h
98991@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
98992 extern struct proc_dir_entry *proc_symlink(const char *,
98993 struct proc_dir_entry *, const char *);
98994 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
98995+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
98996 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
98997 struct proc_dir_entry *, void *);
98998+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
98999+ struct proc_dir_entry *, void *);
99000 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
99001 struct proc_dir_entry *);
99002
99003@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
99004 return proc_create_data(name, mode, parent, proc_fops, NULL);
99005 }
99006
99007+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
99008+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
99009+{
99010+#ifdef CONFIG_GRKERNSEC_PROC_USER
99011+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
99012+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99013+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
99014+#else
99015+ return proc_create_data(name, mode, parent, proc_fops, NULL);
99016+#endif
99017+}
99018+
99019+
99020 extern void proc_set_size(struct proc_dir_entry *, loff_t);
99021 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
99022 extern void *PDE_DATA(const struct inode *);
99023@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
99024 struct proc_dir_entry *parent,const char *dest) { return NULL;}
99025 static inline struct proc_dir_entry *proc_mkdir(const char *name,
99026 struct proc_dir_entry *parent) {return NULL;}
99027+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
99028+ struct proc_dir_entry *parent) { return NULL; }
99029 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
99030 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99031+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
99032+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99033 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
99034 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
99035 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
99036@@ -79,7 +99,7 @@ struct net;
99037 static inline struct proc_dir_entry *proc_net_mkdir(
99038 struct net *net, const char *name, struct proc_dir_entry *parent)
99039 {
99040- return proc_mkdir_data(name, 0, parent, net);
99041+ return proc_mkdir_data_restrict(name, 0, parent, net);
99042 }
99043
99044 #endif /* _LINUX_PROC_FS_H */
99045diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
99046index 42dfc61..8113a99 100644
99047--- a/include/linux/proc_ns.h
99048+++ b/include/linux/proc_ns.h
99049@@ -16,7 +16,7 @@ struct proc_ns_operations {
99050 struct ns_common *(*get)(struct task_struct *task);
99051 void (*put)(struct ns_common *ns);
99052 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
99053-};
99054+} __do_const __randomize_layout;
99055
99056 extern const struct proc_ns_operations netns_operations;
99057 extern const struct proc_ns_operations utsns_operations;
99058diff --git a/include/linux/quota.h b/include/linux/quota.h
99059index b2505ac..5f7ab55 100644
99060--- a/include/linux/quota.h
99061+++ b/include/linux/quota.h
99062@@ -76,7 +76,7 @@ struct kqid { /* Type in which we store the quota identifier */
99063
99064 extern bool qid_eq(struct kqid left, struct kqid right);
99065 extern bool qid_lt(struct kqid left, struct kqid right);
99066-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
99067+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
99068 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
99069 extern bool qid_valid(struct kqid qid);
99070
99071diff --git a/include/linux/random.h b/include/linux/random.h
99072index b05856e..0a9f14e 100644
99073--- a/include/linux/random.h
99074+++ b/include/linux/random.h
99075@@ -9,9 +9,19 @@
99076 #include <uapi/linux/random.h>
99077
99078 extern void add_device_randomness(const void *, unsigned int);
99079+
99080+static inline void add_latent_entropy(void)
99081+{
99082+
99083+#ifdef LATENT_ENTROPY_PLUGIN
99084+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
99085+#endif
99086+
99087+}
99088+
99089 extern void add_input_randomness(unsigned int type, unsigned int code,
99090- unsigned int value);
99091-extern void add_interrupt_randomness(int irq, int irq_flags);
99092+ unsigned int value) __latent_entropy;
99093+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
99094
99095 extern void get_random_bytes(void *buf, int nbytes);
99096 extern void get_random_bytes_arch(void *buf, int nbytes);
99097@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
99098 extern const struct file_operations random_fops, urandom_fops;
99099 #endif
99100
99101-unsigned int get_random_int(void);
99102+unsigned int __intentional_overflow(-1) get_random_int(void);
99103 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
99104
99105-u32 prandom_u32(void);
99106+u32 prandom_u32(void) __intentional_overflow(-1);
99107 void prandom_bytes(void *buf, size_t nbytes);
99108 void prandom_seed(u32 seed);
99109 void prandom_reseed_late(void);
99110@@ -37,6 +47,11 @@ struct rnd_state {
99111 u32 prandom_u32_state(struct rnd_state *state);
99112 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99113
99114+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
99115+{
99116+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
99117+}
99118+
99119 /**
99120 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
99121 * @ep_ro: right open interval endpoint
99122@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99123 *
99124 * Returns: pseudo-random number in interval [0, ep_ro)
99125 */
99126-static inline u32 prandom_u32_max(u32 ep_ro)
99127+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
99128 {
99129 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
99130 }
99131diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
99132index 378c5ee..aa84a47 100644
99133--- a/include/linux/rbtree_augmented.h
99134+++ b/include/linux/rbtree_augmented.h
99135@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
99136 old->rbaugmented = rbcompute(old); \
99137 } \
99138 rbstatic const struct rb_augment_callbacks rbname = { \
99139- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
99140+ .propagate = rbname ## _propagate, \
99141+ .copy = rbname ## _copy, \
99142+ .rotate = rbname ## _rotate \
99143 };
99144
99145
99146diff --git a/include/linux/rculist.h b/include/linux/rculist.h
99147index a18b16f..2683096 100644
99148--- a/include/linux/rculist.h
99149+++ b/include/linux/rculist.h
99150@@ -29,8 +29,8 @@
99151 */
99152 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
99153 {
99154- ACCESS_ONCE(list->next) = list;
99155- ACCESS_ONCE(list->prev) = list;
99156+ ACCESS_ONCE_RW(list->next) = list;
99157+ ACCESS_ONCE_RW(list->prev) = list;
99158 }
99159
99160 /*
99161@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
99162 struct list_head *prev, struct list_head *next);
99163 #endif
99164
99165+void __pax_list_add_rcu(struct list_head *new,
99166+ struct list_head *prev, struct list_head *next);
99167+
99168 /**
99169 * list_add_rcu - add a new entry to rcu-protected list
99170 * @new: new entry to be added
99171@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
99172 __list_add_rcu(new, head, head->next);
99173 }
99174
99175+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
99176+{
99177+ __pax_list_add_rcu(new, head, head->next);
99178+}
99179+
99180 /**
99181 * list_add_tail_rcu - add a new entry to rcu-protected list
99182 * @new: new entry to be added
99183@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
99184 __list_add_rcu(new, head->prev, head);
99185 }
99186
99187+static inline void pax_list_add_tail_rcu(struct list_head *new,
99188+ struct list_head *head)
99189+{
99190+ __pax_list_add_rcu(new, head->prev, head);
99191+}
99192+
99193 /**
99194 * list_del_rcu - deletes entry from list without re-initialization
99195 * @entry: the element to delete from the list.
99196@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
99197 entry->prev = LIST_POISON2;
99198 }
99199
99200+extern void pax_list_del_rcu(struct list_head *entry);
99201+
99202 /**
99203 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
99204 * @n: the element to delete from the hash list.
99205diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
99206index 573a5af..de97a14 100644
99207--- a/include/linux/rcupdate.h
99208+++ b/include/linux/rcupdate.h
99209@@ -365,7 +365,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
99210 do { \
99211 rcu_all_qs(); \
99212 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
99213- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
99214+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
99215 } while (0)
99216 #else /* #ifdef CONFIG_TASKS_RCU */
99217 #define TASKS_RCU(x) do { } while (0)
99218diff --git a/include/linux/reboot.h b/include/linux/reboot.h
99219index a7ff409..03e2fa8 100644
99220--- a/include/linux/reboot.h
99221+++ b/include/linux/reboot.h
99222@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
99223 */
99224
99225 extern void migrate_to_reboot_cpu(void);
99226-extern void machine_restart(char *cmd);
99227-extern void machine_halt(void);
99228-extern void machine_power_off(void);
99229+extern void machine_restart(char *cmd) __noreturn;
99230+extern void machine_halt(void) __noreturn;
99231+extern void machine_power_off(void) __noreturn;
99232
99233 extern void machine_shutdown(void);
99234 struct pt_regs;
99235@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
99236 */
99237
99238 extern void kernel_restart_prepare(char *cmd);
99239-extern void kernel_restart(char *cmd);
99240-extern void kernel_halt(void);
99241-extern void kernel_power_off(void);
99242+extern void kernel_restart(char *cmd) __noreturn;
99243+extern void kernel_halt(void) __noreturn;
99244+extern void kernel_power_off(void) __noreturn;
99245
99246 extern int C_A_D; /* for sysctl */
99247 void ctrl_alt_del(void);
99248@@ -77,7 +77,7 @@ extern void orderly_reboot(void);
99249 * Emergency restart, callable from an interrupt handler.
99250 */
99251
99252-extern void emergency_restart(void);
99253+extern void emergency_restart(void) __noreturn;
99254 #include <asm/emergency-restart.h>
99255
99256 #endif /* _LINUX_REBOOT_H */
99257diff --git a/include/linux/regset.h b/include/linux/regset.h
99258index 8e0c9fe..ac4d221 100644
99259--- a/include/linux/regset.h
99260+++ b/include/linux/regset.h
99261@@ -161,7 +161,8 @@ struct user_regset {
99262 unsigned int align;
99263 unsigned int bias;
99264 unsigned int core_note_type;
99265-};
99266+} __do_const;
99267+typedef struct user_regset __no_const user_regset_no_const;
99268
99269 /**
99270 * struct user_regset_view - available regsets
99271diff --git a/include/linux/relay.h b/include/linux/relay.h
99272index d7c8359..818daf5 100644
99273--- a/include/linux/relay.h
99274+++ b/include/linux/relay.h
99275@@ -157,7 +157,7 @@ struct rchan_callbacks
99276 * The callback should return 0 if successful, negative if not.
99277 */
99278 int (*remove_buf_file)(struct dentry *dentry);
99279-};
99280+} __no_const;
99281
99282 /*
99283 * CONFIG_RELAY kernel API, kernel/relay.c
99284diff --git a/include/linux/rio.h b/include/linux/rio.h
99285index 6bda06f..bf39a9b 100644
99286--- a/include/linux/rio.h
99287+++ b/include/linux/rio.h
99288@@ -358,7 +358,7 @@ struct rio_ops {
99289 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
99290 u64 rstart, u32 size, u32 flags);
99291 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
99292-};
99293+} __no_const;
99294
99295 #define RIO_RESOURCE_MEM 0x00000100
99296 #define RIO_RESOURCE_DOORBELL 0x00000200
99297diff --git a/include/linux/rmap.h b/include/linux/rmap.h
99298index c89c53a..aa0a65a 100644
99299--- a/include/linux/rmap.h
99300+++ b/include/linux/rmap.h
99301@@ -146,8 +146,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
99302 void anon_vma_init(void); /* create anon_vma_cachep */
99303 int anon_vma_prepare(struct vm_area_struct *);
99304 void unlink_anon_vmas(struct vm_area_struct *);
99305-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
99306-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
99307+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
99308+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
99309
99310 static inline void anon_vma_merge(struct vm_area_struct *vma,
99311 struct vm_area_struct *next)
99312diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
99313index ed8f9e70..2e627f2 100644
99314--- a/include/linux/scatterlist.h
99315+++ b/include/linux/scatterlist.h
99316@@ -1,6 +1,7 @@
99317 #ifndef _LINUX_SCATTERLIST_H
99318 #define _LINUX_SCATTERLIST_H
99319
99320+#include <linux/sched.h>
99321 #include <linux/string.h>
99322 #include <linux/bug.h>
99323 #include <linux/mm.h>
99324@@ -111,10 +112,17 @@ static inline struct page *sg_page(struct scatterlist *sg)
99325 static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
99326 unsigned int buflen)
99327 {
99328+ const void *realbuf = buf;
99329+
99330+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99331+ if (object_starts_on_stack(buf))
99332+ realbuf = buf - current->stack + current->lowmem_stack;
99333+#endif
99334+
99335 #ifdef CONFIG_DEBUG_SG
99336- BUG_ON(!virt_addr_valid(buf));
99337+ BUG_ON(!virt_addr_valid(realbuf));
99338 #endif
99339- sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
99340+ sg_set_page(sg, virt_to_page(realbuf), buflen, offset_in_page(realbuf));
99341 }
99342
99343 /*
99344diff --git a/include/linux/sched.h b/include/linux/sched.h
99345index 26a2e61..36bbf4b 100644
99346--- a/include/linux/sched.h
99347+++ b/include/linux/sched.h
99348@@ -132,6 +132,7 @@ struct fs_struct;
99349 struct perf_event_context;
99350 struct blk_plug;
99351 struct filename;
99352+struct linux_binprm;
99353
99354 #define VMACACHE_BITS 2
99355 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
99356@@ -413,7 +414,7 @@ extern char __sched_text_start[], __sched_text_end[];
99357 extern int in_sched_functions(unsigned long addr);
99358
99359 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
99360-extern signed long schedule_timeout(signed long timeout);
99361+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
99362 extern signed long schedule_timeout_interruptible(signed long timeout);
99363 extern signed long schedule_timeout_killable(signed long timeout);
99364 extern signed long schedule_timeout_uninterruptible(signed long timeout);
99365@@ -431,6 +432,19 @@ struct nsproxy;
99366 struct user_namespace;
99367
99368 #ifdef CONFIG_MMU
99369+
99370+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
99371+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
99372+#else
99373+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
99374+{
99375+ return 0;
99376+}
99377+#endif
99378+
99379+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
99380+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
99381+
99382 extern void arch_pick_mmap_layout(struct mm_struct *mm);
99383 extern unsigned long
99384 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
99385@@ -729,6 +743,17 @@ struct signal_struct {
99386 #ifdef CONFIG_TASKSTATS
99387 struct taskstats *stats;
99388 #endif
99389+
99390+#ifdef CONFIG_GRKERNSEC
99391+ u32 curr_ip;
99392+ u32 saved_ip;
99393+ u32 gr_saddr;
99394+ u32 gr_daddr;
99395+ u16 gr_sport;
99396+ u16 gr_dport;
99397+ u8 used_accept:1;
99398+#endif
99399+
99400 #ifdef CONFIG_AUDIT
99401 unsigned audit_tty;
99402 unsigned audit_tty_log_passwd;
99403@@ -755,7 +780,7 @@ struct signal_struct {
99404 struct mutex cred_guard_mutex; /* guard against foreign influences on
99405 * credential calculations
99406 * (notably. ptrace) */
99407-};
99408+} __randomize_layout;
99409
99410 /*
99411 * Bits in flags field of signal_struct.
99412@@ -808,6 +833,14 @@ struct user_struct {
99413 struct key *session_keyring; /* UID's default session keyring */
99414 #endif
99415
99416+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
99417+ unsigned char kernel_banned;
99418+#endif
99419+#ifdef CONFIG_GRKERNSEC_BRUTE
99420+ unsigned char suid_banned;
99421+ unsigned long suid_ban_expires;
99422+#endif
99423+
99424 /* Hash table maintenance information */
99425 struct hlist_node uidhash_node;
99426 kuid_t uid;
99427@@ -815,7 +848,7 @@ struct user_struct {
99428 #ifdef CONFIG_PERF_EVENTS
99429 atomic_long_t locked_vm;
99430 #endif
99431-};
99432+} __randomize_layout;
99433
99434 extern int uids_sysfs_init(void);
99435
99436@@ -1292,6 +1325,9 @@ enum perf_event_task_context {
99437 struct task_struct {
99438 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
99439 void *stack;
99440+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99441+ void *lowmem_stack;
99442+#endif
99443 atomic_t usage;
99444 unsigned int flags; /* per process flags, defined below */
99445 unsigned int ptrace;
99446@@ -1425,8 +1461,8 @@ struct task_struct {
99447 struct list_head thread_node;
99448
99449 struct completion *vfork_done; /* for vfork() */
99450- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
99451- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99452+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
99453+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99454
99455 cputime_t utime, stime, utimescaled, stimescaled;
99456 cputime_t gtime;
99457@@ -1451,11 +1487,6 @@ struct task_struct {
99458 struct task_cputime cputime_expires;
99459 struct list_head cpu_timers[3];
99460
99461-/* process credentials */
99462- const struct cred __rcu *real_cred; /* objective and real subjective task
99463- * credentials (COW) */
99464- const struct cred __rcu *cred; /* effective (overridable) subjective task
99465- * credentials (COW) */
99466 char comm[TASK_COMM_LEN]; /* executable name excluding path
99467 - access with [gs]et_task_comm (which lock
99468 it with task_lock())
99469@@ -1473,6 +1504,10 @@ struct task_struct {
99470 #endif
99471 /* CPU-specific state of this task */
99472 struct thread_struct thread;
99473+/* thread_info moved to task_struct */
99474+#ifdef CONFIG_X86
99475+ struct thread_info tinfo;
99476+#endif
99477 /* filesystem information */
99478 struct fs_struct *fs;
99479 /* open file information */
99480@@ -1547,6 +1582,10 @@ struct task_struct {
99481 gfp_t lockdep_reclaim_gfp;
99482 #endif
99483
99484+/* process credentials */
99485+ const struct cred __rcu *real_cred; /* objective and real subjective task
99486+ * credentials (COW) */
99487+
99488 /* journalling filesystem info */
99489 void *journal_info;
99490
99491@@ -1585,6 +1624,10 @@ struct task_struct {
99492 /* cg_list protected by css_set_lock and tsk->alloc_lock */
99493 struct list_head cg_list;
99494 #endif
99495+
99496+ const struct cred __rcu *cred; /* effective (overridable) subjective task
99497+ * credentials (COW) */
99498+
99499 #ifdef CONFIG_FUTEX
99500 struct robust_list_head __user *robust_list;
99501 #ifdef CONFIG_COMPAT
99502@@ -1696,7 +1739,7 @@ struct task_struct {
99503 * Number of functions that haven't been traced
99504 * because of depth overrun.
99505 */
99506- atomic_t trace_overrun;
99507+ atomic_unchecked_t trace_overrun;
99508 /* Pause for the tracing */
99509 atomic_t tracing_graph_pause;
99510 #endif
99511@@ -1724,7 +1767,78 @@ struct task_struct {
99512 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
99513 unsigned long task_state_change;
99514 #endif
99515-};
99516+
99517+#ifdef CONFIG_GRKERNSEC
99518+ /* grsecurity */
99519+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
99520+ u64 exec_id;
99521+#endif
99522+#ifdef CONFIG_GRKERNSEC_SETXID
99523+ const struct cred *delayed_cred;
99524+#endif
99525+ struct dentry *gr_chroot_dentry;
99526+ struct acl_subject_label *acl;
99527+ struct acl_subject_label *tmpacl;
99528+ struct acl_role_label *role;
99529+ struct file *exec_file;
99530+ unsigned long brute_expires;
99531+ u16 acl_role_id;
99532+ u8 inherited;
99533+ /* is this the task that authenticated to the special role */
99534+ u8 acl_sp_role;
99535+ u8 is_writable;
99536+ u8 brute;
99537+ u8 gr_is_chrooted;
99538+#endif
99539+
99540+} __randomize_layout;
99541+
99542+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
99543+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
99544+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
99545+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
99546+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
99547+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
99548+
99549+#ifdef CONFIG_PAX_SOFTMODE
99550+extern int pax_softmode;
99551+#endif
99552+
99553+extern int pax_check_flags(unsigned long *);
99554+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
99555+
99556+/* if tsk != current then task_lock must be held on it */
99557+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
99558+static inline unsigned long pax_get_flags(struct task_struct *tsk)
99559+{
99560+ if (likely(tsk->mm))
99561+ return tsk->mm->pax_flags;
99562+ else
99563+ return 0UL;
99564+}
99565+
99566+/* if tsk != current then task_lock must be held on it */
99567+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
99568+{
99569+ if (likely(tsk->mm)) {
99570+ tsk->mm->pax_flags = flags;
99571+ return 0;
99572+ }
99573+ return -EINVAL;
99574+}
99575+#endif
99576+
99577+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
99578+extern void pax_set_initial_flags(struct linux_binprm *bprm);
99579+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
99580+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
99581+#endif
99582+
99583+struct path;
99584+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
99585+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
99586+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
99587+extern void pax_report_refcount_overflow(struct pt_regs *regs);
99588
99589 /* Future-safe accessor for struct task_struct's cpus_allowed. */
99590 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
99591@@ -1807,7 +1921,7 @@ struct pid_namespace;
99592 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
99593 struct pid_namespace *ns);
99594
99595-static inline pid_t task_pid_nr(struct task_struct *tsk)
99596+static inline pid_t task_pid_nr(const struct task_struct *tsk)
99597 {
99598 return tsk->pid;
99599 }
99600@@ -2175,6 +2289,25 @@ extern u64 sched_clock_cpu(int cpu);
99601
99602 extern void sched_clock_init(void);
99603
99604+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99605+static inline void populate_stack(void)
99606+{
99607+ struct task_struct *curtask = current;
99608+ int c;
99609+ int *ptr = curtask->stack;
99610+ int *end = curtask->stack + THREAD_SIZE;
99611+
99612+ while (ptr < end) {
99613+ c = *(volatile int *)ptr;
99614+ ptr += PAGE_SIZE/sizeof(int);
99615+ }
99616+}
99617+#else
99618+static inline void populate_stack(void)
99619+{
99620+}
99621+#endif
99622+
99623 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
99624 static inline void sched_clock_tick(void)
99625 {
99626@@ -2303,7 +2436,9 @@ extern void set_curr_task(int cpu, struct task_struct *p);
99627 void yield(void);
99628
99629 union thread_union {
99630+#ifndef CONFIG_X86
99631 struct thread_info thread_info;
99632+#endif
99633 unsigned long stack[THREAD_SIZE/sizeof(long)];
99634 };
99635
99636@@ -2336,6 +2471,7 @@ extern struct pid_namespace init_pid_ns;
99637 */
99638
99639 extern struct task_struct *find_task_by_vpid(pid_t nr);
99640+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
99641 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
99642 struct pid_namespace *ns);
99643
99644@@ -2500,7 +2636,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
99645 extern void exit_itimers(struct signal_struct *);
99646 extern void flush_itimer_signals(void);
99647
99648-extern void do_group_exit(int);
99649+extern __noreturn void do_group_exit(int);
99650
99651 extern int do_execve(struct filename *,
99652 const char __user * const __user *,
99653@@ -2721,9 +2857,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
99654 #define task_stack_end_corrupted(task) \
99655 (*(end_of_stack(task)) != STACK_END_MAGIC)
99656
99657-static inline int object_is_on_stack(void *obj)
99658+static inline int object_starts_on_stack(const void *obj)
99659 {
99660- void *stack = task_stack_page(current);
99661+ const void *stack = task_stack_page(current);
99662
99663 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
99664 }
99665diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
99666index 596a0e0..bea77ec 100644
99667--- a/include/linux/sched/sysctl.h
99668+++ b/include/linux/sched/sysctl.h
99669@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
99670 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
99671
99672 extern int sysctl_max_map_count;
99673+extern unsigned long sysctl_heap_stack_gap;
99674
99675 extern unsigned int sysctl_sched_latency;
99676 extern unsigned int sysctl_sched_min_granularity;
99677diff --git a/include/linux/security.h b/include/linux/security.h
99678index 18264ea..e0238e4 100644
99679--- a/include/linux/security.h
99680+++ b/include/linux/security.h
99681@@ -27,6 +27,7 @@
99682 #include <linux/slab.h>
99683 #include <linux/err.h>
99684 #include <linux/string.h>
99685+#include <linux/grsecurity.h>
99686
99687 struct linux_binprm;
99688 struct cred;
99689@@ -116,8 +117,6 @@ struct seq_file;
99690
99691 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
99692
99693-void reset_security_ops(void);
99694-
99695 #ifdef CONFIG_MMU
99696 extern unsigned long mmap_min_addr;
99697 extern unsigned long dac_mmap_min_addr;
99698@@ -1755,7 +1754,7 @@ struct security_operations {
99699 struct audit_context *actx);
99700 void (*audit_rule_free) (void *lsmrule);
99701 #endif /* CONFIG_AUDIT */
99702-};
99703+} __randomize_layout;
99704
99705 /* prototypes */
99706 extern int security_init(void);
99707diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
99708index dc368b8..e895209 100644
99709--- a/include/linux/semaphore.h
99710+++ b/include/linux/semaphore.h
99711@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
99712 }
99713
99714 extern void down(struct semaphore *sem);
99715-extern int __must_check down_interruptible(struct semaphore *sem);
99716+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
99717 extern int __must_check down_killable(struct semaphore *sem);
99718 extern int __must_check down_trylock(struct semaphore *sem);
99719 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
99720diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
99721index afbb1fd..e1d205d 100644
99722--- a/include/linux/seq_file.h
99723+++ b/include/linux/seq_file.h
99724@@ -27,6 +27,9 @@ struct seq_file {
99725 struct mutex lock;
99726 const struct seq_operations *op;
99727 int poll_event;
99728+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
99729+ u64 exec_id;
99730+#endif
99731 #ifdef CONFIG_USER_NS
99732 struct user_namespace *user_ns;
99733 #endif
99734@@ -39,6 +42,7 @@ struct seq_operations {
99735 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
99736 int (*show) (struct seq_file *m, void *v);
99737 };
99738+typedef struct seq_operations __no_const seq_operations_no_const;
99739
99740 #define SEQ_SKIP 1
99741
99742@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
99743
99744 char *mangle_path(char *s, const char *p, const char *esc);
99745 int seq_open(struct file *, const struct seq_operations *);
99746+int seq_open_restrict(struct file *, const struct seq_operations *);
99747 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
99748 loff_t seq_lseek(struct file *, loff_t, int);
99749 int seq_release(struct inode *, struct file *);
99750@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
99751 const struct path *root, const char *esc);
99752
99753 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
99754+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
99755 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
99756 int single_release(struct inode *, struct file *);
99757 void *__seq_open_private(struct file *, const struct seq_operations *, int);
99758diff --git a/include/linux/shm.h b/include/linux/shm.h
99759index 6fb8016..ab4465e 100644
99760--- a/include/linux/shm.h
99761+++ b/include/linux/shm.h
99762@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
99763 /* The task created the shm object. NULL if the task is dead. */
99764 struct task_struct *shm_creator;
99765 struct list_head shm_clist; /* list by creator */
99766+#ifdef CONFIG_GRKERNSEC
99767+ u64 shm_createtime;
99768+ pid_t shm_lapid;
99769+#endif
99770 };
99771
99772 /* shm_mode upper byte flags */
99773diff --git a/include/linux/signal.h b/include/linux/signal.h
99774index ab1e039..ad4229e 100644
99775--- a/include/linux/signal.h
99776+++ b/include/linux/signal.h
99777@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
99778 * know it'll be handled, so that they don't get converted to
99779 * SIGKILL or just silently dropped.
99780 */
99781- kernel_sigaction(sig, (__force __sighandler_t)2);
99782+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
99783 }
99784
99785 static inline void disallow_signal(int sig)
99786diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
99787index f15154a..72cf02c 100644
99788--- a/include/linux/skbuff.h
99789+++ b/include/linux/skbuff.h
99790@@ -776,7 +776,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
99791 int node);
99792 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
99793 struct sk_buff *build_skb(void *data, unsigned int frag_size);
99794-static inline struct sk_buff *alloc_skb(unsigned int size,
99795+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
99796 gfp_t priority)
99797 {
99798 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
99799@@ -1971,7 +1971,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
99800 return skb->inner_transport_header - skb->inner_network_header;
99801 }
99802
99803-static inline int skb_network_offset(const struct sk_buff *skb)
99804+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
99805 {
99806 return skb_network_header(skb) - skb->data;
99807 }
99808@@ -2031,7 +2031,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
99809 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
99810 */
99811 #ifndef NET_SKB_PAD
99812-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
99813+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
99814 #endif
99815
99816 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
99817@@ -2673,9 +2673,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
99818 int *err);
99819 unsigned int datagram_poll(struct file *file, struct socket *sock,
99820 struct poll_table_struct *wait);
99821-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
99822+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
99823 struct iov_iter *to, int size);
99824-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
99825+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
99826 struct msghdr *msg, int size)
99827 {
99828 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
99829@@ -3197,6 +3197,9 @@ static inline void nf_reset(struct sk_buff *skb)
99830 nf_bridge_put(skb->nf_bridge);
99831 skb->nf_bridge = NULL;
99832 #endif
99833+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
99834+ skb->nf_trace = 0;
99835+#endif
99836 }
99837
99838 static inline void nf_reset_trace(struct sk_buff *skb)
99839diff --git a/include/linux/slab.h b/include/linux/slab.h
99840index ffd24c8..cbbe7de 100644
99841--- a/include/linux/slab.h
99842+++ b/include/linux/slab.h
99843@@ -15,14 +15,29 @@
99844 #include <linux/types.h>
99845 #include <linux/workqueue.h>
99846
99847+#include <linux/err.h>
99848
99849 /*
99850 * Flags to pass to kmem_cache_create().
99851 * The ones marked DEBUG are only valid if CONFIG_DEBUG_SLAB is set.
99852 */
99853 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
99854+
99855+#ifdef CONFIG_PAX_USERCOPY_SLABS
99856+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
99857+#else
99858+#define SLAB_USERCOPY 0x00000000UL
99859+#endif
99860+
99861 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
99862 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
99863+
99864+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99865+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
99866+#else
99867+#define SLAB_NO_SANITIZE 0x00000000UL
99868+#endif
99869+
99870 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
99871 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
99872 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
99873@@ -98,10 +113,13 @@
99874 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
99875 * Both make kfree a no-op.
99876 */
99877-#define ZERO_SIZE_PTR ((void *)16)
99878+#define ZERO_SIZE_PTR \
99879+({ \
99880+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
99881+ (void *)(-MAX_ERRNO-1L); \
99882+})
99883
99884-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
99885- (unsigned long)ZERO_SIZE_PTR)
99886+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
99887
99888 #include <linux/kmemleak.h>
99889 #include <linux/kasan.h>
99890@@ -143,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
99891 void kfree(const void *);
99892 void kzfree(const void *);
99893 size_t ksize(const void *);
99894+const char *check_heap_object(const void *ptr, unsigned long n);
99895+bool is_usercopy_object(const void *ptr);
99896
99897 /*
99898 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
99899@@ -235,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
99900 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
99901 #endif
99902
99903+#ifdef CONFIG_PAX_USERCOPY_SLABS
99904+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
99905+#endif
99906+
99907 /*
99908 * Figure out which kmalloc slab an allocation of a certain size
99909 * belongs to.
99910@@ -243,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
99911 * 2 = 120 .. 192 bytes
99912 * n = 2^(n-1) .. 2^n -1
99913 */
99914-static __always_inline int kmalloc_index(size_t size)
99915+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
99916 {
99917 if (!size)
99918 return 0;
99919@@ -286,15 +310,15 @@ static __always_inline int kmalloc_index(size_t size)
99920 }
99921 #endif /* !CONFIG_SLOB */
99922
99923-void *__kmalloc(size_t size, gfp_t flags);
99924+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
99925 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
99926 void kmem_cache_free(struct kmem_cache *, void *);
99927
99928 #ifdef CONFIG_NUMA
99929-void *__kmalloc_node(size_t size, gfp_t flags, int node);
99930+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
99931 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
99932 #else
99933-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
99934+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
99935 {
99936 return __kmalloc(size, flags);
99937 }
99938diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
99939index 33d0490..70a6313 100644
99940--- a/include/linux/slab_def.h
99941+++ b/include/linux/slab_def.h
99942@@ -40,7 +40,7 @@ struct kmem_cache {
99943 /* 4) cache creation/removal */
99944 const char *name;
99945 struct list_head list;
99946- int refcount;
99947+ atomic_t refcount;
99948 int object_size;
99949 int align;
99950
99951@@ -56,10 +56,14 @@ struct kmem_cache {
99952 unsigned long node_allocs;
99953 unsigned long node_frees;
99954 unsigned long node_overflow;
99955- atomic_t allochit;
99956- atomic_t allocmiss;
99957- atomic_t freehit;
99958- atomic_t freemiss;
99959+ atomic_unchecked_t allochit;
99960+ atomic_unchecked_t allocmiss;
99961+ atomic_unchecked_t freehit;
99962+ atomic_unchecked_t freemiss;
99963+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99964+ atomic_unchecked_t sanitized;
99965+ atomic_unchecked_t not_sanitized;
99966+#endif
99967
99968 /*
99969 * If debugging is enabled, then the allocator can add additional
99970diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
99971index 3388511..6252f90 100644
99972--- a/include/linux/slub_def.h
99973+++ b/include/linux/slub_def.h
99974@@ -74,7 +74,7 @@ struct kmem_cache {
99975 struct kmem_cache_order_objects max;
99976 struct kmem_cache_order_objects min;
99977 gfp_t allocflags; /* gfp flags to use on each alloc */
99978- int refcount; /* Refcount for slab cache destroy */
99979+ atomic_t refcount; /* Refcount for slab cache destroy */
99980 void (*ctor)(void *);
99981 int inuse; /* Offset to metadata */
99982 int align; /* Alignment */
99983diff --git a/include/linux/smp.h b/include/linux/smp.h
99984index c441407..f487b83 100644
99985--- a/include/linux/smp.h
99986+++ b/include/linux/smp.h
99987@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
99988 #endif
99989
99990 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
99991+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
99992 #define put_cpu() preempt_enable()
99993+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
99994
99995 /*
99996 * Callback to arch code if there's nosmp or maxcpus=0 on the
99997diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
99998index 083ac38..b23e3e8 100644
99999--- a/include/linux/sock_diag.h
100000+++ b/include/linux/sock_diag.h
100001@@ -11,7 +11,7 @@ struct sock;
100002 struct sock_diag_handler {
100003 __u8 family;
100004 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
100005-};
100006+} __do_const;
100007
100008 int sock_diag_register(const struct sock_diag_handler *h);
100009 void sock_diag_unregister(const struct sock_diag_handler *h);
100010diff --git a/include/linux/sonet.h b/include/linux/sonet.h
100011index 680f9a3..f13aeb0 100644
100012--- a/include/linux/sonet.h
100013+++ b/include/linux/sonet.h
100014@@ -7,7 +7,7 @@
100015 #include <uapi/linux/sonet.h>
100016
100017 struct k_sonet_stats {
100018-#define __HANDLE_ITEM(i) atomic_t i
100019+#define __HANDLE_ITEM(i) atomic_unchecked_t i
100020 __SONET_ITEMS
100021 #undef __HANDLE_ITEM
100022 };
100023diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
100024index 07d8e53..dc934c9 100644
100025--- a/include/linux/sunrpc/addr.h
100026+++ b/include/linux/sunrpc/addr.h
100027@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
100028 {
100029 switch (sap->sa_family) {
100030 case AF_INET:
100031- return ntohs(((struct sockaddr_in *)sap)->sin_port);
100032+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
100033 case AF_INET6:
100034- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
100035+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
100036 }
100037 return 0;
100038 }
100039@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
100040 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
100041 const struct sockaddr *src)
100042 {
100043- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
100044+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
100045 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
100046
100047 dsin->sin_family = ssin->sin_family;
100048@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
100049 if (sa->sa_family != AF_INET6)
100050 return 0;
100051
100052- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
100053+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
100054 }
100055
100056 #endif /* _LINUX_SUNRPC_ADDR_H */
100057diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
100058index 598ba80..d90cba6 100644
100059--- a/include/linux/sunrpc/clnt.h
100060+++ b/include/linux/sunrpc/clnt.h
100061@@ -100,7 +100,7 @@ struct rpc_procinfo {
100062 unsigned int p_timer; /* Which RTT timer to use */
100063 u32 p_statidx; /* Which procedure to account */
100064 const char * p_name; /* name of procedure */
100065-};
100066+} __do_const;
100067
100068 #ifdef __KERNEL__
100069
100070diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
100071index fae6fb9..023fbcd 100644
100072--- a/include/linux/sunrpc/svc.h
100073+++ b/include/linux/sunrpc/svc.h
100074@@ -420,7 +420,7 @@ struct svc_procedure {
100075 unsigned int pc_count; /* call count */
100076 unsigned int pc_cachetype; /* cache info (NFS) */
100077 unsigned int pc_xdrressize; /* maximum size of XDR reply */
100078-};
100079+} __do_const;
100080
100081 /*
100082 * Function prototypes.
100083diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
100084index df8edf8..d140fec 100644
100085--- a/include/linux/sunrpc/svc_rdma.h
100086+++ b/include/linux/sunrpc/svc_rdma.h
100087@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
100088 extern unsigned int svcrdma_max_requests;
100089 extern unsigned int svcrdma_max_req_size;
100090
100091-extern atomic_t rdma_stat_recv;
100092-extern atomic_t rdma_stat_read;
100093-extern atomic_t rdma_stat_write;
100094-extern atomic_t rdma_stat_sq_starve;
100095-extern atomic_t rdma_stat_rq_starve;
100096-extern atomic_t rdma_stat_rq_poll;
100097-extern atomic_t rdma_stat_rq_prod;
100098-extern atomic_t rdma_stat_sq_poll;
100099-extern atomic_t rdma_stat_sq_prod;
100100+extern atomic_unchecked_t rdma_stat_recv;
100101+extern atomic_unchecked_t rdma_stat_read;
100102+extern atomic_unchecked_t rdma_stat_write;
100103+extern atomic_unchecked_t rdma_stat_sq_starve;
100104+extern atomic_unchecked_t rdma_stat_rq_starve;
100105+extern atomic_unchecked_t rdma_stat_rq_poll;
100106+extern atomic_unchecked_t rdma_stat_rq_prod;
100107+extern atomic_unchecked_t rdma_stat_sq_poll;
100108+extern atomic_unchecked_t rdma_stat_sq_prod;
100109
100110 /*
100111 * Contexts are built when an RDMA request is created and are a
100112diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
100113index 8d71d65..f79586e 100644
100114--- a/include/linux/sunrpc/svcauth.h
100115+++ b/include/linux/sunrpc/svcauth.h
100116@@ -120,7 +120,7 @@ struct auth_ops {
100117 int (*release)(struct svc_rqst *rq);
100118 void (*domain_release)(struct auth_domain *);
100119 int (*set_client)(struct svc_rqst *rq);
100120-};
100121+} __do_const;
100122
100123 #define SVC_GARBAGE 1
100124 #define SVC_SYSERR 2
100125diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
100126index e7a018e..49f8b17 100644
100127--- a/include/linux/swiotlb.h
100128+++ b/include/linux/swiotlb.h
100129@@ -60,7 +60,8 @@ extern void
100130
100131 extern void
100132 swiotlb_free_coherent(struct device *hwdev, size_t size,
100133- void *vaddr, dma_addr_t dma_handle);
100134+ void *vaddr, dma_addr_t dma_handle,
100135+ struct dma_attrs *attrs);
100136
100137 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
100138 unsigned long offset, size_t size,
100139diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
100140index 76d1e38..200776e 100644
100141--- a/include/linux/syscalls.h
100142+++ b/include/linux/syscalls.h
100143@@ -102,7 +102,12 @@ union bpf_attr;
100144 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
100145 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
100146 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
100147-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
100148+#define __SC_LONG(t, a) __typeof__( \
100149+ __builtin_choose_expr( \
100150+ sizeof(t) > sizeof(int), \
100151+ (t) 0, \
100152+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
100153+ )) a
100154 #define __SC_CAST(t, a) (t) a
100155 #define __SC_ARGS(t, a) a
100156 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
100157@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
100158 asmlinkage long sys_fsync(unsigned int fd);
100159 asmlinkage long sys_fdatasync(unsigned int fd);
100160 asmlinkage long sys_bdflush(int func, long data);
100161-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
100162- char __user *type, unsigned long flags,
100163+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
100164+ const char __user *type, unsigned long flags,
100165 void __user *data);
100166-asmlinkage long sys_umount(char __user *name, int flags);
100167-asmlinkage long sys_oldumount(char __user *name);
100168+asmlinkage long sys_umount(const char __user *name, int flags);
100169+asmlinkage long sys_oldumount(const char __user *name);
100170 asmlinkage long sys_truncate(const char __user *path, long length);
100171 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
100172 asmlinkage long sys_stat(const char __user *filename,
100173@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
100174 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
100175 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
100176 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
100177- struct sockaddr __user *, int);
100178+ struct sockaddr __user *, int) __intentional_overflow(0);
100179 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
100180 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
100181 unsigned int vlen, unsigned flags);
100182@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
100183
100184 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
100185 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
100186- unsigned nsops);
100187+ long nsops);
100188 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
100189 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
100190- unsigned nsops,
100191+ long nsops,
100192 const struct timespec __user *timeout);
100193 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
100194 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
100195diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
100196index 27b3b0b..e093dd9 100644
100197--- a/include/linux/syscore_ops.h
100198+++ b/include/linux/syscore_ops.h
100199@@ -16,7 +16,7 @@ struct syscore_ops {
100200 int (*suspend)(void);
100201 void (*resume)(void);
100202 void (*shutdown)(void);
100203-};
100204+} __do_const;
100205
100206 extern void register_syscore_ops(struct syscore_ops *ops);
100207 extern void unregister_syscore_ops(struct syscore_ops *ops);
100208diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
100209index fa7bc29..0d96561 100644
100210--- a/include/linux/sysctl.h
100211+++ b/include/linux/sysctl.h
100212@@ -39,10 +39,16 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
100213
100214 extern int proc_dostring(struct ctl_table *, int,
100215 void __user *, size_t *, loff_t *);
100216+extern int proc_dostring_modpriv(struct ctl_table *, int,
100217+ void __user *, size_t *, loff_t *);
100218 extern int proc_dointvec(struct ctl_table *, int,
100219 void __user *, size_t *, loff_t *);
100220+extern int proc_dointvec_secure(struct ctl_table *, int,
100221+ void __user *, size_t *, loff_t *);
100222 extern int proc_dointvec_minmax(struct ctl_table *, int,
100223 void __user *, size_t *, loff_t *);
100224+extern int proc_dointvec_minmax_secure(struct ctl_table *, int,
100225+ void __user *, size_t *, loff_t *);
100226 extern int proc_dointvec_jiffies(struct ctl_table *, int,
100227 void __user *, size_t *, loff_t *);
100228 extern int proc_dointvec_userhz_jiffies(struct ctl_table *, int,
100229@@ -113,7 +119,8 @@ struct ctl_table
100230 struct ctl_table_poll *poll;
100231 void *extra1;
100232 void *extra2;
100233-};
100234+} __do_const __randomize_layout;
100235+typedef struct ctl_table __no_const ctl_table_no_const;
100236
100237 struct ctl_node {
100238 struct rb_node node;
100239diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
100240index 9f65758..487a6f1 100644
100241--- a/include/linux/sysfs.h
100242+++ b/include/linux/sysfs.h
100243@@ -34,7 +34,8 @@ struct attribute {
100244 struct lock_class_key *key;
100245 struct lock_class_key skey;
100246 #endif
100247-};
100248+} __do_const;
100249+typedef struct attribute __no_const attribute_no_const;
100250
100251 /**
100252 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
100253@@ -78,7 +79,8 @@ struct attribute_group {
100254 struct attribute *, int);
100255 struct attribute **attrs;
100256 struct bin_attribute **bin_attrs;
100257-};
100258+} __do_const;
100259+typedef struct attribute_group __no_const attribute_group_no_const;
100260
100261 /**
100262 * Use these macros to make defining attributes easier. See include/linux/device.h
100263@@ -152,7 +154,8 @@ struct bin_attribute {
100264 char *, loff_t, size_t);
100265 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
100266 struct vm_area_struct *vma);
100267-};
100268+} __do_const;
100269+typedef struct bin_attribute __no_const bin_attribute_no_const;
100270
100271 /**
100272 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
100273diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
100274index 387fa7d..3fcde6b 100644
100275--- a/include/linux/sysrq.h
100276+++ b/include/linux/sysrq.h
100277@@ -16,6 +16,7 @@
100278
100279 #include <linux/errno.h>
100280 #include <linux/types.h>
100281+#include <linux/compiler.h>
100282
100283 /* Possible values of bitmask for enabling sysrq functions */
100284 /* 0x0001 is reserved for enable everything */
100285@@ -33,7 +34,7 @@ struct sysrq_key_op {
100286 char *help_msg;
100287 char *action_msg;
100288 int enable_mask;
100289-};
100290+} __do_const;
100291
100292 #ifdef CONFIG_MAGIC_SYSRQ
100293
100294diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
100295index ff307b5..f1a4468 100644
100296--- a/include/linux/thread_info.h
100297+++ b/include/linux/thread_info.h
100298@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
100299 #error "no set_restore_sigmask() provided and default one won't work"
100300 #endif
100301
100302+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
100303+
100304+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
100305+{
100306+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
100307+}
100308+
100309 #endif /* __KERNEL__ */
100310
100311 #endif /* _LINUX_THREAD_INFO_H */
100312diff --git a/include/linux/tty.h b/include/linux/tty.h
100313index d76631f..de91e82 100644
100314--- a/include/linux/tty.h
100315+++ b/include/linux/tty.h
100316@@ -225,7 +225,7 @@ struct tty_port {
100317 const struct tty_port_operations *ops; /* Port operations */
100318 spinlock_t lock; /* Lock protecting tty field */
100319 int blocked_open; /* Waiting to open */
100320- int count; /* Usage count */
100321+ atomic_t count; /* Usage count */
100322 wait_queue_head_t open_wait; /* Open waiters */
100323 wait_queue_head_t close_wait; /* Close waiters */
100324 wait_queue_head_t delta_msr_wait; /* Modem status change */
100325@@ -313,7 +313,7 @@ struct tty_struct {
100326 /* If the tty has a pending do_SAK, queue it here - akpm */
100327 struct work_struct SAK_work;
100328 struct tty_port *port;
100329-};
100330+} __randomize_layout;
100331
100332 /* Each of a tty's open files has private_data pointing to tty_file_private */
100333 struct tty_file_private {
100334@@ -573,7 +573,7 @@ extern int tty_port_open(struct tty_port *port,
100335 struct tty_struct *tty, struct file *filp);
100336 static inline int tty_port_users(struct tty_port *port)
100337 {
100338- return port->count + port->blocked_open;
100339+ return atomic_read(&port->count) + port->blocked_open;
100340 }
100341
100342 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
100343diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
100344index 92e337c..f46757b 100644
100345--- a/include/linux/tty_driver.h
100346+++ b/include/linux/tty_driver.h
100347@@ -291,7 +291,7 @@ struct tty_operations {
100348 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
100349 #endif
100350 const struct file_operations *proc_fops;
100351-};
100352+} __do_const __randomize_layout;
100353
100354 struct tty_driver {
100355 int magic; /* magic number for this structure */
100356@@ -325,7 +325,7 @@ struct tty_driver {
100357
100358 const struct tty_operations *ops;
100359 struct list_head tty_drivers;
100360-};
100361+} __randomize_layout;
100362
100363 extern struct list_head tty_drivers;
100364
100365diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
100366index 00c9d68..bc0188b 100644
100367--- a/include/linux/tty_ldisc.h
100368+++ b/include/linux/tty_ldisc.h
100369@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
100370
100371 struct module *owner;
100372
100373- int refcount;
100374+ atomic_t refcount;
100375 };
100376
100377 struct tty_ldisc {
100378diff --git a/include/linux/types.h b/include/linux/types.h
100379index 8715287..1be77ee 100644
100380--- a/include/linux/types.h
100381+++ b/include/linux/types.h
100382@@ -176,10 +176,26 @@ typedef struct {
100383 int counter;
100384 } atomic_t;
100385
100386+#ifdef CONFIG_PAX_REFCOUNT
100387+typedef struct {
100388+ int counter;
100389+} atomic_unchecked_t;
100390+#else
100391+typedef atomic_t atomic_unchecked_t;
100392+#endif
100393+
100394 #ifdef CONFIG_64BIT
100395 typedef struct {
100396 long counter;
100397 } atomic64_t;
100398+
100399+#ifdef CONFIG_PAX_REFCOUNT
100400+typedef struct {
100401+ long counter;
100402+} atomic64_unchecked_t;
100403+#else
100404+typedef atomic64_t atomic64_unchecked_t;
100405+#endif
100406 #endif
100407
100408 struct list_head {
100409diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
100410index ecd3319..8a36ded 100644
100411--- a/include/linux/uaccess.h
100412+++ b/include/linux/uaccess.h
100413@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
100414 long ret; \
100415 mm_segment_t old_fs = get_fs(); \
100416 \
100417- set_fs(KERNEL_DS); \
100418 pagefault_disable(); \
100419- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
100420- pagefault_enable(); \
100421+ set_fs(KERNEL_DS); \
100422+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
100423 set_fs(old_fs); \
100424+ pagefault_enable(); \
100425 ret; \
100426 })
100427
100428diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
100429index 0383552..a0125dd 100644
100430--- a/include/linux/uidgid.h
100431+++ b/include/linux/uidgid.h
100432@@ -187,4 +187,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
100433
100434 #endif /* CONFIG_USER_NS */
100435
100436+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
100437+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
100438+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
100439+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
100440+
100441 #endif /* _LINUX_UIDGID_H */
100442diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
100443index 32c0e83..671eb35 100644
100444--- a/include/linux/uio_driver.h
100445+++ b/include/linux/uio_driver.h
100446@@ -67,7 +67,7 @@ struct uio_device {
100447 struct module *owner;
100448 struct device *dev;
100449 int minor;
100450- atomic_t event;
100451+ atomic_unchecked_t event;
100452 struct fasync_struct *async_queue;
100453 wait_queue_head_t wait;
100454 struct uio_info *info;
100455diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
100456index 99c1b4d..562e6f3 100644
100457--- a/include/linux/unaligned/access_ok.h
100458+++ b/include/linux/unaligned/access_ok.h
100459@@ -4,34 +4,34 @@
100460 #include <linux/kernel.h>
100461 #include <asm/byteorder.h>
100462
100463-static inline u16 get_unaligned_le16(const void *p)
100464+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
100465 {
100466- return le16_to_cpup((__le16 *)p);
100467+ return le16_to_cpup((const __le16 *)p);
100468 }
100469
100470-static inline u32 get_unaligned_le32(const void *p)
100471+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
100472 {
100473- return le32_to_cpup((__le32 *)p);
100474+ return le32_to_cpup((const __le32 *)p);
100475 }
100476
100477-static inline u64 get_unaligned_le64(const void *p)
100478+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
100479 {
100480- return le64_to_cpup((__le64 *)p);
100481+ return le64_to_cpup((const __le64 *)p);
100482 }
100483
100484-static inline u16 get_unaligned_be16(const void *p)
100485+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
100486 {
100487- return be16_to_cpup((__be16 *)p);
100488+ return be16_to_cpup((const __be16 *)p);
100489 }
100490
100491-static inline u32 get_unaligned_be32(const void *p)
100492+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
100493 {
100494- return be32_to_cpup((__be32 *)p);
100495+ return be32_to_cpup((const __be32 *)p);
100496 }
100497
100498-static inline u64 get_unaligned_be64(const void *p)
100499+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
100500 {
100501- return be64_to_cpup((__be64 *)p);
100502+ return be64_to_cpup((const __be64 *)p);
100503 }
100504
100505 static inline void put_unaligned_le16(u16 val, void *p)
100506diff --git a/include/linux/usb.h b/include/linux/usb.h
100507index 447fe29..9fc875f 100644
100508--- a/include/linux/usb.h
100509+++ b/include/linux/usb.h
100510@@ -592,7 +592,7 @@ struct usb_device {
100511 int maxchild;
100512
100513 u32 quirks;
100514- atomic_t urbnum;
100515+ atomic_unchecked_t urbnum;
100516
100517 unsigned long active_duration;
100518
100519@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
100520
100521 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
100522 __u8 request, __u8 requesttype, __u16 value, __u16 index,
100523- void *data, __u16 size, int timeout);
100524+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
100525 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
100526 void *data, int len, int *actual_length, int timeout);
100527 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
100528diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
100529index f06529c..dfeabd8 100644
100530--- a/include/linux/usb/renesas_usbhs.h
100531+++ b/include/linux/usb/renesas_usbhs.h
100532@@ -39,7 +39,7 @@ enum {
100533 */
100534 struct renesas_usbhs_driver_callback {
100535 int (*notify_hotplug)(struct platform_device *pdev);
100536-};
100537+} __no_const;
100538
100539 /*
100540 * callback functions for platform
100541diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
100542index 8297e5b..0dfae27 100644
100543--- a/include/linux/user_namespace.h
100544+++ b/include/linux/user_namespace.h
100545@@ -39,7 +39,7 @@ struct user_namespace {
100546 struct key *persistent_keyring_register;
100547 struct rw_semaphore persistent_keyring_register_sem;
100548 #endif
100549-};
100550+} __randomize_layout;
100551
100552 extern struct user_namespace init_user_ns;
100553
100554diff --git a/include/linux/utsname.h b/include/linux/utsname.h
100555index 5093f58..c103e58 100644
100556--- a/include/linux/utsname.h
100557+++ b/include/linux/utsname.h
100558@@ -25,7 +25,7 @@ struct uts_namespace {
100559 struct new_utsname name;
100560 struct user_namespace *user_ns;
100561 struct ns_common ns;
100562-};
100563+} __randomize_layout;
100564 extern struct uts_namespace init_uts_ns;
100565
100566 #ifdef CONFIG_UTS_NS
100567diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
100568index 6f8fbcf..4efc177 100644
100569--- a/include/linux/vermagic.h
100570+++ b/include/linux/vermagic.h
100571@@ -25,9 +25,42 @@
100572 #define MODULE_ARCH_VERMAGIC ""
100573 #endif
100574
100575+#ifdef CONFIG_PAX_REFCOUNT
100576+#define MODULE_PAX_REFCOUNT "REFCOUNT "
100577+#else
100578+#define MODULE_PAX_REFCOUNT ""
100579+#endif
100580+
100581+#ifdef CONSTIFY_PLUGIN
100582+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
100583+#else
100584+#define MODULE_CONSTIFY_PLUGIN ""
100585+#endif
100586+
100587+#ifdef STACKLEAK_PLUGIN
100588+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
100589+#else
100590+#define MODULE_STACKLEAK_PLUGIN ""
100591+#endif
100592+
100593+#ifdef RANDSTRUCT_PLUGIN
100594+#include <generated/randomize_layout_hash.h>
100595+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
100596+#else
100597+#define MODULE_RANDSTRUCT_PLUGIN
100598+#endif
100599+
100600+#ifdef CONFIG_GRKERNSEC
100601+#define MODULE_GRSEC "GRSEC "
100602+#else
100603+#define MODULE_GRSEC ""
100604+#endif
100605+
100606 #define VERMAGIC_STRING \
100607 UTS_RELEASE " " \
100608 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
100609 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
100610- MODULE_ARCH_VERMAGIC
100611+ MODULE_ARCH_VERMAGIC \
100612+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
100613+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
100614
100615diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
100616index b483abd..af305ad 100644
100617--- a/include/linux/vga_switcheroo.h
100618+++ b/include/linux/vga_switcheroo.h
100619@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
100620
100621 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
100622
100623-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
100624+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
100625 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
100626-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
100627+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
100628 #else
100629
100630 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
100631@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
100632
100633 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
100634
100635-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100636+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100637 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
100638-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100639+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100640
100641 #endif
100642 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
100643diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
100644index 0ec5983..d5888bb 100644
100645--- a/include/linux/vmalloc.h
100646+++ b/include/linux/vmalloc.h
100647@@ -18,6 +18,14 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
100648 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
100649 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
100650 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
100651+
100652+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100653+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
100654+#endif
100655+
100656+#define VM_USERCOPY 0x00000200 /* allocation intended for copies to userland */
100657+
100658+
100659 /* bits [20..32] reserved for arch specific ioremap internals */
100660
100661 /*
100662@@ -67,6 +75,7 @@ static inline void vmalloc_init(void)
100663 #endif
100664
100665 extern void *vmalloc(unsigned long size);
100666+extern void *vmalloc_usercopy(unsigned long size);
100667 extern void *vzalloc(unsigned long size);
100668 extern void *vmalloc_user(unsigned long size);
100669 extern void *vmalloc_node(unsigned long size, int node);
100670@@ -86,6 +95,10 @@ extern void *vmap(struct page **pages, unsigned int count,
100671 unsigned long flags, pgprot_t prot);
100672 extern void vunmap(const void *addr);
100673
100674+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100675+extern void unmap_process_stacks(struct task_struct *task);
100676+#endif
100677+
100678 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
100679 unsigned long uaddr, void *kaddr,
100680 unsigned long size);
100681@@ -150,7 +163,7 @@ extern void free_vm_area(struct vm_struct *area);
100682
100683 /* for /dev/kmem */
100684 extern long vread(char *buf, char *addr, unsigned long count);
100685-extern long vwrite(char *buf, char *addr, unsigned long count);
100686+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
100687
100688 /*
100689 * Internals. Dont't use..
100690diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
100691index 82e7db7..f8ce3d0 100644
100692--- a/include/linux/vmstat.h
100693+++ b/include/linux/vmstat.h
100694@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
100695 /*
100696 * Zone based page accounting with per cpu differentials.
100697 */
100698-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
100699+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
100700
100701 static inline void zone_page_state_add(long x, struct zone *zone,
100702 enum zone_stat_item item)
100703 {
100704- atomic_long_add(x, &zone->vm_stat[item]);
100705- atomic_long_add(x, &vm_stat[item]);
100706+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
100707+ atomic_long_add_unchecked(x, &vm_stat[item]);
100708 }
100709
100710-static inline unsigned long global_page_state(enum zone_stat_item item)
100711+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
100712 {
100713- long x = atomic_long_read(&vm_stat[item]);
100714+ long x = atomic_long_read_unchecked(&vm_stat[item]);
100715 #ifdef CONFIG_SMP
100716 if (x < 0)
100717 x = 0;
100718@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
100719 return x;
100720 }
100721
100722-static inline unsigned long zone_page_state(struct zone *zone,
100723+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
100724 enum zone_stat_item item)
100725 {
100726- long x = atomic_long_read(&zone->vm_stat[item]);
100727+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
100728 #ifdef CONFIG_SMP
100729 if (x < 0)
100730 x = 0;
100731@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
100732 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
100733 enum zone_stat_item item)
100734 {
100735- long x = atomic_long_read(&zone->vm_stat[item]);
100736+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
100737
100738 #ifdef CONFIG_SMP
100739 int cpu;
100740@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
100741
100742 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
100743 {
100744- atomic_long_inc(&zone->vm_stat[item]);
100745- atomic_long_inc(&vm_stat[item]);
100746+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
100747+ atomic_long_inc_unchecked(&vm_stat[item]);
100748 }
100749
100750 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
100751 {
100752- atomic_long_dec(&zone->vm_stat[item]);
100753- atomic_long_dec(&vm_stat[item]);
100754+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
100755+ atomic_long_dec_unchecked(&vm_stat[item]);
100756 }
100757
100758 static inline void __inc_zone_page_state(struct page *page,
100759diff --git a/include/linux/xattr.h b/include/linux/xattr.h
100760index 91b0a68..0e9adf6 100644
100761--- a/include/linux/xattr.h
100762+++ b/include/linux/xattr.h
100763@@ -28,7 +28,7 @@ struct xattr_handler {
100764 size_t size, int handler_flags);
100765 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
100766 size_t size, int flags, int handler_flags);
100767-};
100768+} __do_const;
100769
100770 struct xattr {
100771 const char *name;
100772@@ -37,6 +37,9 @@ struct xattr {
100773 };
100774
100775 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
100776+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
100777+ssize_t pax_getxattr(struct dentry *, void *, size_t);
100778+#endif
100779 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
100780 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
100781 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
100782diff --git a/include/linux/zlib.h b/include/linux/zlib.h
100783index 92dbbd3..13ab0b3 100644
100784--- a/include/linux/zlib.h
100785+++ b/include/linux/zlib.h
100786@@ -31,6 +31,7 @@
100787 #define _ZLIB_H
100788
100789 #include <linux/zconf.h>
100790+#include <linux/compiler.h>
100791
100792 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
100793 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
100794@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
100795
100796 /* basic functions */
100797
100798-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
100799+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
100800 /*
100801 Returns the number of bytes that needs to be allocated for a per-
100802 stream workspace with the specified parameters. A pointer to this
100803diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
100804index acbcd2f..c3abe84 100644
100805--- a/include/media/v4l2-dev.h
100806+++ b/include/media/v4l2-dev.h
100807@@ -74,7 +74,7 @@ struct v4l2_file_operations {
100808 int (*mmap) (struct file *, struct vm_area_struct *);
100809 int (*open) (struct file *);
100810 int (*release) (struct file *);
100811-};
100812+} __do_const;
100813
100814 /*
100815 * Newer version of video_device, handled by videodev2.c
100816diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
100817index 9c58157..d86ebf5 100644
100818--- a/include/media/v4l2-device.h
100819+++ b/include/media/v4l2-device.h
100820@@ -93,7 +93,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
100821 this function returns 0. If the name ends with a digit (e.g. cx18),
100822 then the name will be set to cx18-0 since cx180 looks really odd. */
100823 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
100824- atomic_t *instance);
100825+ atomic_unchecked_t *instance);
100826
100827 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
100828 Since the parent disappears this ensures that v4l2_dev doesn't have an
100829diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
100830index 5122b5e..598b440 100644
100831--- a/include/net/9p/transport.h
100832+++ b/include/net/9p/transport.h
100833@@ -62,7 +62,7 @@ struct p9_trans_module {
100834 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
100835 int (*zc_request)(struct p9_client *, struct p9_req_t *,
100836 struct iov_iter *, struct iov_iter *, int , int, int);
100837-};
100838+} __do_const;
100839
100840 void v9fs_register_trans(struct p9_trans_module *m);
100841 void v9fs_unregister_trans(struct p9_trans_module *m);
100842diff --git a/include/net/af_unix.h b/include/net/af_unix.h
100843index a175ba4..196eb8242 100644
100844--- a/include/net/af_unix.h
100845+++ b/include/net/af_unix.h
100846@@ -36,7 +36,7 @@ struct unix_skb_parms {
100847 u32 secid; /* Security ID */
100848 #endif
100849 u32 consumed;
100850-};
100851+} __randomize_layout;
100852
100853 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
100854 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
100855diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
100856index 2239a37..a83461f 100644
100857--- a/include/net/bluetooth/l2cap.h
100858+++ b/include/net/bluetooth/l2cap.h
100859@@ -609,7 +609,7 @@ struct l2cap_ops {
100860 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
100861 unsigned long hdr_len,
100862 unsigned long len, int nb);
100863-};
100864+} __do_const;
100865
100866 struct l2cap_conn {
100867 struct hci_conn *hcon;
100868diff --git a/include/net/bonding.h b/include/net/bonding.h
100869index 78ed135..2f53667 100644
100870--- a/include/net/bonding.h
100871+++ b/include/net/bonding.h
100872@@ -658,7 +658,7 @@ extern struct rtnl_link_ops bond_link_ops;
100873
100874 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
100875 {
100876- atomic_long_inc(&dev->tx_dropped);
100877+ atomic_long_inc_unchecked(&dev->tx_dropped);
100878 dev_kfree_skb_any(skb);
100879 }
100880
100881diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
100882index f2ae33d..c457cf0 100644
100883--- a/include/net/caif/cfctrl.h
100884+++ b/include/net/caif/cfctrl.h
100885@@ -52,7 +52,7 @@ struct cfctrl_rsp {
100886 void (*radioset_rsp)(void);
100887 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
100888 struct cflayer *client_layer);
100889-};
100890+} __no_const;
100891
100892 /* Link Setup Parameters for CAIF-Links. */
100893 struct cfctrl_link_param {
100894@@ -101,8 +101,8 @@ struct cfctrl_request_info {
100895 struct cfctrl {
100896 struct cfsrvl serv;
100897 struct cfctrl_rsp res;
100898- atomic_t req_seq_no;
100899- atomic_t rsp_seq_no;
100900+ atomic_unchecked_t req_seq_no;
100901+ atomic_unchecked_t rsp_seq_no;
100902 struct list_head list;
100903 /* Protects from simultaneous access to first_req list */
100904 spinlock_t info_list_lock;
100905diff --git a/include/net/flow.h b/include/net/flow.h
100906index 8109a15..504466d 100644
100907--- a/include/net/flow.h
100908+++ b/include/net/flow.h
100909@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
100910
100911 void flow_cache_flush(struct net *net);
100912 void flow_cache_flush_deferred(struct net *net);
100913-extern atomic_t flow_cache_genid;
100914+extern atomic_unchecked_t flow_cache_genid;
100915
100916 #endif
100917diff --git a/include/net/genetlink.h b/include/net/genetlink.h
100918index a9af1cc..1f3fa7b 100644
100919--- a/include/net/genetlink.h
100920+++ b/include/net/genetlink.h
100921@@ -128,7 +128,7 @@ struct genl_ops {
100922 u8 cmd;
100923 u8 internal_flags;
100924 u8 flags;
100925-};
100926+} __do_const;
100927
100928 int __genl_register_family(struct genl_family *family);
100929
100930diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
100931index 0f712c0..cd762c4 100644
100932--- a/include/net/gro_cells.h
100933+++ b/include/net/gro_cells.h
100934@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
100935 cell = this_cpu_ptr(gcells->cells);
100936
100937 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
100938- atomic_long_inc(&dev->rx_dropped);
100939+ atomic_long_inc_unchecked(&dev->rx_dropped);
100940 kfree_skb(skb);
100941 return;
100942 }
100943diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
100944index 0320bbb..938789c 100644
100945--- a/include/net/inet_connection_sock.h
100946+++ b/include/net/inet_connection_sock.h
100947@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
100948 int (*bind_conflict)(const struct sock *sk,
100949 const struct inet_bind_bucket *tb, bool relax);
100950 void (*mtu_reduced)(struct sock *sk);
100951-};
100952+} __do_const;
100953
100954 /** inet_connection_sock - INET connection oriented sock
100955 *
100956diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
100957index 8d17655..2f3246d 100644
100958--- a/include/net/inet_frag.h
100959+++ b/include/net/inet_frag.h
100960@@ -21,13 +21,11 @@ struct netns_frags {
100961 * @INET_FRAG_FIRST_IN: first fragment has arrived
100962 * @INET_FRAG_LAST_IN: final fragment has arrived
100963 * @INET_FRAG_COMPLETE: frag queue has been processed and is due for destruction
100964- * @INET_FRAG_EVICTED: frag queue is being evicted
100965 */
100966 enum {
100967 INET_FRAG_FIRST_IN = BIT(0),
100968 INET_FRAG_LAST_IN = BIT(1),
100969 INET_FRAG_COMPLETE = BIT(2),
100970- INET_FRAG_EVICTED = BIT(3)
100971 };
100972
100973 /**
100974@@ -45,6 +43,7 @@ enum {
100975 * @flags: fragment queue flags
100976 * @max_size: (ipv4 only) maximum received fragment size with IP_DF set
100977 * @net: namespace that this frag belongs to
100978+ * @list_evictor: list of queues to forcefully evict (e.g. due to low memory)
100979 */
100980 struct inet_frag_queue {
100981 spinlock_t lock;
100982@@ -59,6 +58,7 @@ struct inet_frag_queue {
100983 __u8 flags;
100984 u16 max_size;
100985 struct netns_frags *net;
100986+ struct hlist_node list_evictor;
100987 };
100988
100989 #define INETFRAGS_HASHSZ 1024
100990@@ -125,6 +125,11 @@ static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f
100991 inet_frag_destroy(q, f);
100992 }
100993
100994+static inline bool inet_frag_evicting(struct inet_frag_queue *q)
100995+{
100996+ return !hlist_unhashed(&q->list_evictor);
100997+}
100998+
100999 /* Memory Tracking Functions. */
101000
101001 /* The default percpu_counter batch size is not big enough to scale to
101002@@ -139,14 +144,14 @@ static inline int frag_mem_limit(struct netns_frags *nf)
101003 return percpu_counter_read(&nf->mem);
101004 }
101005
101006-static inline void sub_frag_mem_limit(struct inet_frag_queue *q, int i)
101007+static inline void sub_frag_mem_limit(struct netns_frags *nf, int i)
101008 {
101009- __percpu_counter_add(&q->net->mem, -i, frag_percpu_counter_batch);
101010+ __percpu_counter_add(&nf->mem, -i, frag_percpu_counter_batch);
101011 }
101012
101013-static inline void add_frag_mem_limit(struct inet_frag_queue *q, int i)
101014+static inline void add_frag_mem_limit(struct netns_frags *nf, int i)
101015 {
101016- __percpu_counter_add(&q->net->mem, i, frag_percpu_counter_batch);
101017+ __percpu_counter_add(&nf->mem, i, frag_percpu_counter_batch);
101018 }
101019
101020 static inline void init_frag_mem_limit(struct netns_frags *nf)
101021diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
101022index d5332dd..10a5c3c 100644
101023--- a/include/net/inetpeer.h
101024+++ b/include/net/inetpeer.h
101025@@ -48,7 +48,7 @@ struct inet_peer {
101026 */
101027 union {
101028 struct {
101029- atomic_t rid; /* Frag reception counter */
101030+ atomic_unchecked_t rid; /* Frag reception counter */
101031 };
101032 struct rcu_head rcu;
101033 struct inet_peer *gc_next;
101034diff --git a/include/net/ip.h b/include/net/ip.h
101035index d14af7e..52816c2 100644
101036--- a/include/net/ip.h
101037+++ b/include/net/ip.h
101038@@ -318,7 +318,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
101039 }
101040 }
101041
101042-u32 ip_idents_reserve(u32 hash, int segs);
101043+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
101044 void __ip_select_ident(struct net *net, struct iphdr *iph, int segs);
101045
101046 static inline void ip_select_ident_segs(struct net *net, struct sk_buff *skb,
101047diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
101048index 54271ed..eb7e0e6 100644
101049--- a/include/net/ip_fib.h
101050+++ b/include/net/ip_fib.h
101051@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
101052
101053 #define FIB_RES_SADDR(net, res) \
101054 ((FIB_RES_NH(res).nh_saddr_genid == \
101055- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
101056+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
101057 FIB_RES_NH(res).nh_saddr : \
101058 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
101059 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
101060diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
101061index 4e3731e..a242e28 100644
101062--- a/include/net/ip_vs.h
101063+++ b/include/net/ip_vs.h
101064@@ -551,7 +551,7 @@ struct ip_vs_conn {
101065 struct ip_vs_conn *control; /* Master control connection */
101066 atomic_t n_control; /* Number of controlled ones */
101067 struct ip_vs_dest *dest; /* real server */
101068- atomic_t in_pkts; /* incoming packet counter */
101069+ atomic_unchecked_t in_pkts; /* incoming packet counter */
101070
101071 /* Packet transmitter for different forwarding methods. If it
101072 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
101073@@ -699,7 +699,7 @@ struct ip_vs_dest {
101074 __be16 port; /* port number of the server */
101075 union nf_inet_addr addr; /* IP address of the server */
101076 volatile unsigned int flags; /* dest status flags */
101077- atomic_t conn_flags; /* flags to copy to conn */
101078+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
101079 atomic_t weight; /* server weight */
101080
101081 atomic_t refcnt; /* reference counter */
101082@@ -946,11 +946,11 @@ struct netns_ipvs {
101083 /* ip_vs_lblc */
101084 int sysctl_lblc_expiration;
101085 struct ctl_table_header *lblc_ctl_header;
101086- struct ctl_table *lblc_ctl_table;
101087+ ctl_table_no_const *lblc_ctl_table;
101088 /* ip_vs_lblcr */
101089 int sysctl_lblcr_expiration;
101090 struct ctl_table_header *lblcr_ctl_header;
101091- struct ctl_table *lblcr_ctl_table;
101092+ ctl_table_no_const *lblcr_ctl_table;
101093 /* ip_vs_est */
101094 struct list_head est_list; /* estimator list */
101095 spinlock_t est_lock;
101096diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
101097index 8d4f588..2e37ad2 100644
101098--- a/include/net/irda/ircomm_tty.h
101099+++ b/include/net/irda/ircomm_tty.h
101100@@ -33,6 +33,7 @@
101101 #include <linux/termios.h>
101102 #include <linux/timer.h>
101103 #include <linux/tty.h> /* struct tty_struct */
101104+#include <asm/local.h>
101105
101106 #include <net/irda/irias_object.h>
101107 #include <net/irda/ircomm_core.h>
101108diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
101109index 714cc9a..ea05f3e 100644
101110--- a/include/net/iucv/af_iucv.h
101111+++ b/include/net/iucv/af_iucv.h
101112@@ -149,7 +149,7 @@ struct iucv_skb_cb {
101113 struct iucv_sock_list {
101114 struct hlist_head head;
101115 rwlock_t lock;
101116- atomic_t autobind_name;
101117+ atomic_unchecked_t autobind_name;
101118 };
101119
101120 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
101121diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
101122index f3be818..bf46196 100644
101123--- a/include/net/llc_c_ac.h
101124+++ b/include/net/llc_c_ac.h
101125@@ -87,7 +87,7 @@
101126 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
101127 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
101128
101129-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101130+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101131
101132 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
101133 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
101134diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
101135index 3948cf1..83b28c4 100644
101136--- a/include/net/llc_c_ev.h
101137+++ b/include/net/llc_c_ev.h
101138@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
101139 return (struct llc_conn_state_ev *)skb->cb;
101140 }
101141
101142-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101143-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101144+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101145+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101146
101147 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
101148 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
101149diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
101150index 48f3f89..0e92c50 100644
101151--- a/include/net/llc_c_st.h
101152+++ b/include/net/llc_c_st.h
101153@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
101154 u8 next_state;
101155 const llc_conn_ev_qfyr_t *ev_qualifiers;
101156 const llc_conn_action_t *ev_actions;
101157-};
101158+} __do_const;
101159
101160 struct llc_conn_state {
101161 u8 current_state;
101162diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
101163index a61b98c..aade1eb 100644
101164--- a/include/net/llc_s_ac.h
101165+++ b/include/net/llc_s_ac.h
101166@@ -23,7 +23,7 @@
101167 #define SAP_ACT_TEST_IND 9
101168
101169 /* All action functions must look like this */
101170-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101171+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101172
101173 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
101174 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
101175diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
101176index c4359e2..76dbc4a 100644
101177--- a/include/net/llc_s_st.h
101178+++ b/include/net/llc_s_st.h
101179@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
101180 llc_sap_ev_t ev;
101181 u8 next_state;
101182 const llc_sap_action_t *ev_actions;
101183-};
101184+} __do_const;
101185
101186 struct llc_sap_state {
101187 u8 curr_state;
101188diff --git a/include/net/mac80211.h b/include/net/mac80211.h
101189index fc57f6b..9c1fdb2 100644
101190--- a/include/net/mac80211.h
101191+++ b/include/net/mac80211.h
101192@@ -5104,7 +5104,7 @@ struct rate_control_ops {
101193 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
101194
101195 u32 (*get_expected_throughput)(void *priv_sta);
101196-};
101197+} __do_const;
101198
101199 static inline int rate_supported(struct ieee80211_sta *sta,
101200 enum ieee80211_band band,
101201diff --git a/include/net/neighbour.h b/include/net/neighbour.h
101202index bd33e66..6508d00 100644
101203--- a/include/net/neighbour.h
101204+++ b/include/net/neighbour.h
101205@@ -162,7 +162,7 @@ struct neigh_ops {
101206 void (*error_report)(struct neighbour *, struct sk_buff *);
101207 int (*output)(struct neighbour *, struct sk_buff *);
101208 int (*connected_output)(struct neighbour *, struct sk_buff *);
101209-};
101210+} __do_const;
101211
101212 struct pneigh_entry {
101213 struct pneigh_entry *next;
101214@@ -216,7 +216,7 @@ struct neigh_table {
101215 struct neigh_statistics __percpu *stats;
101216 struct neigh_hash_table __rcu *nht;
101217 struct pneigh_entry **phash_buckets;
101218-};
101219+} __randomize_layout;
101220
101221 enum {
101222 NEIGH_ARP_TABLE = 0,
101223diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
101224index f733656..54053db 100644
101225--- a/include/net/net_namespace.h
101226+++ b/include/net/net_namespace.h
101227@@ -132,8 +132,8 @@ struct net {
101228 struct netns_mpls mpls;
101229 #endif
101230 struct sock *diag_nlsk;
101231- atomic_t fnhe_genid;
101232-};
101233+ atomic_unchecked_t fnhe_genid;
101234+} __randomize_layout;
101235
101236 #include <linux/seq_file_net.h>
101237
101238@@ -268,7 +268,11 @@ static inline struct net *read_pnet(const possible_net_t *pnet)
101239 #define __net_init __init
101240 #define __net_exit __exit_refok
101241 #define __net_initdata __initdata
101242+#ifdef CONSTIFY_PLUGIN
101243 #define __net_initconst __initconst
101244+#else
101245+#define __net_initconst __initdata
101246+#endif
101247 #endif
101248
101249 int peernet2id(struct net *net, struct net *peer);
101250@@ -281,7 +285,7 @@ struct pernet_operations {
101251 void (*exit_batch)(struct list_head *net_exit_list);
101252 int *id;
101253 size_t size;
101254-};
101255+} __do_const;
101256
101257 /*
101258 * Use these carefully. If you implement a network device and it
101259@@ -329,12 +333,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
101260
101261 static inline int rt_genid_ipv4(struct net *net)
101262 {
101263- return atomic_read(&net->ipv4.rt_genid);
101264+ return atomic_read_unchecked(&net->ipv4.rt_genid);
101265 }
101266
101267 static inline void rt_genid_bump_ipv4(struct net *net)
101268 {
101269- atomic_inc(&net->ipv4.rt_genid);
101270+ atomic_inc_unchecked(&net->ipv4.rt_genid);
101271 }
101272
101273 extern void (*__fib6_flush_trees)(struct net *net);
101274@@ -361,12 +365,12 @@ static inline void rt_genid_bump_all(struct net *net)
101275
101276 static inline int fnhe_genid(struct net *net)
101277 {
101278- return atomic_read(&net->fnhe_genid);
101279+ return atomic_read_unchecked(&net->fnhe_genid);
101280 }
101281
101282 static inline void fnhe_genid_bump(struct net *net)
101283 {
101284- atomic_inc(&net->fnhe_genid);
101285+ atomic_inc_unchecked(&net->fnhe_genid);
101286 }
101287
101288 #endif /* __NET_NET_NAMESPACE_H */
101289diff --git a/include/net/netlink.h b/include/net/netlink.h
101290index 2a5dbcc..8243656 100644
101291--- a/include/net/netlink.h
101292+++ b/include/net/netlink.h
101293@@ -521,7 +521,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
101294 {
101295 if (mark) {
101296 WARN_ON((unsigned char *) mark < skb->data);
101297- skb_trim(skb, (unsigned char *) mark - skb->data);
101298+ skb_trim(skb, (const unsigned char *) mark - skb->data);
101299 }
101300 }
101301
101302diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
101303index 29d6a94..235d3d84 100644
101304--- a/include/net/netns/conntrack.h
101305+++ b/include/net/netns/conntrack.h
101306@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
101307 struct nf_proto_net {
101308 #ifdef CONFIG_SYSCTL
101309 struct ctl_table_header *ctl_table_header;
101310- struct ctl_table *ctl_table;
101311+ ctl_table_no_const *ctl_table;
101312 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
101313 struct ctl_table_header *ctl_compat_header;
101314- struct ctl_table *ctl_compat_table;
101315+ ctl_table_no_const *ctl_compat_table;
101316 #endif
101317 #endif
101318 unsigned int users;
101319@@ -60,7 +60,7 @@ struct nf_ip_net {
101320 struct nf_icmp_net icmpv6;
101321 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
101322 struct ctl_table_header *ctl_table_header;
101323- struct ctl_table *ctl_table;
101324+ ctl_table_no_const *ctl_table;
101325 #endif
101326 };
101327
101328diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
101329index 614a49b..0b94386 100644
101330--- a/include/net/netns/ipv4.h
101331+++ b/include/net/netns/ipv4.h
101332@@ -90,7 +90,7 @@ struct netns_ipv4 {
101333
101334 struct ping_group_range ping_group_range;
101335
101336- atomic_t dev_addr_genid;
101337+ atomic_unchecked_t dev_addr_genid;
101338
101339 #ifdef CONFIG_SYSCTL
101340 unsigned long *sysctl_local_reserved_ports;
101341@@ -104,6 +104,6 @@ struct netns_ipv4 {
101342 struct fib_rules_ops *mr_rules_ops;
101343 #endif
101344 #endif
101345- atomic_t rt_genid;
101346+ atomic_unchecked_t rt_genid;
101347 };
101348 #endif
101349diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
101350index d2527bf..2c802d5 100644
101351--- a/include/net/netns/ipv6.h
101352+++ b/include/net/netns/ipv6.h
101353@@ -78,8 +78,8 @@ struct netns_ipv6 {
101354 struct fib_rules_ops *mr6_rules_ops;
101355 #endif
101356 #endif
101357- atomic_t dev_addr_genid;
101358- atomic_t fib6_sernum;
101359+ atomic_unchecked_t dev_addr_genid;
101360+ atomic_unchecked_t fib6_sernum;
101361 };
101362
101363 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
101364diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
101365index 730d82a..045f2c4 100644
101366--- a/include/net/netns/xfrm.h
101367+++ b/include/net/netns/xfrm.h
101368@@ -78,7 +78,7 @@ struct netns_xfrm {
101369
101370 /* flow cache part */
101371 struct flow_cache flow_cache_global;
101372- atomic_t flow_cache_genid;
101373+ atomic_unchecked_t flow_cache_genid;
101374 struct list_head flow_cache_gc_list;
101375 spinlock_t flow_cache_gc_lock;
101376 struct work_struct flow_cache_gc_work;
101377diff --git a/include/net/ping.h b/include/net/ping.h
101378index ac80cb4..ec1ed09 100644
101379--- a/include/net/ping.h
101380+++ b/include/net/ping.h
101381@@ -54,7 +54,7 @@ struct ping_iter_state {
101382
101383 extern struct proto ping_prot;
101384 #if IS_ENABLED(CONFIG_IPV6)
101385-extern struct pingv6_ops pingv6_ops;
101386+extern struct pingv6_ops *pingv6_ops;
101387 #endif
101388
101389 struct pingfakehdr {
101390diff --git a/include/net/protocol.h b/include/net/protocol.h
101391index d6fcc1f..ca277058 100644
101392--- a/include/net/protocol.h
101393+++ b/include/net/protocol.h
101394@@ -49,7 +49,7 @@ struct net_protocol {
101395 * socket lookup?
101396 */
101397 icmp_strict_tag_validation:1;
101398-};
101399+} __do_const;
101400
101401 #if IS_ENABLED(CONFIG_IPV6)
101402 struct inet6_protocol {
101403@@ -62,7 +62,7 @@ struct inet6_protocol {
101404 u8 type, u8 code, int offset,
101405 __be32 info);
101406 unsigned int flags; /* INET6_PROTO_xxx */
101407-};
101408+} __do_const;
101409
101410 #define INET6_PROTO_NOPOLICY 0x1
101411 #define INET6_PROTO_FINAL 0x2
101412diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
101413index 343d922..7959cde 100644
101414--- a/include/net/rtnetlink.h
101415+++ b/include/net/rtnetlink.h
101416@@ -95,7 +95,7 @@ struct rtnl_link_ops {
101417 const struct net_device *dev,
101418 const struct net_device *slave_dev);
101419 struct net *(*get_link_net)(const struct net_device *dev);
101420-};
101421+} __do_const;
101422
101423 int __rtnl_link_register(struct rtnl_link_ops *ops);
101424 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
101425diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
101426index 4a5b9a3..ca27d73 100644
101427--- a/include/net/sctp/checksum.h
101428+++ b/include/net/sctp/checksum.h
101429@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
101430 unsigned int offset)
101431 {
101432 struct sctphdr *sh = sctp_hdr(skb);
101433- __le32 ret, old = sh->checksum;
101434- const struct skb_checksum_ops ops = {
101435+ __le32 ret, old = sh->checksum;
101436+ static const struct skb_checksum_ops ops = {
101437 .update = sctp_csum_update,
101438 .combine = sctp_csum_combine,
101439 };
101440diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
101441index 487ef34..d457f98 100644
101442--- a/include/net/sctp/sm.h
101443+++ b/include/net/sctp/sm.h
101444@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
101445 typedef struct {
101446 sctp_state_fn_t *fn;
101447 const char *name;
101448-} sctp_sm_table_entry_t;
101449+} __do_const sctp_sm_table_entry_t;
101450
101451 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
101452 * currently in use.
101453@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
101454 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
101455
101456 /* Extern declarations for major data structures. */
101457-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101458+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101459
101460
101461 /* Get the size of a DATA chunk payload. */
101462diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
101463index 495c87e..5b327ff 100644
101464--- a/include/net/sctp/structs.h
101465+++ b/include/net/sctp/structs.h
101466@@ -513,7 +513,7 @@ struct sctp_pf {
101467 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
101468 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
101469 struct sctp_af *af;
101470-};
101471+} __do_const;
101472
101473
101474 /* Structure to track chunk fragments that have been acked, but peer
101475diff --git a/include/net/sock.h b/include/net/sock.h
101476index 3a4898e..67456ac 100644
101477--- a/include/net/sock.h
101478+++ b/include/net/sock.h
101479@@ -363,7 +363,7 @@ struct sock {
101480 unsigned int sk_napi_id;
101481 unsigned int sk_ll_usec;
101482 #endif
101483- atomic_t sk_drops;
101484+ atomic_unchecked_t sk_drops;
101485 int sk_rcvbuf;
101486
101487 struct sk_filter __rcu *sk_filter;
101488@@ -1039,7 +1039,7 @@ struct proto {
101489 void (*destroy_cgroup)(struct mem_cgroup *memcg);
101490 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
101491 #endif
101492-};
101493+} __randomize_layout;
101494
101495 /*
101496 * Bits in struct cg_proto.flags
101497@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
101498 page_counter_uncharge(&prot->memory_allocated, amt);
101499 }
101500
101501-static inline long
101502+static inline long __intentional_overflow(-1)
101503 sk_memory_allocated(const struct sock *sk)
101504 {
101505 struct proto *prot = sk->sk_prot;
101506@@ -1777,7 +1777,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
101507 }
101508
101509 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
101510- struct iov_iter *from, char *to,
101511+ struct iov_iter *from, unsigned char *to,
101512 int copy, int offset)
101513 {
101514 if (skb->ip_summed == CHECKSUM_NONE) {
101515@@ -2024,7 +2024,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
101516 }
101517 }
101518
101519-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101520+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101521
101522 /**
101523 * sk_page_frag - return an appropriate page_frag
101524@@ -2099,7 +2099,7 @@ struct sock_skb_cb {
101525 static inline void
101526 sock_skb_set_dropcount(const struct sock *sk, struct sk_buff *skb)
101527 {
101528- SOCK_SKB_CB(skb)->dropcount = atomic_read(&sk->sk_drops);
101529+ SOCK_SKB_CB(skb)->dropcount = atomic_read_unchecked(&sk->sk_drops);
101530 }
101531
101532 void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
101533diff --git a/include/net/tcp.h b/include/net/tcp.h
101534index 6d204f3..d5a8ff0 100644
101535--- a/include/net/tcp.h
101536+++ b/include/net/tcp.h
101537@@ -523,7 +523,7 @@ void tcp_retransmit_timer(struct sock *sk);
101538 void tcp_xmit_retransmit_queue(struct sock *);
101539 void tcp_simple_retransmit(struct sock *);
101540 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
101541-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101542+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101543
101544 void tcp_send_probe0(struct sock *);
101545 void tcp_send_partial(struct sock *);
101546@@ -699,8 +699,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
101547 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
101548 */
101549 struct tcp_skb_cb {
101550- __u32 seq; /* Starting sequence number */
101551- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
101552+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
101553+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
101554 union {
101555 /* Note : tcp_tw_isn is used in input path only
101556 * (isn chosen by tcp_timewait_state_process())
101557@@ -725,7 +725,7 @@ struct tcp_skb_cb {
101558
101559 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
101560 /* 1 byte hole */
101561- __u32 ack_seq; /* Sequence number ACK'd */
101562+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
101563 union {
101564 struct inet_skb_parm h4;
101565 #if IS_ENABLED(CONFIG_IPV6)
101566diff --git a/include/net/xfrm.h b/include/net/xfrm.h
101567index 36ac102..6e8b34b 100644
101568--- a/include/net/xfrm.h
101569+++ b/include/net/xfrm.h
101570@@ -283,7 +283,6 @@ struct xfrm_dst;
101571 struct xfrm_policy_afinfo {
101572 unsigned short family;
101573 struct dst_ops *dst_ops;
101574- void (*garbage_collect)(struct net *net);
101575 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
101576 const xfrm_address_t *saddr,
101577 const xfrm_address_t *daddr);
101578@@ -301,7 +300,7 @@ struct xfrm_policy_afinfo {
101579 struct net_device *dev,
101580 const struct flowi *fl);
101581 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
101582-};
101583+} __do_const;
101584
101585 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
101586 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
101587@@ -340,7 +339,7 @@ struct xfrm_state_afinfo {
101588 int (*transport_finish)(struct sk_buff *skb,
101589 int async);
101590 void (*local_error)(struct sk_buff *skb, u32 mtu);
101591-};
101592+} __do_const;
101593
101594 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
101595 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
101596@@ -435,7 +434,7 @@ struct xfrm_mode {
101597 struct module *owner;
101598 unsigned int encap;
101599 int flags;
101600-};
101601+} __do_const;
101602
101603 /* Flags for xfrm_mode. */
101604 enum {
101605@@ -530,7 +529,7 @@ struct xfrm_policy {
101606 struct timer_list timer;
101607
101608 struct flow_cache_object flo;
101609- atomic_t genid;
101610+ atomic_unchecked_t genid;
101611 u32 priority;
101612 u32 index;
101613 struct xfrm_mark mark;
101614@@ -1163,6 +1162,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
101615 }
101616
101617 void xfrm_garbage_collect(struct net *net);
101618+void xfrm_garbage_collect_deferred(struct net *net);
101619
101620 #else
101621
101622@@ -1201,6 +1201,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
101623 static inline void xfrm_garbage_collect(struct net *net)
101624 {
101625 }
101626+static inline void xfrm_garbage_collect_deferred(struct net *net)
101627+{
101628+}
101629 #endif
101630
101631 static __inline__
101632diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
101633index 1017e0b..227aa4d 100644
101634--- a/include/rdma/iw_cm.h
101635+++ b/include/rdma/iw_cm.h
101636@@ -122,7 +122,7 @@ struct iw_cm_verbs {
101637 int backlog);
101638
101639 int (*destroy_listen)(struct iw_cm_id *cm_id);
101640-};
101641+} __no_const;
101642
101643 /**
101644 * iw_create_cm_id - Create an IW CM identifier.
101645diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
101646index 93d14da..734b3d8 100644
101647--- a/include/scsi/libfc.h
101648+++ b/include/scsi/libfc.h
101649@@ -771,6 +771,7 @@ struct libfc_function_template {
101650 */
101651 void (*disc_stop_final) (struct fc_lport *);
101652 };
101653+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
101654
101655 /**
101656 * struct fc_disc - Discovery context
101657@@ -875,7 +876,7 @@ struct fc_lport {
101658 struct fc_vport *vport;
101659
101660 /* Operational Information */
101661- struct libfc_function_template tt;
101662+ libfc_function_template_no_const tt;
101663 u8 link_up;
101664 u8 qfull;
101665 enum fc_lport_state state;
101666diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
101667index a4c9336..d6f8f34 100644
101668--- a/include/scsi/scsi_device.h
101669+++ b/include/scsi/scsi_device.h
101670@@ -185,9 +185,9 @@ struct scsi_device {
101671 unsigned int max_device_blocked; /* what device_blocked counts down from */
101672 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
101673
101674- atomic_t iorequest_cnt;
101675- atomic_t iodone_cnt;
101676- atomic_t ioerr_cnt;
101677+ atomic_unchecked_t iorequest_cnt;
101678+ atomic_unchecked_t iodone_cnt;
101679+ atomic_unchecked_t ioerr_cnt;
101680
101681 struct device sdev_gendev,
101682 sdev_dev;
101683diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
101684index 891a658..fcd68df 100644
101685--- a/include/scsi/scsi_driver.h
101686+++ b/include/scsi/scsi_driver.h
101687@@ -14,7 +14,7 @@ struct scsi_driver {
101688 void (*rescan)(struct device *);
101689 int (*init_command)(struct scsi_cmnd *);
101690 void (*uninit_command)(struct scsi_cmnd *);
101691- int (*done)(struct scsi_cmnd *);
101692+ unsigned int (*done)(struct scsi_cmnd *);
101693 int (*eh_action)(struct scsi_cmnd *, int);
101694 };
101695 #define to_scsi_driver(drv) \
101696diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
101697index 784bc2c..855a04c 100644
101698--- a/include/scsi/scsi_transport_fc.h
101699+++ b/include/scsi/scsi_transport_fc.h
101700@@ -757,7 +757,8 @@ struct fc_function_template {
101701 unsigned long show_host_system_hostname:1;
101702
101703 unsigned long disable_target_scan:1;
101704-};
101705+} __do_const;
101706+typedef struct fc_function_template __no_const fc_function_template_no_const;
101707
101708
101709 /**
101710diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
101711index fa1d055..3647940 100644
101712--- a/include/sound/compress_driver.h
101713+++ b/include/sound/compress_driver.h
101714@@ -130,7 +130,7 @@ struct snd_compr_ops {
101715 struct snd_compr_caps *caps);
101716 int (*get_codec_caps) (struct snd_compr_stream *stream,
101717 struct snd_compr_codec_caps *codec);
101718-};
101719+} __no_const;
101720
101721 /**
101722 * struct snd_compr: Compressed device
101723diff --git a/include/sound/soc.h b/include/sound/soc.h
101724index f6226914..e919a2e 100644
101725--- a/include/sound/soc.h
101726+++ b/include/sound/soc.h
101727@@ -870,7 +870,7 @@ struct snd_soc_codec_driver {
101728 enum snd_soc_dapm_type, int);
101729
101730 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
101731-};
101732+} __do_const;
101733
101734 /* SoC platform interface */
101735 struct snd_soc_platform_driver {
101736@@ -897,7 +897,7 @@ struct snd_soc_platform_driver {
101737 const struct snd_compr_ops *compr_ops;
101738
101739 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
101740-};
101741+} __do_const;
101742
101743 struct snd_soc_dai_link_component {
101744 const char *name;
101745diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
101746index 480e9f8..2d59c93 100644
101747--- a/include/target/target_core_base.h
101748+++ b/include/target/target_core_base.h
101749@@ -767,7 +767,7 @@ struct se_device {
101750 atomic_long_t write_bytes;
101751 /* Active commands on this virtual SE device */
101752 atomic_t simple_cmds;
101753- atomic_t dev_ordered_id;
101754+ atomic_unchecked_t dev_ordered_id;
101755 atomic_t dev_ordered_sync;
101756 atomic_t dev_qf_count;
101757 int export_count;
101758diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
101759new file mode 100644
101760index 0000000..fb634b7
101761--- /dev/null
101762+++ b/include/trace/events/fs.h
101763@@ -0,0 +1,53 @@
101764+#undef TRACE_SYSTEM
101765+#define TRACE_SYSTEM fs
101766+
101767+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
101768+#define _TRACE_FS_H
101769+
101770+#include <linux/fs.h>
101771+#include <linux/tracepoint.h>
101772+
101773+TRACE_EVENT(do_sys_open,
101774+
101775+ TP_PROTO(const char *filename, int flags, int mode),
101776+
101777+ TP_ARGS(filename, flags, mode),
101778+
101779+ TP_STRUCT__entry(
101780+ __string( filename, filename )
101781+ __field( int, flags )
101782+ __field( int, mode )
101783+ ),
101784+
101785+ TP_fast_assign(
101786+ __assign_str(filename, filename);
101787+ __entry->flags = flags;
101788+ __entry->mode = mode;
101789+ ),
101790+
101791+ TP_printk("\"%s\" %x %o",
101792+ __get_str(filename), __entry->flags, __entry->mode)
101793+);
101794+
101795+TRACE_EVENT(open_exec,
101796+
101797+ TP_PROTO(const char *filename),
101798+
101799+ TP_ARGS(filename),
101800+
101801+ TP_STRUCT__entry(
101802+ __string( filename, filename )
101803+ ),
101804+
101805+ TP_fast_assign(
101806+ __assign_str(filename, filename);
101807+ ),
101808+
101809+ TP_printk("\"%s\"",
101810+ __get_str(filename))
101811+);
101812+
101813+#endif /* _TRACE_FS_H */
101814+
101815+/* This part must be outside protection */
101816+#include <trace/define_trace.h>
101817diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
101818index ff8f6c0..6b6bae3 100644
101819--- a/include/trace/events/irq.h
101820+++ b/include/trace/events/irq.h
101821@@ -51,7 +51,7 @@ SOFTIRQ_NAME_LIST
101822 */
101823 TRACE_EVENT(irq_handler_entry,
101824
101825- TP_PROTO(int irq, struct irqaction *action),
101826+ TP_PROTO(int irq, const struct irqaction *action),
101827
101828 TP_ARGS(irq, action),
101829
101830@@ -81,7 +81,7 @@ TRACE_EVENT(irq_handler_entry,
101831 */
101832 TRACE_EVENT(irq_handler_exit,
101833
101834- TP_PROTO(int irq, struct irqaction *action, int ret),
101835+ TP_PROTO(int irq, const struct irqaction *action, int ret),
101836
101837 TP_ARGS(irq, action, ret),
101838
101839diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
101840index a7e41fb..c115957 100644
101841--- a/include/uapi/drm/i915_drm.h
101842+++ b/include/uapi/drm/i915_drm.h
101843@@ -350,6 +350,7 @@ typedef struct drm_i915_irq_wait {
101844 #define I915_PARAM_REVISION 32
101845 #define I915_PARAM_SUBSLICE_TOTAL 33
101846 #define I915_PARAM_EU_TOTAL 34
101847+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
101848
101849 typedef struct drm_i915_getparam {
101850 int param;
101851diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
101852index 7caf44c..23c6f27 100644
101853--- a/include/uapi/linux/a.out.h
101854+++ b/include/uapi/linux/a.out.h
101855@@ -39,6 +39,14 @@ enum machine_type {
101856 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
101857 };
101858
101859+/* Constants for the N_FLAGS field */
101860+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
101861+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
101862+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
101863+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
101864+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
101865+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
101866+
101867 #if !defined (N_MAGIC)
101868 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
101869 #endif
101870diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
101871index 22b6ad3..aeba37e 100644
101872--- a/include/uapi/linux/bcache.h
101873+++ b/include/uapi/linux/bcache.h
101874@@ -5,6 +5,7 @@
101875 * Bcache on disk data structures
101876 */
101877
101878+#include <linux/compiler.h>
101879 #include <asm/types.h>
101880
101881 #define BITMASK(name, type, field, offset, size) \
101882@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
101883 /* Btree keys - all units are in sectors */
101884
101885 struct bkey {
101886- __u64 high;
101887- __u64 low;
101888+ __u64 high __intentional_overflow(-1);
101889+ __u64 low __intentional_overflow(-1);
101890 __u64 ptr[];
101891 };
101892
101893diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
101894index d876736..ccce5c0 100644
101895--- a/include/uapi/linux/byteorder/little_endian.h
101896+++ b/include/uapi/linux/byteorder/little_endian.h
101897@@ -42,51 +42,51 @@
101898
101899 static inline __le64 __cpu_to_le64p(const __u64 *p)
101900 {
101901- return (__force __le64)*p;
101902+ return (__force const __le64)*p;
101903 }
101904-static inline __u64 __le64_to_cpup(const __le64 *p)
101905+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
101906 {
101907- return (__force __u64)*p;
101908+ return (__force const __u64)*p;
101909 }
101910 static inline __le32 __cpu_to_le32p(const __u32 *p)
101911 {
101912- return (__force __le32)*p;
101913+ return (__force const __le32)*p;
101914 }
101915 static inline __u32 __le32_to_cpup(const __le32 *p)
101916 {
101917- return (__force __u32)*p;
101918+ return (__force const __u32)*p;
101919 }
101920 static inline __le16 __cpu_to_le16p(const __u16 *p)
101921 {
101922- return (__force __le16)*p;
101923+ return (__force const __le16)*p;
101924 }
101925 static inline __u16 __le16_to_cpup(const __le16 *p)
101926 {
101927- return (__force __u16)*p;
101928+ return (__force const __u16)*p;
101929 }
101930 static inline __be64 __cpu_to_be64p(const __u64 *p)
101931 {
101932- return (__force __be64)__swab64p(p);
101933+ return (__force const __be64)__swab64p(p);
101934 }
101935 static inline __u64 __be64_to_cpup(const __be64 *p)
101936 {
101937- return __swab64p((__u64 *)p);
101938+ return __swab64p((const __u64 *)p);
101939 }
101940 static inline __be32 __cpu_to_be32p(const __u32 *p)
101941 {
101942- return (__force __be32)__swab32p(p);
101943+ return (__force const __be32)__swab32p(p);
101944 }
101945-static inline __u32 __be32_to_cpup(const __be32 *p)
101946+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
101947 {
101948- return __swab32p((__u32 *)p);
101949+ return __swab32p((const __u32 *)p);
101950 }
101951 static inline __be16 __cpu_to_be16p(const __u16 *p)
101952 {
101953- return (__force __be16)__swab16p(p);
101954+ return (__force const __be16)__swab16p(p);
101955 }
101956 static inline __u16 __be16_to_cpup(const __be16 *p)
101957 {
101958- return __swab16p((__u16 *)p);
101959+ return __swab16p((const __u16 *)p);
101960 }
101961 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
101962 #define __le64_to_cpus(x) do { (void)(x); } while (0)
101963diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
101964index 71e1d0e..6cc9caf 100644
101965--- a/include/uapi/linux/elf.h
101966+++ b/include/uapi/linux/elf.h
101967@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
101968 #define PT_GNU_EH_FRAME 0x6474e550
101969
101970 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
101971+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
101972+
101973+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
101974+
101975+/* Constants for the e_flags field */
101976+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
101977+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
101978+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
101979+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
101980+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
101981+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
101982
101983 /*
101984 * Extended Numbering
101985@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
101986 #define DT_DEBUG 21
101987 #define DT_TEXTREL 22
101988 #define DT_JMPREL 23
101989+#define DT_FLAGS 30
101990+ #define DF_TEXTREL 0x00000004
101991 #define DT_ENCODING 32
101992 #define OLD_DT_LOOS 0x60000000
101993 #define DT_LOOS 0x6000000d
101994@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
101995 #define PF_W 0x2
101996 #define PF_X 0x1
101997
101998+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
101999+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
102000+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
102001+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
102002+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
102003+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
102004+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
102005+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
102006+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
102007+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
102008+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
102009+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
102010+
102011 typedef struct elf32_phdr{
102012 Elf32_Word p_type;
102013 Elf32_Off p_offset;
102014@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
102015 #define EI_OSABI 7
102016 #define EI_PAD 8
102017
102018+#define EI_PAX 14
102019+
102020 #define ELFMAG0 0x7f /* EI_MAG */
102021 #define ELFMAG1 'E'
102022 #define ELFMAG2 'L'
102023diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
102024index aa169c4..6a2771d 100644
102025--- a/include/uapi/linux/personality.h
102026+++ b/include/uapi/linux/personality.h
102027@@ -30,6 +30,7 @@ enum {
102028 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
102029 ADDR_NO_RANDOMIZE | \
102030 ADDR_COMPAT_LAYOUT | \
102031+ ADDR_LIMIT_3GB | \
102032 MMAP_PAGE_ZERO)
102033
102034 /*
102035diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
102036index 7530e74..e714828 100644
102037--- a/include/uapi/linux/screen_info.h
102038+++ b/include/uapi/linux/screen_info.h
102039@@ -43,7 +43,8 @@ struct screen_info {
102040 __u16 pages; /* 0x32 */
102041 __u16 vesa_attributes; /* 0x34 */
102042 __u32 capabilities; /* 0x36 */
102043- __u8 _reserved[6]; /* 0x3a */
102044+ __u16 vesapm_size; /* 0x3a */
102045+ __u8 _reserved[4]; /* 0x3c */
102046 } __attribute__((packed));
102047
102048 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
102049diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
102050index 0e011eb..82681b1 100644
102051--- a/include/uapi/linux/swab.h
102052+++ b/include/uapi/linux/swab.h
102053@@ -43,7 +43,7 @@
102054 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
102055 */
102056
102057-static inline __attribute_const__ __u16 __fswab16(__u16 val)
102058+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
102059 {
102060 #ifdef __HAVE_BUILTIN_BSWAP16__
102061 return __builtin_bswap16(val);
102062@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
102063 #endif
102064 }
102065
102066-static inline __attribute_const__ __u32 __fswab32(__u32 val)
102067+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
102068 {
102069 #ifdef __HAVE_BUILTIN_BSWAP32__
102070 return __builtin_bswap32(val);
102071@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
102072 #endif
102073 }
102074
102075-static inline __attribute_const__ __u64 __fswab64(__u64 val)
102076+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
102077 {
102078 #ifdef __HAVE_BUILTIN_BSWAP64__
102079 return __builtin_bswap64(val);
102080diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
102081index 1590c49..5eab462 100644
102082--- a/include/uapi/linux/xattr.h
102083+++ b/include/uapi/linux/xattr.h
102084@@ -73,5 +73,9 @@
102085 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
102086 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
102087
102088+/* User namespace */
102089+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
102090+#define XATTR_PAX_FLAGS_SUFFIX "flags"
102091+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
102092
102093 #endif /* _UAPI_LINUX_XATTR_H */
102094diff --git a/include/video/udlfb.h b/include/video/udlfb.h
102095index f9466fa..f4e2b81 100644
102096--- a/include/video/udlfb.h
102097+++ b/include/video/udlfb.h
102098@@ -53,10 +53,10 @@ struct dlfb_data {
102099 u32 pseudo_palette[256];
102100 int blank_mode; /*one of FB_BLANK_ */
102101 /* blit-only rendering path metrics, exposed through sysfs */
102102- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102103- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
102104- atomic_t bytes_sent; /* to usb, after compression including overhead */
102105- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
102106+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102107+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
102108+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
102109+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
102110 };
102111
102112 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
102113diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
102114index 30f5362..8ed8ac9 100644
102115--- a/include/video/uvesafb.h
102116+++ b/include/video/uvesafb.h
102117@@ -122,6 +122,7 @@ struct uvesafb_par {
102118 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
102119 u8 pmi_setpal; /* PMI for palette changes */
102120 u16 *pmi_base; /* protected mode interface location */
102121+ u8 *pmi_code; /* protected mode code location */
102122 void *pmi_start;
102123 void *pmi_pal;
102124 u8 *vbe_state_orig; /*
102125diff --git a/init/Kconfig b/init/Kconfig
102126index dc24dec..b77638f 100644
102127--- a/init/Kconfig
102128+++ b/init/Kconfig
102129@@ -1145,6 +1145,7 @@ endif # CGROUPS
102130
102131 config CHECKPOINT_RESTORE
102132 bool "Checkpoint/restore support" if EXPERT
102133+ depends on !GRKERNSEC
102134 default n
102135 help
102136 Enables additional kernel features in a sake of checkpoint/restore.
102137@@ -1670,7 +1671,7 @@ config SLUB_DEBUG
102138
102139 config COMPAT_BRK
102140 bool "Disable heap randomization"
102141- default y
102142+ default n
102143 help
102144 Randomizing heap placement makes heap exploits harder, but it
102145 also breaks ancient binaries (including anything libc5 based).
102146@@ -2001,7 +2002,7 @@ config INIT_ALL_POSSIBLE
102147 config STOP_MACHINE
102148 bool
102149 default y
102150- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
102151+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
102152 help
102153 Need stop_machine() primitive.
102154
102155diff --git a/init/Makefile b/init/Makefile
102156index 7bc47ee..6da2dc7 100644
102157--- a/init/Makefile
102158+++ b/init/Makefile
102159@@ -2,6 +2,9 @@
102160 # Makefile for the linux kernel.
102161 #
102162
102163+ccflags-y := $(GCC_PLUGINS_CFLAGS)
102164+asflags-y := $(GCC_PLUGINS_AFLAGS)
102165+
102166 obj-y := main.o version.o mounts.o
102167 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
102168 obj-y += noinitramfs.o
102169diff --git a/init/do_mounts.c b/init/do_mounts.c
102170index a95bbdb..82c48fd 100644
102171--- a/init/do_mounts.c
102172+++ b/init/do_mounts.c
102173@@ -363,11 +363,11 @@ static void __init get_fs_names(char *page)
102174 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
102175 {
102176 struct super_block *s;
102177- int err = sys_mount(name, "/root", fs, flags, data);
102178+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
102179 if (err)
102180 return err;
102181
102182- sys_chdir("/root");
102183+ sys_chdir((const char __force_user *)"/root");
102184 s = current->fs->pwd.dentry->d_sb;
102185 ROOT_DEV = s->s_dev;
102186 printk(KERN_INFO
102187@@ -490,18 +490,18 @@ void __init change_floppy(char *fmt, ...)
102188 va_start(args, fmt);
102189 vsprintf(buf, fmt, args);
102190 va_end(args);
102191- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
102192+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
102193 if (fd >= 0) {
102194 sys_ioctl(fd, FDEJECT, 0);
102195 sys_close(fd);
102196 }
102197 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
102198- fd = sys_open("/dev/console", O_RDWR, 0);
102199+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
102200 if (fd >= 0) {
102201 sys_ioctl(fd, TCGETS, (long)&termios);
102202 termios.c_lflag &= ~ICANON;
102203 sys_ioctl(fd, TCSETSF, (long)&termios);
102204- sys_read(fd, &c, 1);
102205+ sys_read(fd, (char __user *)&c, 1);
102206 termios.c_lflag |= ICANON;
102207 sys_ioctl(fd, TCSETSF, (long)&termios);
102208 sys_close(fd);
102209@@ -595,8 +595,8 @@ void __init prepare_namespace(void)
102210 mount_root();
102211 out:
102212 devtmpfs_mount("dev");
102213- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102214- sys_chroot(".");
102215+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102216+ sys_chroot((const char __force_user *)".");
102217 }
102218
102219 static bool is_tmpfs;
102220diff --git a/init/do_mounts.h b/init/do_mounts.h
102221index f5b978a..69dbfe8 100644
102222--- a/init/do_mounts.h
102223+++ b/init/do_mounts.h
102224@@ -15,15 +15,15 @@ extern int root_mountflags;
102225
102226 static inline int create_dev(char *name, dev_t dev)
102227 {
102228- sys_unlink(name);
102229- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
102230+ sys_unlink((char __force_user *)name);
102231+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
102232 }
102233
102234 #if BITS_PER_LONG == 32
102235 static inline u32 bstat(char *name)
102236 {
102237 struct stat64 stat;
102238- if (sys_stat64(name, &stat) != 0)
102239+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
102240 return 0;
102241 if (!S_ISBLK(stat.st_mode))
102242 return 0;
102243@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
102244 static inline u32 bstat(char *name)
102245 {
102246 struct stat stat;
102247- if (sys_newstat(name, &stat) != 0)
102248+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
102249 return 0;
102250 if (!S_ISBLK(stat.st_mode))
102251 return 0;
102252diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
102253index 3e0878e..8a9d7a0 100644
102254--- a/init/do_mounts_initrd.c
102255+++ b/init/do_mounts_initrd.c
102256@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
102257 {
102258 sys_unshare(CLONE_FS | CLONE_FILES);
102259 /* stdin/stdout/stderr for /linuxrc */
102260- sys_open("/dev/console", O_RDWR, 0);
102261+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
102262 sys_dup(0);
102263 sys_dup(0);
102264 /* move initrd over / and chdir/chroot in initrd root */
102265- sys_chdir("/root");
102266- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102267- sys_chroot(".");
102268+ sys_chdir((const char __force_user *)"/root");
102269+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102270+ sys_chroot((const char __force_user *)".");
102271 sys_setsid();
102272 return 0;
102273 }
102274@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
102275 create_dev("/dev/root.old", Root_RAM0);
102276 /* mount initrd on rootfs' /root */
102277 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
102278- sys_mkdir("/old", 0700);
102279- sys_chdir("/old");
102280+ sys_mkdir((const char __force_user *)"/old", 0700);
102281+ sys_chdir((const char __force_user *)"/old");
102282
102283 /* try loading default modules from initrd */
102284 load_default_modules();
102285@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
102286 current->flags &= ~PF_FREEZER_SKIP;
102287
102288 /* move initrd to rootfs' /old */
102289- sys_mount("..", ".", NULL, MS_MOVE, NULL);
102290+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
102291 /* switch root and cwd back to / of rootfs */
102292- sys_chroot("..");
102293+ sys_chroot((const char __force_user *)"..");
102294
102295 if (new_decode_dev(real_root_dev) == Root_RAM0) {
102296- sys_chdir("/old");
102297+ sys_chdir((const char __force_user *)"/old");
102298 return;
102299 }
102300
102301- sys_chdir("/");
102302+ sys_chdir((const char __force_user *)"/");
102303 ROOT_DEV = new_decode_dev(real_root_dev);
102304 mount_root();
102305
102306 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
102307- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
102308+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
102309 if (!error)
102310 printk("okay\n");
102311 else {
102312- int fd = sys_open("/dev/root.old", O_RDWR, 0);
102313+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
102314 if (error == -ENOENT)
102315 printk("/initrd does not exist. Ignored.\n");
102316 else
102317 printk("failed\n");
102318 printk(KERN_NOTICE "Unmounting old root\n");
102319- sys_umount("/old", MNT_DETACH);
102320+ sys_umount((char __force_user *)"/old", MNT_DETACH);
102321 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
102322 if (fd < 0) {
102323 error = fd;
102324@@ -127,11 +127,11 @@ int __init initrd_load(void)
102325 * mounted in the normal path.
102326 */
102327 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
102328- sys_unlink("/initrd.image");
102329+ sys_unlink((const char __force_user *)"/initrd.image");
102330 handle_initrd();
102331 return 1;
102332 }
102333 }
102334- sys_unlink("/initrd.image");
102335+ sys_unlink((const char __force_user *)"/initrd.image");
102336 return 0;
102337 }
102338diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
102339index 8cb6db5..d729f50 100644
102340--- a/init/do_mounts_md.c
102341+++ b/init/do_mounts_md.c
102342@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
102343 partitioned ? "_d" : "", minor,
102344 md_setup_args[ent].device_names);
102345
102346- fd = sys_open(name, 0, 0);
102347+ fd = sys_open((char __force_user *)name, 0, 0);
102348 if (fd < 0) {
102349 printk(KERN_ERR "md: open failed - cannot start "
102350 "array %s\n", name);
102351@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
102352 * array without it
102353 */
102354 sys_close(fd);
102355- fd = sys_open(name, 0, 0);
102356+ fd = sys_open((char __force_user *)name, 0, 0);
102357 sys_ioctl(fd, BLKRRPART, 0);
102358 }
102359 sys_close(fd);
102360@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
102361
102362 wait_for_device_probe();
102363
102364- fd = sys_open("/dev/md0", 0, 0);
102365+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
102366 if (fd >= 0) {
102367 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
102368 sys_close(fd);
102369diff --git a/init/init_task.c b/init/init_task.c
102370index ba0a7f36..2bcf1d5 100644
102371--- a/init/init_task.c
102372+++ b/init/init_task.c
102373@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
102374 * Initial thread structure. Alignment of this is handled by a special
102375 * linker map entry.
102376 */
102377+#ifdef CONFIG_X86
102378+union thread_union init_thread_union __init_task_data;
102379+#else
102380 union thread_union init_thread_union __init_task_data =
102381 { INIT_THREAD_INFO(init_task) };
102382+#endif
102383diff --git a/init/initramfs.c b/init/initramfs.c
102384index ad1bd77..dca2c1b 100644
102385--- a/init/initramfs.c
102386+++ b/init/initramfs.c
102387@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
102388
102389 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
102390 while (count) {
102391- ssize_t rv = sys_write(fd, p, count);
102392+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
102393
102394 if (rv < 0) {
102395 if (rv == -EINTR || rv == -EAGAIN)
102396@@ -107,7 +107,7 @@ static void __init free_hash(void)
102397 }
102398 }
102399
102400-static long __init do_utime(char *filename, time_t mtime)
102401+static long __init do_utime(char __force_user *filename, time_t mtime)
102402 {
102403 struct timespec t[2];
102404
102405@@ -142,7 +142,7 @@ static void __init dir_utime(void)
102406 struct dir_entry *de, *tmp;
102407 list_for_each_entry_safe(de, tmp, &dir_list, list) {
102408 list_del(&de->list);
102409- do_utime(de->name, de->mtime);
102410+ do_utime((char __force_user *)de->name, de->mtime);
102411 kfree(de->name);
102412 kfree(de);
102413 }
102414@@ -304,7 +304,7 @@ static int __init maybe_link(void)
102415 if (nlink >= 2) {
102416 char *old = find_link(major, minor, ino, mode, collected);
102417 if (old)
102418- return (sys_link(old, collected) < 0) ? -1 : 1;
102419+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
102420 }
102421 return 0;
102422 }
102423@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
102424 {
102425 struct stat st;
102426
102427- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
102428+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
102429 if (S_ISDIR(st.st_mode))
102430- sys_rmdir(path);
102431+ sys_rmdir((char __force_user *)path);
102432 else
102433- sys_unlink(path);
102434+ sys_unlink((char __force_user *)path);
102435 }
102436 }
102437
102438@@ -338,7 +338,7 @@ static int __init do_name(void)
102439 int openflags = O_WRONLY|O_CREAT;
102440 if (ml != 1)
102441 openflags |= O_TRUNC;
102442- wfd = sys_open(collected, openflags, mode);
102443+ wfd = sys_open((char __force_user *)collected, openflags, mode);
102444
102445 if (wfd >= 0) {
102446 sys_fchown(wfd, uid, gid);
102447@@ -350,17 +350,17 @@ static int __init do_name(void)
102448 }
102449 }
102450 } else if (S_ISDIR(mode)) {
102451- sys_mkdir(collected, mode);
102452- sys_chown(collected, uid, gid);
102453- sys_chmod(collected, mode);
102454+ sys_mkdir((char __force_user *)collected, mode);
102455+ sys_chown((char __force_user *)collected, uid, gid);
102456+ sys_chmod((char __force_user *)collected, mode);
102457 dir_add(collected, mtime);
102458 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
102459 S_ISFIFO(mode) || S_ISSOCK(mode)) {
102460 if (maybe_link() == 0) {
102461- sys_mknod(collected, mode, rdev);
102462- sys_chown(collected, uid, gid);
102463- sys_chmod(collected, mode);
102464- do_utime(collected, mtime);
102465+ sys_mknod((char __force_user *)collected, mode, rdev);
102466+ sys_chown((char __force_user *)collected, uid, gid);
102467+ sys_chmod((char __force_user *)collected, mode);
102468+ do_utime((char __force_user *)collected, mtime);
102469 }
102470 }
102471 return 0;
102472@@ -372,7 +372,7 @@ static int __init do_copy(void)
102473 if (xwrite(wfd, victim, body_len) != body_len)
102474 error("write error");
102475 sys_close(wfd);
102476- do_utime(vcollected, mtime);
102477+ do_utime((char __force_user *)vcollected, mtime);
102478 kfree(vcollected);
102479 eat(body_len);
102480 state = SkipIt;
102481@@ -390,9 +390,9 @@ static int __init do_symlink(void)
102482 {
102483 collected[N_ALIGN(name_len) + body_len] = '\0';
102484 clean_path(collected, 0);
102485- sys_symlink(collected + N_ALIGN(name_len), collected);
102486- sys_lchown(collected, uid, gid);
102487- do_utime(collected, mtime);
102488+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
102489+ sys_lchown((char __force_user *)collected, uid, gid);
102490+ do_utime((char __force_user *)collected, mtime);
102491 state = SkipIt;
102492 next_state = Reset;
102493 return 0;
102494diff --git a/init/main.c b/init/main.c
102495index 2a89545..58711ee 100644
102496--- a/init/main.c
102497+++ b/init/main.c
102498@@ -97,6 +97,8 @@ extern void radix_tree_init(void);
102499 static inline void mark_rodata_ro(void) { }
102500 #endif
102501
102502+extern void grsecurity_init(void);
102503+
102504 /*
102505 * Debug helper: via this flag we know that we are in 'early bootup code'
102506 * where only the boot processor is running with IRQ disabled. This means
102507@@ -158,6 +160,37 @@ static int __init set_reset_devices(char *str)
102508
102509 __setup("reset_devices", set_reset_devices);
102510
102511+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
102512+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
102513+static int __init setup_grsec_proc_gid(char *str)
102514+{
102515+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
102516+ return 1;
102517+}
102518+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
102519+#endif
102520+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
102521+int grsec_enable_sysfs_restrict = 1;
102522+static int __init setup_grsec_sysfs_restrict(char *str)
102523+{
102524+ if (!simple_strtol(str, NULL, 0))
102525+ grsec_enable_sysfs_restrict = 0;
102526+ return 1;
102527+}
102528+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
102529+#endif
102530+
102531+#ifdef CONFIG_PAX_SOFTMODE
102532+int pax_softmode;
102533+
102534+static int __init setup_pax_softmode(char *str)
102535+{
102536+ get_option(&str, &pax_softmode);
102537+ return 1;
102538+}
102539+__setup("pax_softmode=", setup_pax_softmode);
102540+#endif
102541+
102542 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
102543 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
102544 static const char *panic_later, *panic_param;
102545@@ -726,7 +759,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
102546 struct blacklist_entry *entry;
102547 char *fn_name;
102548
102549- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
102550+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
102551 if (!fn_name)
102552 return false;
102553
102554@@ -778,7 +811,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
102555 {
102556 int count = preempt_count();
102557 int ret;
102558- char msgbuf[64];
102559+ const char *msg1 = "", *msg2 = "";
102560
102561 if (initcall_blacklisted(fn))
102562 return -EPERM;
102563@@ -788,18 +821,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
102564 else
102565 ret = fn();
102566
102567- msgbuf[0] = 0;
102568-
102569 if (preempt_count() != count) {
102570- sprintf(msgbuf, "preemption imbalance ");
102571+ msg1 = " preemption imbalance";
102572 preempt_count_set(count);
102573 }
102574 if (irqs_disabled()) {
102575- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
102576+ msg2 = " disabled interrupts";
102577 local_irq_enable();
102578 }
102579- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
102580+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
102581
102582+ add_latent_entropy();
102583 return ret;
102584 }
102585
102586@@ -905,8 +937,8 @@ static int run_init_process(const char *init_filename)
102587 {
102588 argv_init[0] = init_filename;
102589 return do_execve(getname_kernel(init_filename),
102590- (const char __user *const __user *)argv_init,
102591- (const char __user *const __user *)envp_init);
102592+ (const char __user *const __force_user *)argv_init,
102593+ (const char __user *const __force_user *)envp_init);
102594 }
102595
102596 static int try_to_run_init_process(const char *init_filename)
102597@@ -923,6 +955,10 @@ static int try_to_run_init_process(const char *init_filename)
102598 return ret;
102599 }
102600
102601+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102602+extern int gr_init_ran;
102603+#endif
102604+
102605 static noinline void __init kernel_init_freeable(void);
102606
102607 static int __ref kernel_init(void *unused)
102608@@ -947,6 +983,11 @@ static int __ref kernel_init(void *unused)
102609 ramdisk_execute_command, ret);
102610 }
102611
102612+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102613+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
102614+ gr_init_ran = 1;
102615+#endif
102616+
102617 /*
102618 * We try each of these until one succeeds.
102619 *
102620@@ -1002,7 +1043,7 @@ static noinline void __init kernel_init_freeable(void)
102621 do_basic_setup();
102622
102623 /* Open the /dev/console on the rootfs, this should never fail */
102624- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
102625+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
102626 pr_err("Warning: unable to open an initial console.\n");
102627
102628 (void) sys_dup(0);
102629@@ -1015,11 +1056,13 @@ static noinline void __init kernel_init_freeable(void)
102630 if (!ramdisk_execute_command)
102631 ramdisk_execute_command = "/init";
102632
102633- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
102634+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
102635 ramdisk_execute_command = NULL;
102636 prepare_namespace();
102637 }
102638
102639+ grsecurity_init();
102640+
102641 /*
102642 * Ok, we have completed the initial bootup, and
102643 * we're essentially up and running. Get rid of the
102644diff --git a/ipc/compat.c b/ipc/compat.c
102645index 9b3c85f..5266b0f 100644
102646--- a/ipc/compat.c
102647+++ b/ipc/compat.c
102648@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
102649 COMPAT_SHMLBA);
102650 if (err < 0)
102651 return err;
102652- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
102653+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
102654 }
102655 case SHMDT:
102656 return sys_shmdt(compat_ptr(ptr));
102657@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
102658 }
102659
102660 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
102661- unsigned, nsops,
102662+ compat_long_t, nsops,
102663 const struct compat_timespec __user *, timeout)
102664 {
102665 struct timespec __user *ts64;
102666diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
102667index 8ad93c2..efd80f8 100644
102668--- a/ipc/ipc_sysctl.c
102669+++ b/ipc/ipc_sysctl.c
102670@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
102671 static int proc_ipc_dointvec(struct ctl_table *table, int write,
102672 void __user *buffer, size_t *lenp, loff_t *ppos)
102673 {
102674- struct ctl_table ipc_table;
102675+ ctl_table_no_const ipc_table;
102676
102677 memcpy(&ipc_table, table, sizeof(ipc_table));
102678 ipc_table.data = get_ipc(table);
102679@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
102680 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
102681 void __user *buffer, size_t *lenp, loff_t *ppos)
102682 {
102683- struct ctl_table ipc_table;
102684+ ctl_table_no_const ipc_table;
102685
102686 memcpy(&ipc_table, table, sizeof(ipc_table));
102687 ipc_table.data = get_ipc(table);
102688@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
102689 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
102690 void __user *buffer, size_t *lenp, loff_t *ppos)
102691 {
102692- struct ctl_table ipc_table;
102693+ ctl_table_no_const ipc_table;
102694 memcpy(&ipc_table, table, sizeof(ipc_table));
102695 ipc_table.data = get_ipc(table);
102696
102697@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
102698 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
102699 void __user *buffer, size_t *lenp, loff_t *ppos)
102700 {
102701- struct ctl_table ipc_table;
102702+ ctl_table_no_const ipc_table;
102703 int dummy = 0;
102704
102705 memcpy(&ipc_table, table, sizeof(ipc_table));
102706diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
102707index 68d4e95..1477ded 100644
102708--- a/ipc/mq_sysctl.c
102709+++ b/ipc/mq_sysctl.c
102710@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
102711 static int proc_mq_dointvec(struct ctl_table *table, int write,
102712 void __user *buffer, size_t *lenp, loff_t *ppos)
102713 {
102714- struct ctl_table mq_table;
102715+ ctl_table_no_const mq_table;
102716 memcpy(&mq_table, table, sizeof(mq_table));
102717 mq_table.data = get_mq(table);
102718
102719@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
102720 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
102721 void __user *buffer, size_t *lenp, loff_t *ppos)
102722 {
102723- struct ctl_table mq_table;
102724+ ctl_table_no_const mq_table;
102725 memcpy(&mq_table, table, sizeof(mq_table));
102726 mq_table.data = get_mq(table);
102727
102728diff --git a/ipc/mqueue.c b/ipc/mqueue.c
102729index c3fc5c2..1f32fe2 100644
102730--- a/ipc/mqueue.c
102731+++ b/ipc/mqueue.c
102732@@ -275,6 +275,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
102733 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
102734 info->attr.mq_msgsize);
102735
102736+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
102737 spin_lock(&mq_lock);
102738 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
102739 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
102740diff --git a/ipc/sem.c b/ipc/sem.c
102741index d1a6edd..1a59db4 100644
102742--- a/ipc/sem.c
102743+++ b/ipc/sem.c
102744@@ -253,6 +253,16 @@ static void sem_rcu_free(struct rcu_head *head)
102745 }
102746
102747 /*
102748+ * spin_unlock_wait() and !spin_is_locked() are not memory barriers, they
102749+ * are only control barriers.
102750+ * The code must pair with spin_unlock(&sem->lock) or
102751+ * spin_unlock(&sem_perm.lock), thus just the control barrier is insufficient.
102752+ *
102753+ * smp_rmb() is sufficient, as writes cannot pass the control barrier.
102754+ */
102755+#define ipc_smp_acquire__after_spin_is_unlocked() smp_rmb()
102756+
102757+/*
102758 * Wait until all currently ongoing simple ops have completed.
102759 * Caller must own sem_perm.lock.
102760 * New simple ops cannot start, because simple ops first check
102761@@ -275,6 +285,7 @@ static void sem_wait_array(struct sem_array *sma)
102762 sem = sma->sem_base + i;
102763 spin_unlock_wait(&sem->lock);
102764 }
102765+ ipc_smp_acquire__after_spin_is_unlocked();
102766 }
102767
102768 /*
102769@@ -327,13 +338,12 @@ static inline int sem_lock(struct sem_array *sma, struct sembuf *sops,
102770 /* Then check that the global lock is free */
102771 if (!spin_is_locked(&sma->sem_perm.lock)) {
102772 /*
102773- * The ipc object lock check must be visible on all
102774- * cores before rechecking the complex count. Otherwise
102775- * we can race with another thread that does:
102776+ * We need a memory barrier with acquire semantics,
102777+ * otherwise we can race with another thread that does:
102778 * complex_count++;
102779 * spin_unlock(sem_perm.lock);
102780 */
102781- smp_rmb();
102782+ ipc_smp_acquire__after_spin_is_unlocked();
102783
102784 /*
102785 * Now repeat the test of complex_count:
102786@@ -1780,7 +1790,7 @@ static int get_queue_result(struct sem_queue *q)
102787 }
102788
102789 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
102790- unsigned, nsops, const struct timespec __user *, timeout)
102791+ long, nsops, const struct timespec __user *, timeout)
102792 {
102793 int error = -EINVAL;
102794 struct sem_array *sma;
102795@@ -2015,7 +2025,7 @@ out_free:
102796 }
102797
102798 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
102799- unsigned, nsops)
102800+ long, nsops)
102801 {
102802 return sys_semtimedop(semid, tsops, nsops, NULL);
102803 }
102804diff --git a/ipc/shm.c b/ipc/shm.c
102805index 6d76707..b646bbe 100644
102806--- a/ipc/shm.c
102807+++ b/ipc/shm.c
102808@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
102809 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
102810 #endif
102811
102812+#ifdef CONFIG_GRKERNSEC
102813+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
102814+ const u64 shm_createtime, const kuid_t cuid,
102815+ const int shmid);
102816+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
102817+ const u64 shm_createtime);
102818+#endif
102819+
102820 void shm_init_ns(struct ipc_namespace *ns)
102821 {
102822 ns->shm_ctlmax = SHMMAX;
102823@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
102824 shp->shm_lprid = 0;
102825 shp->shm_atim = shp->shm_dtim = 0;
102826 shp->shm_ctim = get_seconds();
102827+#ifdef CONFIG_GRKERNSEC
102828+ shp->shm_createtime = ktime_get_ns();
102829+#endif
102830 shp->shm_segsz = size;
102831 shp->shm_nattch = 0;
102832 shp->shm_file = file;
102833@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
102834 f_mode = FMODE_READ | FMODE_WRITE;
102835 }
102836 if (shmflg & SHM_EXEC) {
102837+
102838+#ifdef CONFIG_PAX_MPROTECT
102839+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
102840+ goto out;
102841+#endif
102842+
102843 prot |= PROT_EXEC;
102844 acc_mode |= S_IXUGO;
102845 }
102846@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
102847 if (err)
102848 goto out_unlock;
102849
102850+#ifdef CONFIG_GRKERNSEC
102851+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
102852+ shp->shm_perm.cuid, shmid) ||
102853+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
102854+ err = -EACCES;
102855+ goto out_unlock;
102856+ }
102857+#endif
102858+
102859 ipc_lock_object(&shp->shm_perm);
102860
102861 /* check if shm_destroy() is tearing down shp */
102862@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
102863 path = shp->shm_file->f_path;
102864 path_get(&path);
102865 shp->shm_nattch++;
102866+#ifdef CONFIG_GRKERNSEC
102867+ shp->shm_lapid = current->pid;
102868+#endif
102869 size = i_size_read(d_inode(path.dentry));
102870 ipc_unlock_object(&shp->shm_perm);
102871 rcu_read_unlock();
102872diff --git a/ipc/util.c b/ipc/util.c
102873index ff3323e..d6d63d1 100644
102874--- a/ipc/util.c
102875+++ b/ipc/util.c
102876@@ -71,6 +71,8 @@ struct ipc_proc_iface {
102877 int (*show)(struct seq_file *, void *);
102878 };
102879
102880+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
102881+
102882 /**
102883 * ipc_init - initialise ipc subsystem
102884 *
102885@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
102886 granted_mode >>= 6;
102887 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
102888 granted_mode >>= 3;
102889+
102890+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
102891+ return -1;
102892+
102893 /* is there some bit set in requested_mode but not in granted_mode? */
102894 if ((requested_mode & ~granted_mode & 0007) &&
102895 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
102896diff --git a/kernel/audit.c b/kernel/audit.c
102897index 1c13e42..6c171ab 100644
102898--- a/kernel/audit.c
102899+++ b/kernel/audit.c
102900@@ -124,7 +124,7 @@ u32 audit_sig_sid = 0;
102901 3) suppressed due to audit_rate_limit
102902 4) suppressed due to audit_backlog_limit
102903 */
102904-static atomic_t audit_lost = ATOMIC_INIT(0);
102905+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
102906
102907 /* The netlink socket. */
102908 static struct sock *audit_sock;
102909@@ -258,7 +258,7 @@ void audit_log_lost(const char *message)
102910 unsigned long now;
102911 int print;
102912
102913- atomic_inc(&audit_lost);
102914+ atomic_inc_unchecked(&audit_lost);
102915
102916 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
102917
102918@@ -275,7 +275,7 @@ void audit_log_lost(const char *message)
102919 if (print) {
102920 if (printk_ratelimit())
102921 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
102922- atomic_read(&audit_lost),
102923+ atomic_read_unchecked(&audit_lost),
102924 audit_rate_limit,
102925 audit_backlog_limit);
102926 audit_panic(message);
102927@@ -833,7 +833,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
102928 s.pid = audit_pid;
102929 s.rate_limit = audit_rate_limit;
102930 s.backlog_limit = audit_backlog_limit;
102931- s.lost = atomic_read(&audit_lost);
102932+ s.lost = atomic_read_unchecked(&audit_lost);
102933 s.backlog = skb_queue_len(&audit_skb_queue);
102934 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
102935 s.backlog_wait_time = audit_backlog_wait_time_master;
102936diff --git a/kernel/auditsc.c b/kernel/auditsc.c
102937index 9fb9d1c..afb1610 100644
102938--- a/kernel/auditsc.c
102939+++ b/kernel/auditsc.c
102940@@ -1023,7 +1023,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
102941 * for strings that are too long, we should not have created
102942 * any.
102943 */
102944- if (unlikely((len == -1) || len > MAX_ARG_STRLEN - 1)) {
102945+ if (unlikely(len > MAX_ARG_STRLEN - 1)) {
102946 WARN_ON(1);
102947 send_sig(SIGKILL, current, 0);
102948 return -1;
102949@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
102950 }
102951
102952 /* global counter which is incremented every time something logs in */
102953-static atomic_t session_id = ATOMIC_INIT(0);
102954+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
102955
102956 static int audit_set_loginuid_perm(kuid_t loginuid)
102957 {
102958@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
102959
102960 /* are we setting or clearing? */
102961 if (uid_valid(loginuid))
102962- sessionid = (unsigned int)atomic_inc_return(&session_id);
102963+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
102964
102965 task->sessionid = sessionid;
102966 task->loginuid = loginuid;
102967diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
102968index 54f0e7f..fed997b 100644
102969--- a/kernel/bpf/core.c
102970+++ b/kernel/bpf/core.c
102971@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
102972 * random section of illegal instructions.
102973 */
102974 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
102975- hdr = module_alloc(size);
102976+ hdr = module_alloc_exec(size);
102977 if (hdr == NULL)
102978 return NULL;
102979
102980 /* Fill space with illegal/arch-dep instructions. */
102981 bpf_fill_ill_insns(hdr, size);
102982
102983+ pax_open_kernel();
102984 hdr->pages = size / PAGE_SIZE;
102985+ pax_close_kernel();
102986+
102987 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
102988 PAGE_SIZE - sizeof(*hdr));
102989 start = (prandom_u32() % hole) & ~(alignment - 1);
102990@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
102991
102992 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
102993 {
102994- module_memfree(hdr);
102995+ module_memfree_exec(hdr);
102996 }
102997 #endif /* CONFIG_BPF_JIT */
102998
102999diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
103000index 3bae6c5..59ea175 100644
103001--- a/kernel/bpf/syscall.c
103002+++ b/kernel/bpf/syscall.c
103003@@ -554,11 +554,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
103004 int err;
103005
103006 /* the syscall is limited to root temporarily. This restriction will be
103007- * lifted when security audit is clean. Note that eBPF+tracing must have
103008- * this restriction, since it may pass kernel data to user space
103009+ * lifted by upstream when a half-assed security audit is clean. Note
103010+ * that eBPF+tracing must have this restriction, since it may pass
103011+ * kernel data to user space
103012 */
103013 if (!capable(CAP_SYS_ADMIN))
103014 return -EPERM;
103015+#ifdef CONFIG_GRKERNSEC
103016+ return -EPERM;
103017+#endif
103018
103019 if (!access_ok(VERIFY_READ, uattr, 1))
103020 return -EFAULT;
103021diff --git a/kernel/capability.c b/kernel/capability.c
103022index 45432b5..988f1e4 100644
103023--- a/kernel/capability.c
103024+++ b/kernel/capability.c
103025@@ -193,6 +193,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
103026 * before modification is attempted and the application
103027 * fails.
103028 */
103029+ if (tocopy > ARRAY_SIZE(kdata))
103030+ return -EFAULT;
103031+
103032 if (copy_to_user(dataptr, kdata, tocopy
103033 * sizeof(struct __user_cap_data_struct))) {
103034 return -EFAULT;
103035@@ -298,10 +301,11 @@ bool has_ns_capability(struct task_struct *t,
103036 int ret;
103037
103038 rcu_read_lock();
103039- ret = security_capable(__task_cred(t), ns, cap);
103040+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
103041+ gr_task_is_capable(t, __task_cred(t), cap);
103042 rcu_read_unlock();
103043
103044- return (ret == 0);
103045+ return ret;
103046 }
103047
103048 /**
103049@@ -338,10 +342,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
103050 int ret;
103051
103052 rcu_read_lock();
103053- ret = security_capable_noaudit(__task_cred(t), ns, cap);
103054+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
103055 rcu_read_unlock();
103056
103057- return (ret == 0);
103058+ return ret;
103059 }
103060
103061 /**
103062@@ -379,7 +383,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
103063 BUG();
103064 }
103065
103066- if (security_capable(current_cred(), ns, cap) == 0) {
103067+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
103068 current->flags |= PF_SUPERPRIV;
103069 return true;
103070 }
103071@@ -387,6 +391,20 @@ bool ns_capable(struct user_namespace *ns, int cap)
103072 }
103073 EXPORT_SYMBOL(ns_capable);
103074
103075+bool ns_capable_nolog(struct user_namespace *ns, int cap)
103076+{
103077+ if (unlikely(!cap_valid(cap))) {
103078+ pr_crit("capable_nolog() called with invalid cap=%u\n", cap);
103079+ BUG();
103080+ }
103081+
103082+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
103083+ current->flags |= PF_SUPERPRIV;
103084+ return true;
103085+ }
103086+ return false;
103087+}
103088+EXPORT_SYMBOL(ns_capable_nolog);
103089
103090 /**
103091 * capable - Determine if the current task has a superior capability in effect
103092@@ -403,6 +421,13 @@ bool capable(int cap)
103093 return ns_capable(&init_user_ns, cap);
103094 }
103095 EXPORT_SYMBOL(capable);
103096+
103097+bool capable_nolog(int cap)
103098+{
103099+ return ns_capable_nolog(&init_user_ns, cap);
103100+}
103101+EXPORT_SYMBOL(capable_nolog);
103102+
103103 #endif /* CONFIG_MULTIUSER */
103104
103105 /**
103106@@ -447,3 +472,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
103107 kgid_has_mapping(ns, inode->i_gid);
103108 }
103109 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
103110+
103111+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
103112+{
103113+ struct user_namespace *ns = current_user_ns();
103114+
103115+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
103116+ kgid_has_mapping(ns, inode->i_gid);
103117+}
103118+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
103119diff --git a/kernel/cgroup.c b/kernel/cgroup.c
103120index e8a5491..ab4bfa3 100644
103121--- a/kernel/cgroup.c
103122+++ b/kernel/cgroup.c
103123@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
103124 if (!pathbuf || !agentbuf)
103125 goto out;
103126
103127+ if (agentbuf[0] == '\0')
103128+ goto out;
103129+
103130 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
103131 if (!path)
103132 goto out;
103133@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
103134 struct task_struct *task;
103135 int count = 0;
103136
103137- seq_printf(seq, "css_set %p\n", cset);
103138+ seq_printf(seq, "css_set %pK\n", cset);
103139
103140 list_for_each_entry(task, &cset->tasks, cg_list) {
103141 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
103142diff --git a/kernel/compat.c b/kernel/compat.c
103143index 333d364..762ec00 100644
103144--- a/kernel/compat.c
103145+++ b/kernel/compat.c
103146@@ -13,6 +13,7 @@
103147
103148 #include <linux/linkage.h>
103149 #include <linux/compat.h>
103150+#include <linux/module.h>
103151 #include <linux/errno.h>
103152 #include <linux/time.h>
103153 #include <linux/signal.h>
103154@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
103155 mm_segment_t oldfs;
103156 long ret;
103157
103158- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
103159+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
103160 oldfs = get_fs();
103161 set_fs(KERNEL_DS);
103162 ret = hrtimer_nanosleep_restart(restart);
103163@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
103164 oldfs = get_fs();
103165 set_fs(KERNEL_DS);
103166 ret = hrtimer_nanosleep(&tu,
103167- rmtp ? (struct timespec __user *)&rmt : NULL,
103168+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
103169 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
103170 set_fs(oldfs);
103171
103172@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
103173 mm_segment_t old_fs = get_fs();
103174
103175 set_fs(KERNEL_DS);
103176- ret = sys_sigpending((old_sigset_t __user *) &s);
103177+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
103178 set_fs(old_fs);
103179 if (ret == 0)
103180 ret = put_user(s, set);
103181@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
103182 mm_segment_t old_fs = get_fs();
103183
103184 set_fs(KERNEL_DS);
103185- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
103186+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
103187 set_fs(old_fs);
103188
103189 if (!ret) {
103190@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
103191 set_fs (KERNEL_DS);
103192 ret = sys_wait4(pid,
103193 (stat_addr ?
103194- (unsigned int __user *) &status : NULL),
103195- options, (struct rusage __user *) &r);
103196+ (unsigned int __force_user *) &status : NULL),
103197+ options, (struct rusage __force_user *) &r);
103198 set_fs (old_fs);
103199
103200 if (ret > 0) {
103201@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
103202 memset(&info, 0, sizeof(info));
103203
103204 set_fs(KERNEL_DS);
103205- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
103206- uru ? (struct rusage __user *)&ru : NULL);
103207+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
103208+ uru ? (struct rusage __force_user *)&ru : NULL);
103209 set_fs(old_fs);
103210
103211 if ((ret < 0) || (info.si_signo == 0))
103212@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
103213 oldfs = get_fs();
103214 set_fs(KERNEL_DS);
103215 err = sys_timer_settime(timer_id, flags,
103216- (struct itimerspec __user *) &newts,
103217- (struct itimerspec __user *) &oldts);
103218+ (struct itimerspec __force_user *) &newts,
103219+ (struct itimerspec __force_user *) &oldts);
103220 set_fs(oldfs);
103221 if (!err && old && put_compat_itimerspec(old, &oldts))
103222 return -EFAULT;
103223@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
103224 oldfs = get_fs();
103225 set_fs(KERNEL_DS);
103226 err = sys_timer_gettime(timer_id,
103227- (struct itimerspec __user *) &ts);
103228+ (struct itimerspec __force_user *) &ts);
103229 set_fs(oldfs);
103230 if (!err && put_compat_itimerspec(setting, &ts))
103231 return -EFAULT;
103232@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
103233 oldfs = get_fs();
103234 set_fs(KERNEL_DS);
103235 err = sys_clock_settime(which_clock,
103236- (struct timespec __user *) &ts);
103237+ (struct timespec __force_user *) &ts);
103238 set_fs(oldfs);
103239 return err;
103240 }
103241@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
103242 oldfs = get_fs();
103243 set_fs(KERNEL_DS);
103244 err = sys_clock_gettime(which_clock,
103245- (struct timespec __user *) &ts);
103246+ (struct timespec __force_user *) &ts);
103247 set_fs(oldfs);
103248 if (!err && compat_put_timespec(&ts, tp))
103249 return -EFAULT;
103250@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
103251
103252 oldfs = get_fs();
103253 set_fs(KERNEL_DS);
103254- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
103255+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
103256 set_fs(oldfs);
103257
103258 err = compat_put_timex(utp, &txc);
103259@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
103260 oldfs = get_fs();
103261 set_fs(KERNEL_DS);
103262 err = sys_clock_getres(which_clock,
103263- (struct timespec __user *) &ts);
103264+ (struct timespec __force_user *) &ts);
103265 set_fs(oldfs);
103266 if (!err && tp && compat_put_timespec(&ts, tp))
103267 return -EFAULT;
103268@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
103269 struct timespec tu;
103270 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
103271
103272- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
103273+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
103274 oldfs = get_fs();
103275 set_fs(KERNEL_DS);
103276 err = clock_nanosleep_restart(restart);
103277@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
103278 oldfs = get_fs();
103279 set_fs(KERNEL_DS);
103280 err = sys_clock_nanosleep(which_clock, flags,
103281- (struct timespec __user *) &in,
103282- (struct timespec __user *) &out);
103283+ (struct timespec __force_user *) &in,
103284+ (struct timespec __force_user *) &out);
103285 set_fs(oldfs);
103286
103287 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
103288@@ -1147,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
103289 mm_segment_t old_fs = get_fs();
103290
103291 set_fs(KERNEL_DS);
103292- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
103293+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
103294 set_fs(old_fs);
103295 if (compat_put_timespec(&t, interval))
103296 return -EFAULT;
103297diff --git a/kernel/configs.c b/kernel/configs.c
103298index c18b1f1..b9a0132 100644
103299--- a/kernel/configs.c
103300+++ b/kernel/configs.c
103301@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
103302 struct proc_dir_entry *entry;
103303
103304 /* create the current config file */
103305+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
103306+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
103307+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
103308+ &ikconfig_file_ops);
103309+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
103310+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
103311+ &ikconfig_file_ops);
103312+#endif
103313+#else
103314 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
103315 &ikconfig_file_ops);
103316+#endif
103317+
103318 if (!entry)
103319 return -ENOMEM;
103320
103321diff --git a/kernel/cred.c b/kernel/cred.c
103322index ec1c076..7da8a0e 100644
103323--- a/kernel/cred.c
103324+++ b/kernel/cred.c
103325@@ -167,6 +167,15 @@ void exit_creds(struct task_struct *tsk)
103326 validate_creds(cred);
103327 alter_cred_subscribers(cred, -1);
103328 put_cred(cred);
103329+
103330+#ifdef CONFIG_GRKERNSEC_SETXID
103331+ cred = (struct cred *) tsk->delayed_cred;
103332+ if (cred != NULL) {
103333+ tsk->delayed_cred = NULL;
103334+ validate_creds(cred);
103335+ put_cred(cred);
103336+ }
103337+#endif
103338 }
103339
103340 /**
103341@@ -414,7 +423,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
103342 * Always returns 0 thus allowing this function to be tail-called at the end
103343 * of, say, sys_setgid().
103344 */
103345-int commit_creds(struct cred *new)
103346+static int __commit_creds(struct cred *new)
103347 {
103348 struct task_struct *task = current;
103349 const struct cred *old = task->real_cred;
103350@@ -433,6 +442,8 @@ int commit_creds(struct cred *new)
103351
103352 get_cred(new); /* we will require a ref for the subj creds too */
103353
103354+ gr_set_role_label(task, new->uid, new->gid);
103355+
103356 /* dumpability changes */
103357 if (!uid_eq(old->euid, new->euid) ||
103358 !gid_eq(old->egid, new->egid) ||
103359@@ -482,6 +493,105 @@ int commit_creds(struct cred *new)
103360 put_cred(old);
103361 return 0;
103362 }
103363+#ifdef CONFIG_GRKERNSEC_SETXID
103364+extern int set_user(struct cred *new);
103365+
103366+void gr_delayed_cred_worker(void)
103367+{
103368+ const struct cred *new = current->delayed_cred;
103369+ struct cred *ncred;
103370+
103371+ current->delayed_cred = NULL;
103372+
103373+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
103374+ // from doing get_cred on it when queueing this
103375+ put_cred(new);
103376+ return;
103377+ } else if (new == NULL)
103378+ return;
103379+
103380+ ncred = prepare_creds();
103381+ if (!ncred)
103382+ goto die;
103383+ // uids
103384+ ncred->uid = new->uid;
103385+ ncred->euid = new->euid;
103386+ ncred->suid = new->suid;
103387+ ncred->fsuid = new->fsuid;
103388+ // gids
103389+ ncred->gid = new->gid;
103390+ ncred->egid = new->egid;
103391+ ncred->sgid = new->sgid;
103392+ ncred->fsgid = new->fsgid;
103393+ // groups
103394+ set_groups(ncred, new->group_info);
103395+ // caps
103396+ ncred->securebits = new->securebits;
103397+ ncred->cap_inheritable = new->cap_inheritable;
103398+ ncred->cap_permitted = new->cap_permitted;
103399+ ncred->cap_effective = new->cap_effective;
103400+ ncred->cap_bset = new->cap_bset;
103401+
103402+ if (set_user(ncred)) {
103403+ abort_creds(ncred);
103404+ goto die;
103405+ }
103406+
103407+ // from doing get_cred on it when queueing this
103408+ put_cred(new);
103409+
103410+ __commit_creds(ncred);
103411+ return;
103412+die:
103413+ // from doing get_cred on it when queueing this
103414+ put_cred(new);
103415+ do_group_exit(SIGKILL);
103416+}
103417+#endif
103418+
103419+int commit_creds(struct cred *new)
103420+{
103421+#ifdef CONFIG_GRKERNSEC_SETXID
103422+ int ret;
103423+ int schedule_it = 0;
103424+ struct task_struct *t;
103425+ unsigned oldsecurebits = current_cred()->securebits;
103426+
103427+ /* we won't get called with tasklist_lock held for writing
103428+ and interrupts disabled as the cred struct in that case is
103429+ init_cred
103430+ */
103431+ if (grsec_enable_setxid && !current_is_single_threaded() &&
103432+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
103433+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
103434+ schedule_it = 1;
103435+ }
103436+ ret = __commit_creds(new);
103437+ if (schedule_it) {
103438+ rcu_read_lock();
103439+ read_lock(&tasklist_lock);
103440+ for (t = next_thread(current); t != current;
103441+ t = next_thread(t)) {
103442+ /* we'll check if the thread has uid 0 in
103443+ * the delayed worker routine
103444+ */
103445+ if (task_securebits(t) == oldsecurebits &&
103446+ t->delayed_cred == NULL) {
103447+ t->delayed_cred = get_cred(new);
103448+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
103449+ set_tsk_need_resched(t);
103450+ }
103451+ }
103452+ read_unlock(&tasklist_lock);
103453+ rcu_read_unlock();
103454+ }
103455+
103456+ return ret;
103457+#else
103458+ return __commit_creds(new);
103459+#endif
103460+}
103461+
103462 EXPORT_SYMBOL(commit_creds);
103463
103464 /**
103465diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
103466index 0874e2e..5b32cc9 100644
103467--- a/kernel/debug/debug_core.c
103468+++ b/kernel/debug/debug_core.c
103469@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
103470 */
103471 static atomic_t masters_in_kgdb;
103472 static atomic_t slaves_in_kgdb;
103473-static atomic_t kgdb_break_tasklet_var;
103474+static atomic_unchecked_t kgdb_break_tasklet_var;
103475 atomic_t kgdb_setting_breakpoint;
103476
103477 struct task_struct *kgdb_usethread;
103478@@ -137,7 +137,7 @@ int kgdb_single_step;
103479 static pid_t kgdb_sstep_pid;
103480
103481 /* to keep track of the CPU which is doing the single stepping*/
103482-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103483+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103484
103485 /*
103486 * If you are debugging a problem where roundup (the collection of
103487@@ -552,7 +552,7 @@ return_normal:
103488 * kernel will only try for the value of sstep_tries before
103489 * giving up and continuing on.
103490 */
103491- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
103492+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
103493 (kgdb_info[cpu].task &&
103494 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
103495 atomic_set(&kgdb_active, -1);
103496@@ -654,8 +654,8 @@ cpu_master_loop:
103497 }
103498
103499 kgdb_restore:
103500- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
103501- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
103502+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
103503+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
103504 if (kgdb_info[sstep_cpu].task)
103505 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
103506 else
103507@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
103508 static void kgdb_tasklet_bpt(unsigned long ing)
103509 {
103510 kgdb_breakpoint();
103511- atomic_set(&kgdb_break_tasklet_var, 0);
103512+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
103513 }
103514
103515 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
103516
103517 void kgdb_schedule_breakpoint(void)
103518 {
103519- if (atomic_read(&kgdb_break_tasklet_var) ||
103520+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
103521 atomic_read(&kgdb_active) != -1 ||
103522 atomic_read(&kgdb_setting_breakpoint))
103523 return;
103524- atomic_inc(&kgdb_break_tasklet_var);
103525+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
103526 tasklet_schedule(&kgdb_tasklet_breakpoint);
103527 }
103528 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
103529diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
103530index 41213454..861e178 100644
103531--- a/kernel/debug/kdb/kdb_main.c
103532+++ b/kernel/debug/kdb/kdb_main.c
103533@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
103534 continue;
103535
103536 kdb_printf("%-20s%8u 0x%p ", mod->name,
103537- mod->core_size, (void *)mod);
103538+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
103539 #ifdef CONFIG_MODULE_UNLOAD
103540 kdb_printf("%4d ", module_refcount(mod));
103541 #endif
103542@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
103543 kdb_printf(" (Loading)");
103544 else
103545 kdb_printf(" (Live)");
103546- kdb_printf(" 0x%p", mod->module_core);
103547+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
103548
103549 #ifdef CONFIG_MODULE_UNLOAD
103550 {
103551diff --git a/kernel/events/core.c b/kernel/events/core.c
103552index 0ceb386..ddaf008 100644
103553--- a/kernel/events/core.c
103554+++ b/kernel/events/core.c
103555@@ -172,8 +172,15 @@ static struct srcu_struct pmus_srcu;
103556 * 0 - disallow raw tracepoint access for unpriv
103557 * 1 - disallow cpu events for unpriv
103558 * 2 - disallow kernel profiling for unpriv
103559+ * 3 - disallow all unpriv perf event use
103560 */
103561-int sysctl_perf_event_paranoid __read_mostly = 1;
103562+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103563+int sysctl_perf_event_legitimately_concerned __read_only = 3;
103564+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
103565+int sysctl_perf_event_legitimately_concerned __read_only = 2;
103566+#else
103567+int sysctl_perf_event_legitimately_concerned __read_only = 1;
103568+#endif
103569
103570 /* Minimum for 512 kiB + 1 user control page */
103571 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
103572@@ -199,7 +206,7 @@ void update_perf_cpu_limits(void)
103573
103574 tmp *= sysctl_perf_cpu_time_max_percent;
103575 do_div(tmp, 100);
103576- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
103577+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
103578 }
103579
103580 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
103581@@ -305,7 +312,7 @@ void perf_sample_event_took(u64 sample_len_ns)
103582 }
103583 }
103584
103585-static atomic64_t perf_event_id;
103586+static atomic64_unchecked_t perf_event_id;
103587
103588 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
103589 enum event_type_t event_type);
103590@@ -3771,9 +3778,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
103591 mutex_lock(&event->child_mutex);
103592 total += perf_event_read(event);
103593 *enabled += event->total_time_enabled +
103594- atomic64_read(&event->child_total_time_enabled);
103595+ atomic64_read_unchecked(&event->child_total_time_enabled);
103596 *running += event->total_time_running +
103597- atomic64_read(&event->child_total_time_running);
103598+ atomic64_read_unchecked(&event->child_total_time_running);
103599
103600 list_for_each_entry(child, &event->child_list, child_list) {
103601 total += perf_event_read(child);
103602@@ -4268,10 +4275,10 @@ void perf_event_update_userpage(struct perf_event *event)
103603 userpg->offset -= local64_read(&event->hw.prev_count);
103604
103605 userpg->time_enabled = enabled +
103606- atomic64_read(&event->child_total_time_enabled);
103607+ atomic64_read_unchecked(&event->child_total_time_enabled);
103608
103609 userpg->time_running = running +
103610- atomic64_read(&event->child_total_time_running);
103611+ atomic64_read_unchecked(&event->child_total_time_running);
103612
103613 arch_perf_update_userpage(event, userpg, now);
103614
103615@@ -4946,7 +4953,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
103616
103617 /* Data. */
103618 sp = perf_user_stack_pointer(regs);
103619- rem = __output_copy_user(handle, (void *) sp, dump_size);
103620+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
103621 dyn_size = dump_size - rem;
103622
103623 perf_output_skip(handle, rem);
103624@@ -5037,11 +5044,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
103625 values[n++] = perf_event_count(event);
103626 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
103627 values[n++] = enabled +
103628- atomic64_read(&event->child_total_time_enabled);
103629+ atomic64_read_unchecked(&event->child_total_time_enabled);
103630 }
103631 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
103632 values[n++] = running +
103633- atomic64_read(&event->child_total_time_running);
103634+ atomic64_read_unchecked(&event->child_total_time_running);
103635 }
103636 if (read_format & PERF_FORMAT_ID)
103637 values[n++] = primary_event_id(event);
103638@@ -7533,7 +7540,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
103639 event->parent = parent_event;
103640
103641 event->ns = get_pid_ns(task_active_pid_ns(current));
103642- event->id = atomic64_inc_return(&perf_event_id);
103643+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
103644
103645 event->state = PERF_EVENT_STATE_INACTIVE;
103646
103647@@ -7892,6 +7899,11 @@ SYSCALL_DEFINE5(perf_event_open,
103648 if (flags & ~PERF_FLAG_ALL)
103649 return -EINVAL;
103650
103651+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103652+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
103653+ return -EACCES;
103654+#endif
103655+
103656 err = perf_copy_attr(attr_uptr, &attr);
103657 if (err)
103658 return err;
103659@@ -8340,10 +8352,10 @@ static void sync_child_event(struct perf_event *child_event,
103660 /*
103661 * Add back the child's count to the parent's count:
103662 */
103663- atomic64_add(child_val, &parent_event->child_count);
103664- atomic64_add(child_event->total_time_enabled,
103665+ atomic64_add_unchecked(child_val, &parent_event->child_count);
103666+ atomic64_add_unchecked(child_event->total_time_enabled,
103667 &parent_event->child_total_time_enabled);
103668- atomic64_add(child_event->total_time_running,
103669+ atomic64_add_unchecked(child_event->total_time_running,
103670 &parent_event->child_total_time_running);
103671
103672 /*
103673diff --git a/kernel/events/internal.h b/kernel/events/internal.h
103674index 9f6ce9b..e4f2cbb 100644
103675--- a/kernel/events/internal.h
103676+++ b/kernel/events/internal.h
103677@@ -114,10 +114,10 @@ static inline unsigned long perf_aux_size(struct ring_buffer *rb)
103678 return rb->aux_nr_pages << PAGE_SHIFT;
103679 }
103680
103681-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
103682+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
103683 static inline unsigned long \
103684 func_name(struct perf_output_handle *handle, \
103685- const void *buf, unsigned long len) \
103686+ const void user *buf, unsigned long len) \
103687 { \
103688 unsigned long size, written; \
103689 \
103690@@ -150,7 +150,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
103691 return 0;
103692 }
103693
103694-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
103695+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
103696
103697 static inline unsigned long
103698 memcpy_skip(void *dst, const void *src, unsigned long n)
103699@@ -158,7 +158,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
103700 return 0;
103701 }
103702
103703-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
103704+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
103705
103706 #ifndef arch_perf_out_copy_user
103707 #define arch_perf_out_copy_user arch_perf_out_copy_user
103708@@ -176,7 +176,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
103709 }
103710 #endif
103711
103712-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
103713+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
103714
103715 /* Callchain handling */
103716 extern struct perf_callchain_entry *
103717diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
103718index cb346f2..e4dc317 100644
103719--- a/kernel/events/uprobes.c
103720+++ b/kernel/events/uprobes.c
103721@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
103722 {
103723 struct page *page;
103724 uprobe_opcode_t opcode;
103725- int result;
103726+ long result;
103727
103728 pagefault_disable();
103729 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
103730diff --git a/kernel/exit.c b/kernel/exit.c
103731index 22fcc05..5f07dbc 100644
103732--- a/kernel/exit.c
103733+++ b/kernel/exit.c
103734@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
103735 struct task_struct *leader;
103736 int zap_leader;
103737 repeat:
103738+#ifdef CONFIG_NET
103739+ gr_del_task_from_ip_table(p);
103740+#endif
103741+
103742 /* don't need to get the RCU readlock here - the process is dead and
103743 * can't be modifying its own credentials. But shut RCU-lockdep up */
103744 rcu_read_lock();
103745@@ -656,6 +660,8 @@ void do_exit(long code)
103746 int group_dead;
103747 TASKS_RCU(int tasks_rcu_i);
103748
103749+ set_fs(USER_DS);
103750+
103751 profile_task_exit(tsk);
103752
103753 WARN_ON(blk_needs_flush_plug(tsk));
103754@@ -672,7 +678,6 @@ void do_exit(long code)
103755 * mm_release()->clear_child_tid() from writing to a user-controlled
103756 * kernel address.
103757 */
103758- set_fs(USER_DS);
103759
103760 ptrace_event(PTRACE_EVENT_EXIT, code);
103761
103762@@ -730,6 +735,9 @@ void do_exit(long code)
103763 tsk->exit_code = code;
103764 taskstats_exit(tsk, group_dead);
103765
103766+ gr_acl_handle_psacct(tsk, code);
103767+ gr_acl_handle_exit();
103768+
103769 exit_mm(tsk);
103770
103771 if (group_dead)
103772@@ -847,7 +855,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
103773 * Take down every thread in the group. This is called by fatal signals
103774 * as well as by sys_exit_group (below).
103775 */
103776-void
103777+__noreturn void
103778 do_group_exit(int exit_code)
103779 {
103780 struct signal_struct *sig = current->signal;
103781diff --git a/kernel/fork.c b/kernel/fork.c
103782index 03c1eaa..461be4c 100644
103783--- a/kernel/fork.c
103784+++ b/kernel/fork.c
103785@@ -188,12 +188,54 @@ static void free_thread_info(struct thread_info *ti)
103786 void thread_info_cache_init(void)
103787 {
103788 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
103789- THREAD_SIZE, 0, NULL);
103790+ THREAD_SIZE, SLAB_USERCOPY, NULL);
103791 BUG_ON(thread_info_cache == NULL);
103792 }
103793 # endif
103794 #endif
103795
103796+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
103797+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
103798+ int node, void **lowmem_stack)
103799+{
103800+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
103801+ void *ret = NULL;
103802+ unsigned int i;
103803+
103804+ *lowmem_stack = alloc_thread_info_node(tsk, node);
103805+ if (*lowmem_stack == NULL)
103806+ goto out;
103807+
103808+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
103809+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
103810+
103811+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
103812+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
103813+ if (ret == NULL) {
103814+ free_thread_info(*lowmem_stack);
103815+ *lowmem_stack = NULL;
103816+ }
103817+
103818+out:
103819+ return ret;
103820+}
103821+
103822+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
103823+{
103824+ unmap_process_stacks(tsk);
103825+}
103826+#else
103827+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
103828+ int node, void **lowmem_stack)
103829+{
103830+ return alloc_thread_info_node(tsk, node);
103831+}
103832+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
103833+{
103834+ free_thread_info(ti);
103835+}
103836+#endif
103837+
103838 /* SLAB cache for signal_struct structures (tsk->signal) */
103839 static struct kmem_cache *signal_cachep;
103840
103841@@ -212,18 +254,22 @@ struct kmem_cache *vm_area_cachep;
103842 /* SLAB cache for mm_struct structures (tsk->mm) */
103843 static struct kmem_cache *mm_cachep;
103844
103845-static void account_kernel_stack(struct thread_info *ti, int account)
103846+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
103847 {
103848+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
103849+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
103850+#else
103851 struct zone *zone = page_zone(virt_to_page(ti));
103852+#endif
103853
103854 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
103855 }
103856
103857 void free_task(struct task_struct *tsk)
103858 {
103859- account_kernel_stack(tsk->stack, -1);
103860+ account_kernel_stack(tsk, tsk->stack, -1);
103861 arch_release_thread_info(tsk->stack);
103862- free_thread_info(tsk->stack);
103863+ gr_free_thread_info(tsk, tsk->stack);
103864 rt_mutex_debug_task_free(tsk);
103865 ftrace_graph_exit_task(tsk);
103866 put_seccomp_filter(tsk);
103867@@ -329,6 +375,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103868 {
103869 struct task_struct *tsk;
103870 struct thread_info *ti;
103871+ void *lowmem_stack;
103872 int node = tsk_fork_get_node(orig);
103873 int err;
103874
103875@@ -336,7 +383,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103876 if (!tsk)
103877 return NULL;
103878
103879- ti = alloc_thread_info_node(tsk, node);
103880+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
103881 if (!ti)
103882 goto free_tsk;
103883
103884@@ -345,6 +392,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103885 goto free_ti;
103886
103887 tsk->stack = ti;
103888+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
103889+ tsk->lowmem_stack = lowmem_stack;
103890+#endif
103891 #ifdef CONFIG_SECCOMP
103892 /*
103893 * We must handle setting up seccomp filters once we're under
103894@@ -361,7 +411,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103895 set_task_stack_end_magic(tsk);
103896
103897 #ifdef CONFIG_CC_STACKPROTECTOR
103898- tsk->stack_canary = get_random_int();
103899+ tsk->stack_canary = pax_get_random_long();
103900 #endif
103901
103902 /*
103903@@ -375,24 +425,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
103904 tsk->splice_pipe = NULL;
103905 tsk->task_frag.page = NULL;
103906
103907- account_kernel_stack(ti, 1);
103908+ account_kernel_stack(tsk, ti, 1);
103909
103910 return tsk;
103911
103912 free_ti:
103913- free_thread_info(ti);
103914+ gr_free_thread_info(tsk, ti);
103915 free_tsk:
103916 free_task_struct(tsk);
103917 return NULL;
103918 }
103919
103920 #ifdef CONFIG_MMU
103921-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
103922+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
103923+{
103924+ struct vm_area_struct *tmp;
103925+ unsigned long charge;
103926+ struct file *file;
103927+ int retval;
103928+
103929+ charge = 0;
103930+ if (mpnt->vm_flags & VM_ACCOUNT) {
103931+ unsigned long len = vma_pages(mpnt);
103932+
103933+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
103934+ goto fail_nomem;
103935+ charge = len;
103936+ }
103937+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
103938+ if (!tmp)
103939+ goto fail_nomem;
103940+ *tmp = *mpnt;
103941+ tmp->vm_mm = mm;
103942+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
103943+ retval = vma_dup_policy(mpnt, tmp);
103944+ if (retval)
103945+ goto fail_nomem_policy;
103946+ if (anon_vma_fork(tmp, mpnt))
103947+ goto fail_nomem_anon_vma_fork;
103948+ tmp->vm_flags &= ~VM_LOCKED;
103949+ tmp->vm_next = tmp->vm_prev = NULL;
103950+ tmp->vm_mirror = NULL;
103951+ file = tmp->vm_file;
103952+ if (file) {
103953+ struct inode *inode = file_inode(file);
103954+ struct address_space *mapping = file->f_mapping;
103955+
103956+ get_file(file);
103957+ if (tmp->vm_flags & VM_DENYWRITE)
103958+ atomic_dec(&inode->i_writecount);
103959+ i_mmap_lock_write(mapping);
103960+ if (tmp->vm_flags & VM_SHARED)
103961+ atomic_inc(&mapping->i_mmap_writable);
103962+ flush_dcache_mmap_lock(mapping);
103963+ /* insert tmp into the share list, just after mpnt */
103964+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
103965+ flush_dcache_mmap_unlock(mapping);
103966+ i_mmap_unlock_write(mapping);
103967+ }
103968+
103969+ /*
103970+ * Clear hugetlb-related page reserves for children. This only
103971+ * affects MAP_PRIVATE mappings. Faults generated by the child
103972+ * are not guaranteed to succeed, even if read-only
103973+ */
103974+ if (is_vm_hugetlb_page(tmp))
103975+ reset_vma_resv_huge_pages(tmp);
103976+
103977+ return tmp;
103978+
103979+fail_nomem_anon_vma_fork:
103980+ mpol_put(vma_policy(tmp));
103981+fail_nomem_policy:
103982+ kmem_cache_free(vm_area_cachep, tmp);
103983+fail_nomem:
103984+ vm_unacct_memory(charge);
103985+ return NULL;
103986+}
103987+
103988+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
103989 {
103990 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
103991 struct rb_node **rb_link, *rb_parent;
103992 int retval;
103993- unsigned long charge;
103994
103995 uprobe_start_dup_mmap();
103996 down_write(&oldmm->mmap_sem);
103997@@ -423,51 +538,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
103998
103999 prev = NULL;
104000 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
104001- struct file *file;
104002-
104003 if (mpnt->vm_flags & VM_DONTCOPY) {
104004 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
104005 -vma_pages(mpnt));
104006 continue;
104007 }
104008- charge = 0;
104009- if (mpnt->vm_flags & VM_ACCOUNT) {
104010- unsigned long len = vma_pages(mpnt);
104011-
104012- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
104013- goto fail_nomem;
104014- charge = len;
104015- }
104016- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
104017- if (!tmp)
104018- goto fail_nomem;
104019- *tmp = *mpnt;
104020- INIT_LIST_HEAD(&tmp->anon_vma_chain);
104021- retval = vma_dup_policy(mpnt, tmp);
104022- if (retval)
104023- goto fail_nomem_policy;
104024- tmp->vm_mm = mm;
104025- if (anon_vma_fork(tmp, mpnt))
104026- goto fail_nomem_anon_vma_fork;
104027- tmp->vm_flags &= ~VM_LOCKED;
104028- tmp->vm_next = tmp->vm_prev = NULL;
104029- file = tmp->vm_file;
104030- if (file) {
104031- struct inode *inode = file_inode(file);
104032- struct address_space *mapping = file->f_mapping;
104033-
104034- get_file(file);
104035- if (tmp->vm_flags & VM_DENYWRITE)
104036- atomic_dec(&inode->i_writecount);
104037- i_mmap_lock_write(mapping);
104038- if (tmp->vm_flags & VM_SHARED)
104039- atomic_inc(&mapping->i_mmap_writable);
104040- flush_dcache_mmap_lock(mapping);
104041- /* insert tmp into the share list, just after mpnt */
104042- vma_interval_tree_insert_after(tmp, mpnt,
104043- &mapping->i_mmap);
104044- flush_dcache_mmap_unlock(mapping);
104045- i_mmap_unlock_write(mapping);
104046+ tmp = dup_vma(mm, oldmm, mpnt);
104047+ if (!tmp) {
104048+ retval = -ENOMEM;
104049+ goto out;
104050 }
104051
104052 /*
104053@@ -499,6 +578,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104054 if (retval)
104055 goto out;
104056 }
104057+
104058+#ifdef CONFIG_PAX_SEGMEXEC
104059+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
104060+ struct vm_area_struct *mpnt_m;
104061+
104062+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
104063+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
104064+
104065+ if (!mpnt->vm_mirror)
104066+ continue;
104067+
104068+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
104069+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
104070+ mpnt->vm_mirror = mpnt_m;
104071+ } else {
104072+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
104073+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
104074+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
104075+ mpnt->vm_mirror->vm_mirror = mpnt;
104076+ }
104077+ }
104078+ BUG_ON(mpnt_m);
104079+ }
104080+#endif
104081+
104082 /* a new mm has just been created */
104083 arch_dup_mmap(oldmm, mm);
104084 retval = 0;
104085@@ -508,14 +612,6 @@ out:
104086 up_write(&oldmm->mmap_sem);
104087 uprobe_end_dup_mmap();
104088 return retval;
104089-fail_nomem_anon_vma_fork:
104090- mpol_put(vma_policy(tmp));
104091-fail_nomem_policy:
104092- kmem_cache_free(vm_area_cachep, tmp);
104093-fail_nomem:
104094- retval = -ENOMEM;
104095- vm_unacct_memory(charge);
104096- goto out;
104097 }
104098
104099 static inline int mm_alloc_pgd(struct mm_struct *mm)
104100@@ -790,8 +886,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
104101 return ERR_PTR(err);
104102
104103 mm = get_task_mm(task);
104104- if (mm && mm != current->mm &&
104105- !ptrace_may_access(task, mode)) {
104106+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
104107+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
104108 mmput(mm);
104109 mm = ERR_PTR(-EACCES);
104110 }
104111@@ -992,13 +1088,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
104112 spin_unlock(&fs->lock);
104113 return -EAGAIN;
104114 }
104115- fs->users++;
104116+ atomic_inc(&fs->users);
104117 spin_unlock(&fs->lock);
104118 return 0;
104119 }
104120 tsk->fs = copy_fs_struct(fs);
104121 if (!tsk->fs)
104122 return -ENOMEM;
104123+ /* Carry through gr_chroot_dentry and is_chrooted instead
104124+ of recomputing it here. Already copied when the task struct
104125+ is duplicated. This allows pivot_root to not be treated as
104126+ a chroot
104127+ */
104128+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
104129+
104130 return 0;
104131 }
104132
104133@@ -1236,7 +1339,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
104134 * parts of the process environment (as per the clone
104135 * flags). The actual kick-off is left to the caller.
104136 */
104137-static struct task_struct *copy_process(unsigned long clone_flags,
104138+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
104139 unsigned long stack_start,
104140 unsigned long stack_size,
104141 int __user *child_tidptr,
104142@@ -1307,6 +1410,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104143 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
104144 #endif
104145 retval = -EAGAIN;
104146+
104147+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
104148+
104149 if (atomic_read(&p->real_cred->user->processes) >=
104150 task_rlimit(p, RLIMIT_NPROC)) {
104151 if (p->real_cred->user != INIT_USER &&
104152@@ -1554,6 +1660,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104153 goto bad_fork_free_pid;
104154 }
104155
104156+ /* synchronizes with gr_set_acls()
104157+ we need to call this past the point of no return for fork()
104158+ */
104159+ gr_copy_label(p);
104160+
104161 if (likely(p->pid)) {
104162 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
104163
104164@@ -1643,6 +1754,8 @@ bad_fork_cleanup_count:
104165 bad_fork_free:
104166 free_task(p);
104167 fork_out:
104168+ gr_log_forkfail(retval);
104169+
104170 return ERR_PTR(retval);
104171 }
104172
104173@@ -1704,6 +1817,7 @@ long do_fork(unsigned long clone_flags,
104174
104175 p = copy_process(clone_flags, stack_start, stack_size,
104176 child_tidptr, NULL, trace);
104177+ add_latent_entropy();
104178 /*
104179 * Do this prior waking up the new thread - the thread pointer
104180 * might get invalid after that point, if the thread exits quickly.
104181@@ -1720,6 +1834,8 @@ long do_fork(unsigned long clone_flags,
104182 if (clone_flags & CLONE_PARENT_SETTID)
104183 put_user(nr, parent_tidptr);
104184
104185+ gr_handle_brute_check();
104186+
104187 if (clone_flags & CLONE_VFORK) {
104188 p->vfork_done = &vfork;
104189 init_completion(&vfork);
104190@@ -1838,7 +1954,7 @@ void __init proc_caches_init(void)
104191 mm_cachep = kmem_cache_create("mm_struct",
104192 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
104193 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
104194- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
104195+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
104196 mmap_init();
104197 nsproxy_cache_init();
104198 }
104199@@ -1878,7 +1994,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
104200 return 0;
104201
104202 /* don't need lock here; in the worst case we'll do useless copy */
104203- if (fs->users == 1)
104204+ if (atomic_read(&fs->users) == 1)
104205 return 0;
104206
104207 *new_fsp = copy_fs_struct(fs);
104208@@ -1990,7 +2106,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
104209 fs = current->fs;
104210 spin_lock(&fs->lock);
104211 current->fs = new_fs;
104212- if (--fs->users)
104213+ gr_set_chroot_entries(current, &current->fs->root);
104214+ if (atomic_dec_return(&fs->users))
104215 new_fs = NULL;
104216 else
104217 new_fs = fs;
104218@@ -2054,7 +2171,7 @@ int unshare_files(struct files_struct **displaced)
104219 int sysctl_max_threads(struct ctl_table *table, int write,
104220 void __user *buffer, size_t *lenp, loff_t *ppos)
104221 {
104222- struct ctl_table t;
104223+ ctl_table_no_const t;
104224 int ret;
104225 int threads = max_threads;
104226 int min = MIN_THREADS;
104227diff --git a/kernel/futex.c b/kernel/futex.c
104228index 2579e40..c33f33e 100644
104229--- a/kernel/futex.c
104230+++ b/kernel/futex.c
104231@@ -201,7 +201,7 @@ struct futex_pi_state {
104232 atomic_t refcount;
104233
104234 union futex_key key;
104235-};
104236+} __randomize_layout;
104237
104238 /**
104239 * struct futex_q - The hashed futex queue entry, one per waiting task
104240@@ -235,7 +235,7 @@ struct futex_q {
104241 struct rt_mutex_waiter *rt_waiter;
104242 union futex_key *requeue_pi_key;
104243 u32 bitset;
104244-};
104245+} __randomize_layout;
104246
104247 static const struct futex_q futex_q_init = {
104248 /* list gets initialized in queue_me()*/
104249@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
104250 struct page *page, *page_head;
104251 int err, ro = 0;
104252
104253+#ifdef CONFIG_PAX_SEGMEXEC
104254+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
104255+ return -EFAULT;
104256+#endif
104257+
104258 /*
104259 * The futex address must be "naturally" aligned.
104260 */
104261@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
104262
104263 static int get_futex_value_locked(u32 *dest, u32 __user *from)
104264 {
104265- int ret;
104266+ unsigned long ret;
104267
104268 pagefault_disable();
104269 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
104270@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
104271 {
104272 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
104273 u32 curval;
104274+ mm_segment_t oldfs;
104275
104276 /*
104277 * This will fail and we want it. Some arch implementations do
104278@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
104279 * implementation, the non-functional ones will return
104280 * -ENOSYS.
104281 */
104282+ oldfs = get_fs();
104283+ set_fs(USER_DS);
104284 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
104285 futex_cmpxchg_enabled = 1;
104286+ set_fs(oldfs);
104287 #endif
104288 }
104289
104290diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
104291index 55c8c93..9ba7ad6 100644
104292--- a/kernel/futex_compat.c
104293+++ b/kernel/futex_compat.c
104294@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
104295 return 0;
104296 }
104297
104298-static void __user *futex_uaddr(struct robust_list __user *entry,
104299+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
104300 compat_long_t futex_offset)
104301 {
104302 compat_uptr_t base = ptr_to_compat(entry);
104303diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
104304index a744098..539f7b6 100644
104305--- a/kernel/gcov/base.c
104306+++ b/kernel/gcov/base.c
104307@@ -117,11 +117,6 @@ void gcov_enable_events(void)
104308 }
104309
104310 #ifdef CONFIG_MODULES
104311-static inline int within(void *addr, void *start, unsigned long size)
104312-{
104313- return ((addr >= start) && (addr < start + size));
104314-}
104315-
104316 /* Update list and generate events when modules are unloaded. */
104317 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104318 void *data)
104319@@ -136,7 +131,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104320
104321 /* Remove entries located in module from linked list. */
104322 while ((info = gcov_info_next(info))) {
104323- if (within(info, mod->module_core, mod->core_size)) {
104324+ if (within_module_core_rw((unsigned long)info, mod)) {
104325 gcov_info_unlink(prev, info);
104326 if (gcov_events_enabled)
104327 gcov_event(GCOV_REMOVE, info);
104328diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
104329index e68932b..2247e06 100644
104330--- a/kernel/irq/manage.c
104331+++ b/kernel/irq/manage.c
104332@@ -906,7 +906,7 @@ static int irq_thread(void *data)
104333
104334 action_ret = handler_fn(desc, action);
104335 if (action_ret == IRQ_HANDLED)
104336- atomic_inc(&desc->threads_handled);
104337+ atomic_inc_unchecked(&desc->threads_handled);
104338
104339 wake_threads_waitq(desc);
104340 }
104341diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
104342index e2514b0..de3dfe0 100644
104343--- a/kernel/irq/spurious.c
104344+++ b/kernel/irq/spurious.c
104345@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
104346 * count. We just care about the count being
104347 * different than the one we saw before.
104348 */
104349- handled = atomic_read(&desc->threads_handled);
104350+ handled = atomic_read_unchecked(&desc->threads_handled);
104351 handled |= SPURIOUS_DEFERRED;
104352 if (handled != desc->threads_handled_last) {
104353 action_ret = IRQ_HANDLED;
104354diff --git a/kernel/jump_label.c b/kernel/jump_label.c
104355index 9019f15..9a3c42e 100644
104356--- a/kernel/jump_label.c
104357+++ b/kernel/jump_label.c
104358@@ -14,6 +14,7 @@
104359 #include <linux/err.h>
104360 #include <linux/static_key.h>
104361 #include <linux/jump_label_ratelimit.h>
104362+#include <linux/mm.h>
104363
104364 #ifdef HAVE_JUMP_LABEL
104365
104366@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
104367
104368 size = (((unsigned long)stop - (unsigned long)start)
104369 / sizeof(struct jump_entry));
104370+ pax_open_kernel();
104371 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
104372+ pax_close_kernel();
104373 }
104374
104375 static void jump_label_update(struct static_key *key, int enable);
104376@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
104377 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
104378 struct jump_entry *iter;
104379
104380+ pax_open_kernel();
104381 for (iter = iter_start; iter < iter_stop; iter++) {
104382 if (within_module_init(iter->code, mod))
104383 iter->code = 0;
104384 }
104385+ pax_close_kernel();
104386 }
104387
104388 static int
104389diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
104390index 5c5987f..bc502b0 100644
104391--- a/kernel/kallsyms.c
104392+++ b/kernel/kallsyms.c
104393@@ -11,6 +11,9 @@
104394 * Changed the compression method from stem compression to "table lookup"
104395 * compression (see scripts/kallsyms.c for a more complete description)
104396 */
104397+#ifdef CONFIG_GRKERNSEC_HIDESYM
104398+#define __INCLUDED_BY_HIDESYM 1
104399+#endif
104400 #include <linux/kallsyms.h>
104401 #include <linux/module.h>
104402 #include <linux/init.h>
104403@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
104404
104405 static inline int is_kernel_inittext(unsigned long addr)
104406 {
104407+ if (system_state != SYSTEM_BOOTING)
104408+ return 0;
104409+
104410 if (addr >= (unsigned long)_sinittext
104411 && addr <= (unsigned long)_einittext)
104412 return 1;
104413 return 0;
104414 }
104415
104416+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104417+#ifdef CONFIG_MODULES
104418+static inline int is_module_text(unsigned long addr)
104419+{
104420+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
104421+ return 1;
104422+
104423+ addr = ktla_ktva(addr);
104424+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
104425+}
104426+#else
104427+static inline int is_module_text(unsigned long addr)
104428+{
104429+ return 0;
104430+}
104431+#endif
104432+#endif
104433+
104434 static inline int is_kernel_text(unsigned long addr)
104435 {
104436 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
104437@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
104438
104439 static inline int is_kernel(unsigned long addr)
104440 {
104441+
104442+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104443+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
104444+ return 1;
104445+
104446+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
104447+#else
104448 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
104449+#endif
104450+
104451 return 1;
104452 return in_gate_area_no_mm(addr);
104453 }
104454
104455 static int is_ksym_addr(unsigned long addr)
104456 {
104457+
104458+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104459+ if (is_module_text(addr))
104460+ return 0;
104461+#endif
104462+
104463 if (all_var)
104464 return is_kernel(addr);
104465
104466@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
104467
104468 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
104469 {
104470- iter->name[0] = '\0';
104471 iter->nameoff = get_symbol_offset(new_pos);
104472 iter->pos = new_pos;
104473 }
104474@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
104475 {
104476 struct kallsym_iter *iter = m->private;
104477
104478+#ifdef CONFIG_GRKERNSEC_HIDESYM
104479+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
104480+ return 0;
104481+#endif
104482+
104483 /* Some debugging symbols have no name. Ignore them. */
104484 if (!iter->name[0])
104485 return 0;
104486@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
104487 */
104488 type = iter->exported ? toupper(iter->type) :
104489 tolower(iter->type);
104490+
104491 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
104492 type, iter->name, iter->module_name);
104493 } else
104494diff --git a/kernel/kcmp.c b/kernel/kcmp.c
104495index 0aa69ea..a7fcafb 100644
104496--- a/kernel/kcmp.c
104497+++ b/kernel/kcmp.c
104498@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
104499 struct task_struct *task1, *task2;
104500 int ret;
104501
104502+#ifdef CONFIG_GRKERNSEC
104503+ return -ENOSYS;
104504+#endif
104505+
104506 rcu_read_lock();
104507
104508 /*
104509diff --git a/kernel/kexec.c b/kernel/kexec.c
104510index 7a36fdc..de8c4ed 100644
104511--- a/kernel/kexec.c
104512+++ b/kernel/kexec.c
104513@@ -1232,7 +1232,7 @@ static int kimage_load_segment(struct kimage *image,
104514 */
104515 struct kimage *kexec_image;
104516 struct kimage *kexec_crash_image;
104517-int kexec_load_disabled;
104518+int kexec_load_disabled __read_only;
104519
104520 static DEFINE_MUTEX(kexec_mutex);
104521
104522@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
104523 compat_ulong_t, flags)
104524 {
104525 struct compat_kexec_segment in;
104526- struct kexec_segment out, __user *ksegments;
104527+ struct kexec_segment out;
104528+ struct kexec_segment __user *ksegments;
104529 unsigned long i, result;
104530
104531 /* Don't allow clients that don't understand the native
104532diff --git a/kernel/kmod.c b/kernel/kmod.c
104533index 2777f40..a689506 100644
104534--- a/kernel/kmod.c
104535+++ b/kernel/kmod.c
104536@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
104537 kfree(info->argv);
104538 }
104539
104540-static int call_modprobe(char *module_name, int wait)
104541+static int call_modprobe(char *module_name, char *module_param, int wait)
104542 {
104543 struct subprocess_info *info;
104544 static char *envp[] = {
104545@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
104546 NULL
104547 };
104548
104549- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
104550+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
104551 if (!argv)
104552 goto out;
104553
104554@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
104555 argv[1] = "-q";
104556 argv[2] = "--";
104557 argv[3] = module_name; /* check free_modprobe_argv() */
104558- argv[4] = NULL;
104559+ argv[4] = module_param;
104560+ argv[5] = NULL;
104561
104562 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
104563 NULL, free_modprobe_argv, NULL);
104564@@ -122,9 +123,8 @@ out:
104565 * If module auto-loading support is disabled then this function
104566 * becomes a no-operation.
104567 */
104568-int __request_module(bool wait, const char *fmt, ...)
104569+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
104570 {
104571- va_list args;
104572 char module_name[MODULE_NAME_LEN];
104573 unsigned int max_modprobes;
104574 int ret;
104575@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
104576 if (!modprobe_path[0])
104577 return 0;
104578
104579- va_start(args, fmt);
104580- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
104581- va_end(args);
104582+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
104583 if (ret >= MODULE_NAME_LEN)
104584 return -ENAMETOOLONG;
104585
104586@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
104587 if (ret)
104588 return ret;
104589
104590+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104591+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104592+ /* hack to workaround consolekit/udisks stupidity */
104593+ read_lock(&tasklist_lock);
104594+ if (!strcmp(current->comm, "mount") &&
104595+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
104596+ read_unlock(&tasklist_lock);
104597+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
104598+ return -EPERM;
104599+ }
104600+ read_unlock(&tasklist_lock);
104601+ }
104602+#endif
104603+
104604 /* If modprobe needs a service that is in a module, we get a recursive
104605 * loop. Limit the number of running kmod threads to max_threads/2 or
104606 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
104607@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
104608
104609 trace_module_request(module_name, wait, _RET_IP_);
104610
104611- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104612+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104613
104614 atomic_dec(&kmod_concurrent);
104615 return ret;
104616 }
104617+
104618+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
104619+{
104620+ va_list args;
104621+ int ret;
104622+
104623+ va_start(args, fmt);
104624+ ret = ____request_module(wait, module_param, fmt, args);
104625+ va_end(args);
104626+
104627+ return ret;
104628+}
104629+
104630+int __request_module(bool wait, const char *fmt, ...)
104631+{
104632+ va_list args;
104633+ int ret;
104634+
104635+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104636+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104637+ char module_param[MODULE_NAME_LEN];
104638+
104639+ memset(module_param, 0, sizeof(module_param));
104640+
104641+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
104642+
104643+ va_start(args, fmt);
104644+ ret = ____request_module(wait, module_param, fmt, args);
104645+ va_end(args);
104646+
104647+ return ret;
104648+ }
104649+#endif
104650+
104651+ va_start(args, fmt);
104652+ ret = ____request_module(wait, NULL, fmt, args);
104653+ va_end(args);
104654+
104655+ return ret;
104656+}
104657+
104658 EXPORT_SYMBOL(__request_module);
104659 #endif /* CONFIG_MODULES */
104660
104661 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
104662 {
104663+#ifdef CONFIG_GRKERNSEC
104664+ kfree(info->path);
104665+ info->path = info->origpath;
104666+#endif
104667 if (info->cleanup)
104668 (*info->cleanup)(info);
104669 kfree(info);
104670@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
104671 */
104672 set_user_nice(current, 0);
104673
104674+#ifdef CONFIG_GRKERNSEC
104675+ /* this is race-free as far as userland is concerned as we copied
104676+ out the path to be used prior to this point and are now operating
104677+ on that copy
104678+ */
104679+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
104680+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
104681+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
104682+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
104683+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
104684+ retval = -EPERM;
104685+ goto out;
104686+ }
104687+#endif
104688+
104689 retval = -ENOMEM;
104690 new = prepare_kernel_cred(current);
104691 if (!new)
104692@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
104693 commit_creds(new);
104694
104695 retval = do_execve(getname_kernel(sub_info->path),
104696- (const char __user *const __user *)sub_info->argv,
104697- (const char __user *const __user *)sub_info->envp);
104698+ (const char __user *const __force_user *)sub_info->argv,
104699+ (const char __user *const __force_user *)sub_info->envp);
104700 out:
104701 sub_info->retval = retval;
104702 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
104703@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
104704 *
104705 * Thus the __user pointer cast is valid here.
104706 */
104707- sys_wait4(pid, (int __user *)&ret, 0, NULL);
104708+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
104709
104710 /*
104711 * If ret is 0, either ____call_usermodehelper failed and the
104712@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
104713 goto out;
104714
104715 INIT_WORK(&sub_info->work, __call_usermodehelper);
104716+#ifdef CONFIG_GRKERNSEC
104717+ sub_info->origpath = path;
104718+ sub_info->path = kstrdup(path, gfp_mask);
104719+#else
104720 sub_info->path = path;
104721+#endif
104722 sub_info->argv = argv;
104723 sub_info->envp = envp;
104724
104725@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
104726 static int proc_cap_handler(struct ctl_table *table, int write,
104727 void __user *buffer, size_t *lenp, loff_t *ppos)
104728 {
104729- struct ctl_table t;
104730+ ctl_table_no_const t;
104731 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
104732 kernel_cap_t new_cap;
104733 int err, i;
104734diff --git a/kernel/kprobes.c b/kernel/kprobes.c
104735index c90e417..e6c515d 100644
104736--- a/kernel/kprobes.c
104737+++ b/kernel/kprobes.c
104738@@ -31,6 +31,9 @@
104739 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
104740 * <prasanna@in.ibm.com> added function-return probes.
104741 */
104742+#ifdef CONFIG_GRKERNSEC_HIDESYM
104743+#define __INCLUDED_BY_HIDESYM 1
104744+#endif
104745 #include <linux/kprobes.h>
104746 #include <linux/hash.h>
104747 #include <linux/init.h>
104748@@ -122,12 +125,12 @@ enum kprobe_slot_state {
104749
104750 static void *alloc_insn_page(void)
104751 {
104752- return module_alloc(PAGE_SIZE);
104753+ return module_alloc_exec(PAGE_SIZE);
104754 }
104755
104756 static void free_insn_page(void *page)
104757 {
104758- module_memfree(page);
104759+ module_memfree_exec(page);
104760 }
104761
104762 struct kprobe_insn_cache kprobe_insn_slots = {
104763@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
104764 kprobe_type = "k";
104765
104766 if (sym)
104767- seq_printf(pi, "%p %s %s+0x%x %s ",
104768+ seq_printf(pi, "%pK %s %s+0x%x %s ",
104769 p->addr, kprobe_type, sym, offset,
104770 (modname ? modname : " "));
104771 else
104772- seq_printf(pi, "%p %s %p ",
104773+ seq_printf(pi, "%pK %s %pK ",
104774 p->addr, kprobe_type, p->addr);
104775
104776 if (!pp)
104777diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
104778index 6683cce..daf8999 100644
104779--- a/kernel/ksysfs.c
104780+++ b/kernel/ksysfs.c
104781@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
104782 {
104783 if (count+1 > UEVENT_HELPER_PATH_LEN)
104784 return -ENOENT;
104785+ if (!capable(CAP_SYS_ADMIN))
104786+ return -EPERM;
104787 memcpy(uevent_helper, buf, count);
104788 uevent_helper[count] = '\0';
104789 if (count && uevent_helper[count-1] == '\n')
104790@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
104791 return count;
104792 }
104793
104794-static struct bin_attribute notes_attr = {
104795+static bin_attribute_no_const notes_attr __read_only = {
104796 .attr = {
104797 .name = "notes",
104798 .mode = S_IRUGO,
104799diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
104800index aaeae88..10f3663 100644
104801--- a/kernel/locking/lockdep.c
104802+++ b/kernel/locking/lockdep.c
104803@@ -613,6 +613,10 @@ static int static_obj(void *obj)
104804 end = (unsigned long) &_end,
104805 addr = (unsigned long) obj;
104806
104807+#ifdef CONFIG_PAX_KERNEXEC
104808+ start = ktla_ktva(start);
104809+#endif
104810+
104811 /*
104812 * static variable?
104813 */
104814@@ -757,6 +761,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
104815 if (!static_obj(lock->key)) {
104816 debug_locks_off();
104817 printk("INFO: trying to register non-static key.\n");
104818+ printk("lock:%pS key:%pS.\n", lock, lock->key);
104819 printk("the code is fine but needs lockdep annotation.\n");
104820 printk("turning off the locking correctness validator.\n");
104821 dump_stack();
104822@@ -3102,7 +3107,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
104823 if (!class)
104824 return 0;
104825 }
104826- atomic_inc((atomic_t *)&class->ops);
104827+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
104828 if (very_verbose(class)) {
104829 printk("\nacquire class [%p] %s", class->key, class->name);
104830 if (class->name_version > 1)
104831diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
104832index d83d798..ea3120d 100644
104833--- a/kernel/locking/lockdep_proc.c
104834+++ b/kernel/locking/lockdep_proc.c
104835@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
104836 return 0;
104837 }
104838
104839- seq_printf(m, "%p", class->key);
104840+ seq_printf(m, "%pK", class->key);
104841 #ifdef CONFIG_DEBUG_LOCKDEP
104842 seq_printf(m, " OPS:%8ld", class->ops);
104843 #endif
104844@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
104845
104846 list_for_each_entry(entry, &class->locks_after, entry) {
104847 if (entry->distance == 1) {
104848- seq_printf(m, " -> [%p] ", entry->class->key);
104849+ seq_printf(m, " -> [%pK] ", entry->class->key);
104850 print_name(m, entry->class);
104851 seq_puts(m, "\n");
104852 }
104853@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
104854 if (!class->key)
104855 continue;
104856
104857- seq_printf(m, "[%p] ", class->key);
104858+ seq_printf(m, "[%pK] ", class->key);
104859 print_name(m, class);
104860 seq_puts(m, "\n");
104861 }
104862@@ -508,7 +508,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
104863 if (!i)
104864 seq_line(m, '-', 40-namelen, namelen);
104865
104866- snprintf(ip, sizeof(ip), "[<%p>]",
104867+ snprintf(ip, sizeof(ip), "[<%pK>]",
104868 (void *)class->contention_point[i]);
104869 seq_printf(m, "%40s %14lu %29s %pS\n",
104870 name, stats->contention_point[i],
104871@@ -523,7 +523,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
104872 if (!i)
104873 seq_line(m, '-', 40-namelen, namelen);
104874
104875- snprintf(ip, sizeof(ip), "[<%p>]",
104876+ snprintf(ip, sizeof(ip), "[<%pK>]",
104877 (void *)class->contending_point[i]);
104878 seq_printf(m, "%40s %14lu %29s %pS\n",
104879 name, stats->contending_point[i],
104880diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
104881index 3ef3736..9c951fa 100644
104882--- a/kernel/locking/mutex-debug.c
104883+++ b/kernel/locking/mutex-debug.c
104884@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
104885 }
104886
104887 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
104888- struct thread_info *ti)
104889+ struct task_struct *task)
104890 {
104891 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
104892
104893 /* Mark the current thread as blocked on the lock: */
104894- ti->task->blocked_on = waiter;
104895+ task->blocked_on = waiter;
104896 }
104897
104898 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
104899- struct thread_info *ti)
104900+ struct task_struct *task)
104901 {
104902 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
104903- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
104904- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
104905- ti->task->blocked_on = NULL;
104906+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
104907+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
104908+ task->blocked_on = NULL;
104909
104910 list_del_init(&waiter->list);
104911 waiter->task = NULL;
104912diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
104913index 0799fd3..d06ae3b 100644
104914--- a/kernel/locking/mutex-debug.h
104915+++ b/kernel/locking/mutex-debug.h
104916@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
104917 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
104918 extern void debug_mutex_add_waiter(struct mutex *lock,
104919 struct mutex_waiter *waiter,
104920- struct thread_info *ti);
104921+ struct task_struct *task);
104922 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
104923- struct thread_info *ti);
104924+ struct task_struct *task);
104925 extern void debug_mutex_unlock(struct mutex *lock);
104926 extern void debug_mutex_init(struct mutex *lock, const char *name,
104927 struct lock_class_key *key);
104928diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
104929index 4cccea6..4382db9 100644
104930--- a/kernel/locking/mutex.c
104931+++ b/kernel/locking/mutex.c
104932@@ -533,7 +533,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
104933 goto skip_wait;
104934
104935 debug_mutex_lock_common(lock, &waiter);
104936- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
104937+ debug_mutex_add_waiter(lock, &waiter, task);
104938
104939 /* add waiting tasks to the end of the waitqueue (FIFO): */
104940 list_add_tail(&waiter.list, &lock->wait_list);
104941@@ -580,7 +580,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
104942 }
104943 __set_task_state(task, TASK_RUNNING);
104944
104945- mutex_remove_waiter(lock, &waiter, current_thread_info());
104946+ mutex_remove_waiter(lock, &waiter, task);
104947 /* set it to 0 if there are no waiters left: */
104948 if (likely(list_empty(&lock->wait_list)))
104949 atomic_set(&lock->count, 0);
104950@@ -601,7 +601,7 @@ skip_wait:
104951 return 0;
104952
104953 err:
104954- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
104955+ mutex_remove_waiter(lock, &waiter, task);
104956 spin_unlock_mutex(&lock->wait_lock, flags);
104957 debug_mutex_free_waiter(&waiter);
104958 mutex_release(&lock->dep_map, 1, ip);
104959diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
104960index 1d96dd0..994ff19 100644
104961--- a/kernel/locking/rtmutex-tester.c
104962+++ b/kernel/locking/rtmutex-tester.c
104963@@ -22,7 +22,7 @@
104964 #define MAX_RT_TEST_MUTEXES 8
104965
104966 static spinlock_t rttest_lock;
104967-static atomic_t rttest_event;
104968+static atomic_unchecked_t rttest_event;
104969
104970 struct test_thread_data {
104971 int opcode;
104972@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
104973
104974 case RTTEST_LOCKCONT:
104975 td->mutexes[td->opdata] = 1;
104976- td->event = atomic_add_return(1, &rttest_event);
104977+ td->event = atomic_add_return_unchecked(1, &rttest_event);
104978 return 0;
104979
104980 case RTTEST_RESET:
104981@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
104982 return 0;
104983
104984 case RTTEST_RESETEVENT:
104985- atomic_set(&rttest_event, 0);
104986+ atomic_set_unchecked(&rttest_event, 0);
104987 return 0;
104988
104989 default:
104990@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
104991 return ret;
104992
104993 td->mutexes[id] = 1;
104994- td->event = atomic_add_return(1, &rttest_event);
104995+ td->event = atomic_add_return_unchecked(1, &rttest_event);
104996 rt_mutex_lock(&mutexes[id]);
104997- td->event = atomic_add_return(1, &rttest_event);
104998+ td->event = atomic_add_return_unchecked(1, &rttest_event);
104999 td->mutexes[id] = 4;
105000 return 0;
105001
105002@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105003 return ret;
105004
105005 td->mutexes[id] = 1;
105006- td->event = atomic_add_return(1, &rttest_event);
105007+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105008 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
105009- td->event = atomic_add_return(1, &rttest_event);
105010+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105011 td->mutexes[id] = ret ? 0 : 4;
105012 return ret ? -EINTR : 0;
105013
105014@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105015 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
105016 return ret;
105017
105018- td->event = atomic_add_return(1, &rttest_event);
105019+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105020 rt_mutex_unlock(&mutexes[id]);
105021- td->event = atomic_add_return(1, &rttest_event);
105022+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105023 td->mutexes[id] = 0;
105024 return 0;
105025
105026@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105027 break;
105028
105029 td->mutexes[dat] = 2;
105030- td->event = atomic_add_return(1, &rttest_event);
105031+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105032 break;
105033
105034 default:
105035@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105036 return;
105037
105038 td->mutexes[dat] = 3;
105039- td->event = atomic_add_return(1, &rttest_event);
105040+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105041 break;
105042
105043 case RTTEST_LOCKNOWAIT:
105044@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105045 return;
105046
105047 td->mutexes[dat] = 1;
105048- td->event = atomic_add_return(1, &rttest_event);
105049+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105050 return;
105051
105052 default:
105053diff --git a/kernel/module.c b/kernel/module.c
105054index cfc9e84..a058697 100644
105055--- a/kernel/module.c
105056+++ b/kernel/module.c
105057@@ -59,6 +59,7 @@
105058 #include <linux/jump_label.h>
105059 #include <linux/pfn.h>
105060 #include <linux/bsearch.h>
105061+#include <linux/grsecurity.h>
105062 #include <uapi/linux/module.h>
105063 #include "module-internal.h"
105064
105065@@ -145,7 +146,7 @@ module_param(sig_enforce, bool_enable_only, 0644);
105066 #endif /* CONFIG_MODULE_SIG */
105067
105068 /* Block module loading/unloading? */
105069-int modules_disabled = 0;
105070+int modules_disabled __read_only = 0;
105071 core_param(nomodule, modules_disabled, bint, 0);
105072
105073 /* Waiting for a module to finish initializing? */
105074@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
105075
105076 /* Bounds of module allocation, for speeding __module_address.
105077 * Protected by module_mutex. */
105078-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
105079+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
105080+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
105081
105082 int register_module_notifier(struct notifier_block *nb)
105083 {
105084@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105085 return true;
105086
105087 list_for_each_entry_rcu(mod, &modules, list) {
105088- struct symsearch arr[] = {
105089+ struct symsearch modarr[] = {
105090 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
105091 NOT_GPL_ONLY, false },
105092 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
105093@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105094 if (mod->state == MODULE_STATE_UNFORMED)
105095 continue;
105096
105097- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
105098+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
105099 return true;
105100 }
105101 return false;
105102@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
105103 if (!pcpusec->sh_size)
105104 return 0;
105105
105106- if (align > PAGE_SIZE) {
105107+ if (align-1 >= PAGE_SIZE) {
105108 pr_warn("%s: per-cpu alignment %li > %li\n",
105109 mod->name, align, PAGE_SIZE);
105110 align = PAGE_SIZE;
105111@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
105112 static ssize_t show_coresize(struct module_attribute *mattr,
105113 struct module_kobject *mk, char *buffer)
105114 {
105115- return sprintf(buffer, "%u\n", mk->mod->core_size);
105116+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
105117 }
105118
105119 static struct module_attribute modinfo_coresize =
105120@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
105121 static ssize_t show_initsize(struct module_attribute *mattr,
105122 struct module_kobject *mk, char *buffer)
105123 {
105124- return sprintf(buffer, "%u\n", mk->mod->init_size);
105125+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
105126 }
105127
105128 static struct module_attribute modinfo_initsize =
105129@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
105130 goto bad_version;
105131 }
105132
105133+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105134+ /*
105135+ * avoid potentially printing jibberish on attempted load
105136+ * of a module randomized with a different seed
105137+ */
105138+ pr_warn("no symbol version for %s\n", symname);
105139+#else
105140 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
105141+#endif
105142 return 0;
105143
105144 bad_version:
105145+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105146+ /*
105147+ * avoid potentially printing jibberish on attempted load
105148+ * of a module randomized with a different seed
105149+ */
105150+ pr_warn("attempted module disagrees about version of symbol %s\n",
105151+ symname);
105152+#else
105153 pr_warn("%s: disagrees about version of symbol %s\n",
105154 mod->name, symname);
105155+#endif
105156 return 0;
105157 }
105158
105159@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
105160 */
105161 #ifdef CONFIG_SYSFS
105162
105163-#ifdef CONFIG_KALLSYMS
105164+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
105165 static inline bool sect_empty(const Elf_Shdr *sect)
105166 {
105167 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
105168@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
105169 {
105170 unsigned int notes, loaded, i;
105171 struct module_notes_attrs *notes_attrs;
105172- struct bin_attribute *nattr;
105173+ bin_attribute_no_const *nattr;
105174
105175 /* failed to create section attributes, so can't create notes */
105176 if (!mod->sect_attrs)
105177@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
105178 static int module_add_modinfo_attrs(struct module *mod)
105179 {
105180 struct module_attribute *attr;
105181- struct module_attribute *temp_attr;
105182+ module_attribute_no_const *temp_attr;
105183 int error = 0;
105184 int i;
105185
105186@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
105187
105188 static void unset_module_core_ro_nx(struct module *mod)
105189 {
105190- set_page_attributes(mod->module_core + mod->core_text_size,
105191- mod->module_core + mod->core_size,
105192+ set_page_attributes(mod->module_core_rw,
105193+ mod->module_core_rw + mod->core_size_rw,
105194 set_memory_x);
105195- set_page_attributes(mod->module_core,
105196- mod->module_core + mod->core_ro_size,
105197+ set_page_attributes(mod->module_core_rx,
105198+ mod->module_core_rx + mod->core_size_rx,
105199 set_memory_rw);
105200 }
105201
105202 static void unset_module_init_ro_nx(struct module *mod)
105203 {
105204- set_page_attributes(mod->module_init + mod->init_text_size,
105205- mod->module_init + mod->init_size,
105206+ set_page_attributes(mod->module_init_rw,
105207+ mod->module_init_rw + mod->init_size_rw,
105208 set_memory_x);
105209- set_page_attributes(mod->module_init,
105210- mod->module_init + mod->init_ro_size,
105211+ set_page_attributes(mod->module_init_rx,
105212+ mod->module_init_rx + mod->init_size_rx,
105213 set_memory_rw);
105214 }
105215
105216@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
105217 list_for_each_entry_rcu(mod, &modules, list) {
105218 if (mod->state == MODULE_STATE_UNFORMED)
105219 continue;
105220- if ((mod->module_core) && (mod->core_text_size)) {
105221- set_page_attributes(mod->module_core,
105222- mod->module_core + mod->core_text_size,
105223+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105224+ set_page_attributes(mod->module_core_rx,
105225+ mod->module_core_rx + mod->core_size_rx,
105226 set_memory_rw);
105227 }
105228- if ((mod->module_init) && (mod->init_text_size)) {
105229- set_page_attributes(mod->module_init,
105230- mod->module_init + mod->init_text_size,
105231+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105232+ set_page_attributes(mod->module_init_rx,
105233+ mod->module_init_rx + mod->init_size_rx,
105234 set_memory_rw);
105235 }
105236 }
105237@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
105238 list_for_each_entry_rcu(mod, &modules, list) {
105239 if (mod->state == MODULE_STATE_UNFORMED)
105240 continue;
105241- if ((mod->module_core) && (mod->core_text_size)) {
105242- set_page_attributes(mod->module_core,
105243- mod->module_core + mod->core_text_size,
105244+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105245+ set_page_attributes(mod->module_core_rx,
105246+ mod->module_core_rx + mod->core_size_rx,
105247 set_memory_ro);
105248 }
105249- if ((mod->module_init) && (mod->init_text_size)) {
105250- set_page_attributes(mod->module_init,
105251- mod->module_init + mod->init_text_size,
105252+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105253+ set_page_attributes(mod->module_init_rx,
105254+ mod->module_init_rx + mod->init_size_rx,
105255 set_memory_ro);
105256 }
105257 }
105258@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
105259 #else
105260 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
105261 static void unset_module_core_ro_nx(struct module *mod) { }
105262-static void unset_module_init_ro_nx(struct module *mod) { }
105263+static void unset_module_init_ro_nx(struct module *mod)
105264+{
105265+
105266+#ifdef CONFIG_PAX_KERNEXEC
105267+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105268+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105269+#endif
105270+
105271+}
105272 #endif
105273
105274 void __weak module_memfree(void *module_region)
105275@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
105276 /* This may be NULL, but that's OK */
105277 unset_module_init_ro_nx(mod);
105278 module_arch_freeing_init(mod);
105279- module_memfree(mod->module_init);
105280+ module_memfree(mod->module_init_rw);
105281+ module_memfree_exec(mod->module_init_rx);
105282 kfree(mod->args);
105283 percpu_modfree(mod);
105284
105285 /* Free lock-classes; relies on the preceding sync_rcu(). */
105286- lockdep_free_key_range(mod->module_core, mod->core_size);
105287+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
105288+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
105289
105290 /* Finally, free the core (containing the module structure) */
105291 unset_module_core_ro_nx(mod);
105292- module_memfree(mod->module_core);
105293+ module_memfree_exec(mod->module_core_rx);
105294+ module_memfree(mod->module_core_rw);
105295
105296 #ifdef CONFIG_MPU
105297 update_protections(current->mm);
105298@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105299 int ret = 0;
105300 const struct kernel_symbol *ksym;
105301
105302+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105303+ int is_fs_load = 0;
105304+ int register_filesystem_found = 0;
105305+ char *p;
105306+
105307+ p = strstr(mod->args, "grsec_modharden_fs");
105308+ if (p) {
105309+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
105310+ /* copy \0 as well */
105311+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
105312+ is_fs_load = 1;
105313+ }
105314+#endif
105315+
105316 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
105317 const char *name = info->strtab + sym[i].st_name;
105318
105319+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105320+ /* it's a real shame this will never get ripped and copied
105321+ upstream! ;(
105322+ */
105323+ if (is_fs_load && !strcmp(name, "register_filesystem"))
105324+ register_filesystem_found = 1;
105325+#endif
105326+
105327 switch (sym[i].st_shndx) {
105328 case SHN_COMMON:
105329 /* Ignore common symbols */
105330@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105331 ksym = resolve_symbol_wait(mod, info, name);
105332 /* Ok if resolved. */
105333 if (ksym && !IS_ERR(ksym)) {
105334+ pax_open_kernel();
105335 sym[i].st_value = ksym->value;
105336+ pax_close_kernel();
105337 break;
105338 }
105339
105340@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105341 secbase = (unsigned long)mod_percpu(mod);
105342 else
105343 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
105344+ pax_open_kernel();
105345 sym[i].st_value += secbase;
105346+ pax_close_kernel();
105347 break;
105348 }
105349 }
105350
105351+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105352+ if (is_fs_load && !register_filesystem_found) {
105353+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
105354+ ret = -EPERM;
105355+ }
105356+#endif
105357+
105358 return ret;
105359 }
105360
105361@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
105362 || s->sh_entsize != ~0UL
105363 || strstarts(sname, ".init"))
105364 continue;
105365- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
105366+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105367+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
105368+ else
105369+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
105370 pr_debug("\t%s\n", sname);
105371 }
105372- switch (m) {
105373- case 0: /* executable */
105374- mod->core_size = debug_align(mod->core_size);
105375- mod->core_text_size = mod->core_size;
105376- break;
105377- case 1: /* RO: text and ro-data */
105378- mod->core_size = debug_align(mod->core_size);
105379- mod->core_ro_size = mod->core_size;
105380- break;
105381- case 3: /* whole core */
105382- mod->core_size = debug_align(mod->core_size);
105383- break;
105384- }
105385 }
105386
105387 pr_debug("Init section allocation order:\n");
105388@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
105389 || s->sh_entsize != ~0UL
105390 || !strstarts(sname, ".init"))
105391 continue;
105392- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
105393- | INIT_OFFSET_MASK);
105394+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105395+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
105396+ else
105397+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
105398+ s->sh_entsize |= INIT_OFFSET_MASK;
105399 pr_debug("\t%s\n", sname);
105400 }
105401- switch (m) {
105402- case 0: /* executable */
105403- mod->init_size = debug_align(mod->init_size);
105404- mod->init_text_size = mod->init_size;
105405- break;
105406- case 1: /* RO: text and ro-data */
105407- mod->init_size = debug_align(mod->init_size);
105408- mod->init_ro_size = mod->init_size;
105409- break;
105410- case 3: /* whole init */
105411- mod->init_size = debug_align(mod->init_size);
105412- break;
105413- }
105414 }
105415 }
105416
105417@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105418
105419 /* Put symbol section at end of init part of module. */
105420 symsect->sh_flags |= SHF_ALLOC;
105421- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
105422+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
105423 info->index.sym) | INIT_OFFSET_MASK;
105424 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
105425
105426@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105427 }
105428
105429 /* Append room for core symbols at end of core part. */
105430- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
105431- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
105432- mod->core_size += strtab_size;
105433- mod->core_size = debug_align(mod->core_size);
105434+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
105435+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
105436+ mod->core_size_rx += strtab_size;
105437+ mod->core_size_rx = debug_align(mod->core_size_rx);
105438
105439 /* Put string table section at end of init part of module. */
105440 strsect->sh_flags |= SHF_ALLOC;
105441- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
105442+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
105443 info->index.str) | INIT_OFFSET_MASK;
105444- mod->init_size = debug_align(mod->init_size);
105445+ mod->init_size_rx = debug_align(mod->init_size_rx);
105446 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
105447 }
105448
105449@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105450 /* Make sure we get permanent strtab: don't use info->strtab. */
105451 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
105452
105453+ pax_open_kernel();
105454+
105455 /* Set types up while we still have access to sections. */
105456 for (i = 0; i < mod->num_symtab; i++)
105457 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
105458
105459- mod->core_symtab = dst = mod->module_core + info->symoffs;
105460- mod->core_strtab = s = mod->module_core + info->stroffs;
105461+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
105462+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
105463 src = mod->symtab;
105464 for (ndst = i = 0; i < mod->num_symtab; i++) {
105465 if (i == 0 ||
105466@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105467 }
105468 }
105469 mod->core_num_syms = ndst;
105470+
105471+ pax_close_kernel();
105472 }
105473 #else
105474 static inline void layout_symtab(struct module *mod, struct load_info *info)
105475@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
105476 return vmalloc_exec(size);
105477 }
105478
105479-static void *module_alloc_update_bounds(unsigned long size)
105480+static void *module_alloc_update_bounds_rw(unsigned long size)
105481 {
105482 void *ret = module_alloc(size);
105483
105484 if (ret) {
105485 mutex_lock(&module_mutex);
105486 /* Update module bounds. */
105487- if ((unsigned long)ret < module_addr_min)
105488- module_addr_min = (unsigned long)ret;
105489- if ((unsigned long)ret + size > module_addr_max)
105490- module_addr_max = (unsigned long)ret + size;
105491+ if ((unsigned long)ret < module_addr_min_rw)
105492+ module_addr_min_rw = (unsigned long)ret;
105493+ if ((unsigned long)ret + size > module_addr_max_rw)
105494+ module_addr_max_rw = (unsigned long)ret + size;
105495+ mutex_unlock(&module_mutex);
105496+ }
105497+ return ret;
105498+}
105499+
105500+static void *module_alloc_update_bounds_rx(unsigned long size)
105501+{
105502+ void *ret = module_alloc_exec(size);
105503+
105504+ if (ret) {
105505+ mutex_lock(&module_mutex);
105506+ /* Update module bounds. */
105507+ if ((unsigned long)ret < module_addr_min_rx)
105508+ module_addr_min_rx = (unsigned long)ret;
105509+ if ((unsigned long)ret + size > module_addr_max_rx)
105510+ module_addr_max_rx = (unsigned long)ret + size;
105511 mutex_unlock(&module_mutex);
105512 }
105513 return ret;
105514@@ -2666,7 +2729,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105515 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
105516
105517 if (info->index.sym == 0) {
105518+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105519+ /*
105520+ * avoid potentially printing jibberish on attempted load
105521+ * of a module randomized with a different seed
105522+ */
105523+ pr_warn("module has no symbols (stripped?)\n");
105524+#else
105525 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
105526+#endif
105527 return ERR_PTR(-ENOEXEC);
105528 }
105529
105530@@ -2682,8 +2753,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105531 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105532 {
105533 const char *modmagic = get_modinfo(info, "vermagic");
105534+ const char *license = get_modinfo(info, "license");
105535 int err;
105536
105537+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
105538+ if (!license || !license_is_gpl_compatible(license))
105539+ return -ENOEXEC;
105540+#endif
105541+
105542 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
105543 modmagic = NULL;
105544
105545@@ -2708,7 +2785,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105546 }
105547
105548 /* Set up license info based on the info section */
105549- set_license(mod, get_modinfo(info, "license"));
105550+ set_license(mod, license);
105551
105552 return 0;
105553 }
105554@@ -2805,7 +2882,7 @@ static int move_module(struct module *mod, struct load_info *info)
105555 void *ptr;
105556
105557 /* Do the allocs. */
105558- ptr = module_alloc_update_bounds(mod->core_size);
105559+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
105560 /*
105561 * The pointer to this block is stored in the module structure
105562 * which is inside the block. Just mark it as not being a
105563@@ -2815,11 +2892,11 @@ static int move_module(struct module *mod, struct load_info *info)
105564 if (!ptr)
105565 return -ENOMEM;
105566
105567- memset(ptr, 0, mod->core_size);
105568- mod->module_core = ptr;
105569+ memset(ptr, 0, mod->core_size_rw);
105570+ mod->module_core_rw = ptr;
105571
105572- if (mod->init_size) {
105573- ptr = module_alloc_update_bounds(mod->init_size);
105574+ if (mod->init_size_rw) {
105575+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
105576 /*
105577 * The pointer to this block is stored in the module structure
105578 * which is inside the block. This block doesn't need to be
105579@@ -2828,13 +2905,45 @@ static int move_module(struct module *mod, struct load_info *info)
105580 */
105581 kmemleak_ignore(ptr);
105582 if (!ptr) {
105583- module_memfree(mod->module_core);
105584+ module_memfree(mod->module_core_rw);
105585 return -ENOMEM;
105586 }
105587- memset(ptr, 0, mod->init_size);
105588- mod->module_init = ptr;
105589+ memset(ptr, 0, mod->init_size_rw);
105590+ mod->module_init_rw = ptr;
105591 } else
105592- mod->module_init = NULL;
105593+ mod->module_init_rw = NULL;
105594+
105595+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
105596+ kmemleak_not_leak(ptr);
105597+ if (!ptr) {
105598+ if (mod->module_init_rw)
105599+ module_memfree(mod->module_init_rw);
105600+ module_memfree(mod->module_core_rw);
105601+ return -ENOMEM;
105602+ }
105603+
105604+ pax_open_kernel();
105605+ memset(ptr, 0, mod->core_size_rx);
105606+ pax_close_kernel();
105607+ mod->module_core_rx = ptr;
105608+
105609+ if (mod->init_size_rx) {
105610+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
105611+ kmemleak_ignore(ptr);
105612+ if (!ptr && mod->init_size_rx) {
105613+ module_memfree_exec(mod->module_core_rx);
105614+ if (mod->module_init_rw)
105615+ module_memfree(mod->module_init_rw);
105616+ module_memfree(mod->module_core_rw);
105617+ return -ENOMEM;
105618+ }
105619+
105620+ pax_open_kernel();
105621+ memset(ptr, 0, mod->init_size_rx);
105622+ pax_close_kernel();
105623+ mod->module_init_rx = ptr;
105624+ } else
105625+ mod->module_init_rx = NULL;
105626
105627 /* Transfer each section which specifies SHF_ALLOC */
105628 pr_debug("final section addresses:\n");
105629@@ -2845,16 +2954,45 @@ static int move_module(struct module *mod, struct load_info *info)
105630 if (!(shdr->sh_flags & SHF_ALLOC))
105631 continue;
105632
105633- if (shdr->sh_entsize & INIT_OFFSET_MASK)
105634- dest = mod->module_init
105635- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105636- else
105637- dest = mod->module_core + shdr->sh_entsize;
105638+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
105639+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105640+ dest = mod->module_init_rw
105641+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105642+ else
105643+ dest = mod->module_init_rx
105644+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105645+ } else {
105646+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105647+ dest = mod->module_core_rw + shdr->sh_entsize;
105648+ else
105649+ dest = mod->module_core_rx + shdr->sh_entsize;
105650+ }
105651+
105652+ if (shdr->sh_type != SHT_NOBITS) {
105653+
105654+#ifdef CONFIG_PAX_KERNEXEC
105655+#ifdef CONFIG_X86_64
105656+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
105657+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
105658+#endif
105659+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
105660+ pax_open_kernel();
105661+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105662+ pax_close_kernel();
105663+ } else
105664+#endif
105665
105666- if (shdr->sh_type != SHT_NOBITS)
105667 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105668+ }
105669 /* Update sh_addr to point to copy in image. */
105670- shdr->sh_addr = (unsigned long)dest;
105671+
105672+#ifdef CONFIG_PAX_KERNEXEC
105673+ if (shdr->sh_flags & SHF_EXECINSTR)
105674+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
105675+ else
105676+#endif
105677+
105678+ shdr->sh_addr = (unsigned long)dest;
105679 pr_debug("\t0x%lx %s\n",
105680 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
105681 }
105682@@ -2911,12 +3049,12 @@ static void flush_module_icache(const struct module *mod)
105683 * Do it before processing of module parameters, so the module
105684 * can provide parameter accessor functions of its own.
105685 */
105686- if (mod->module_init)
105687- flush_icache_range((unsigned long)mod->module_init,
105688- (unsigned long)mod->module_init
105689- + mod->init_size);
105690- flush_icache_range((unsigned long)mod->module_core,
105691- (unsigned long)mod->module_core + mod->core_size);
105692+ if (mod->module_init_rx)
105693+ flush_icache_range((unsigned long)mod->module_init_rx,
105694+ (unsigned long)mod->module_init_rx
105695+ + mod->init_size_rx);
105696+ flush_icache_range((unsigned long)mod->module_core_rx,
105697+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
105698
105699 set_fs(old_fs);
105700 }
105701@@ -2974,8 +3112,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
105702 {
105703 percpu_modfree(mod);
105704 module_arch_freeing_init(mod);
105705- module_memfree(mod->module_init);
105706- module_memfree(mod->module_core);
105707+ module_memfree_exec(mod->module_init_rx);
105708+ module_memfree_exec(mod->module_core_rx);
105709+ module_memfree(mod->module_init_rw);
105710+ module_memfree(mod->module_core_rw);
105711 }
105712
105713 int __weak module_finalize(const Elf_Ehdr *hdr,
105714@@ -2988,7 +3128,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
105715 static int post_relocation(struct module *mod, const struct load_info *info)
105716 {
105717 /* Sort exception table now relocations are done. */
105718+ pax_open_kernel();
105719 sort_extable(mod->extable, mod->extable + mod->num_exentries);
105720+ pax_close_kernel();
105721
105722 /* Copy relocated percpu area over. */
105723 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
105724@@ -3036,13 +3178,15 @@ static void do_mod_ctors(struct module *mod)
105725 /* For freeing module_init on success, in case kallsyms traversing */
105726 struct mod_initfree {
105727 struct rcu_head rcu;
105728- void *module_init;
105729+ void *module_init_rw;
105730+ void *module_init_rx;
105731 };
105732
105733 static void do_free_init(struct rcu_head *head)
105734 {
105735 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
105736- module_memfree(m->module_init);
105737+ module_memfree(m->module_init_rw);
105738+ module_memfree_exec(m->module_init_rx);
105739 kfree(m);
105740 }
105741
105742@@ -3062,7 +3206,8 @@ static noinline int do_init_module(struct module *mod)
105743 ret = -ENOMEM;
105744 goto fail;
105745 }
105746- freeinit->module_init = mod->module_init;
105747+ freeinit->module_init_rw = mod->module_init_rw;
105748+ freeinit->module_init_rx = mod->module_init_rx;
105749
105750 /*
105751 * We want to find out whether @mod uses async during init. Clear
105752@@ -3121,10 +3266,10 @@ static noinline int do_init_module(struct module *mod)
105753 #endif
105754 unset_module_init_ro_nx(mod);
105755 module_arch_freeing_init(mod);
105756- mod->module_init = NULL;
105757- mod->init_size = 0;
105758- mod->init_ro_size = 0;
105759- mod->init_text_size = 0;
105760+ mod->module_init_rw = NULL;
105761+ mod->module_init_rx = NULL;
105762+ mod->init_size_rw = 0;
105763+ mod->init_size_rx = 0;
105764 /*
105765 * We want to free module_init, but be aware that kallsyms may be
105766 * walking this with preempt disabled. In all the failure paths,
105767@@ -3212,16 +3357,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
105768 module_bug_finalize(info->hdr, info->sechdrs, mod);
105769
105770 /* Set RO and NX regions for core */
105771- set_section_ro_nx(mod->module_core,
105772- mod->core_text_size,
105773- mod->core_ro_size,
105774- mod->core_size);
105775+ set_section_ro_nx(mod->module_core_rx,
105776+ mod->core_size_rx,
105777+ mod->core_size_rx,
105778+ mod->core_size_rx);
105779
105780 /* Set RO and NX regions for init */
105781- set_section_ro_nx(mod->module_init,
105782- mod->init_text_size,
105783- mod->init_ro_size,
105784- mod->init_size);
105785+ set_section_ro_nx(mod->module_init_rx,
105786+ mod->init_size_rx,
105787+ mod->init_size_rx,
105788+ mod->init_size_rx);
105789
105790 /* Mark state as coming so strong_try_module_get() ignores us,
105791 * but kallsyms etc. can see us. */
105792@@ -3305,9 +3450,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
105793 if (err)
105794 goto free_unload;
105795
105796+ /* Now copy in args */
105797+ mod->args = strndup_user(uargs, ~0UL >> 1);
105798+ if (IS_ERR(mod->args)) {
105799+ err = PTR_ERR(mod->args);
105800+ goto free_unload;
105801+ }
105802+
105803 /* Set up MODINFO_ATTR fields */
105804 setup_modinfo(mod, info);
105805
105806+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105807+ {
105808+ char *p, *p2;
105809+
105810+ if (strstr(mod->args, "grsec_modharden_netdev")) {
105811+ 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);
105812+ err = -EPERM;
105813+ goto free_modinfo;
105814+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
105815+ p += sizeof("grsec_modharden_normal") - 1;
105816+ p2 = strstr(p, "_");
105817+ if (p2) {
105818+ *p2 = '\0';
105819+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
105820+ *p2 = '_';
105821+ }
105822+ err = -EPERM;
105823+ goto free_modinfo;
105824+ }
105825+ }
105826+#endif
105827+
105828 /* Fix up syms, so that st_value is a pointer to location. */
105829 err = simplify_symbols(mod, info);
105830 if (err < 0)
105831@@ -3323,13 +3497,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
105832
105833 flush_module_icache(mod);
105834
105835- /* Now copy in args */
105836- mod->args = strndup_user(uargs, ~0UL >> 1);
105837- if (IS_ERR(mod->args)) {
105838- err = PTR_ERR(mod->args);
105839- goto free_arch_cleanup;
105840- }
105841-
105842 dynamic_debug_setup(info->debug, info->num_debug);
105843
105844 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
105845@@ -3380,11 +3547,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
105846 ddebug_cleanup:
105847 dynamic_debug_remove(info->debug);
105848 synchronize_sched();
105849- kfree(mod->args);
105850- free_arch_cleanup:
105851 module_arch_cleanup(mod);
105852 free_modinfo:
105853 free_modinfo(mod);
105854+ kfree(mod->args);
105855 free_unload:
105856 module_unload_free(mod);
105857 unlink_mod:
105858@@ -3397,7 +3563,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
105859 mutex_unlock(&module_mutex);
105860 free_module:
105861 /* Free lock-classes; relies on the preceding sync_rcu() */
105862- lockdep_free_key_range(mod->module_core, mod->core_size);
105863+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
105864+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
105865
105866 module_deallocate(mod, info);
105867 free_copy:
105868@@ -3474,10 +3641,16 @@ static const char *get_ksymbol(struct module *mod,
105869 unsigned long nextval;
105870
105871 /* At worse, next value is at end of module */
105872- if (within_module_init(addr, mod))
105873- nextval = (unsigned long)mod->module_init+mod->init_text_size;
105874+ if (within_module_init_rx(addr, mod))
105875+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
105876+ else if (within_module_init_rw(addr, mod))
105877+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
105878+ else if (within_module_core_rx(addr, mod))
105879+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
105880+ else if (within_module_core_rw(addr, mod))
105881+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
105882 else
105883- nextval = (unsigned long)mod->module_core+mod->core_text_size;
105884+ return NULL;
105885
105886 /* Scan for closest preceding symbol, and next symbol. (ELF
105887 starts real symbols at 1). */
105888@@ -3725,7 +3898,7 @@ static int m_show(struct seq_file *m, void *p)
105889 return 0;
105890
105891 seq_printf(m, "%s %u",
105892- mod->name, mod->init_size + mod->core_size);
105893+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
105894 print_unload_info(m, mod);
105895
105896 /* Informative for users. */
105897@@ -3734,7 +3907,7 @@ static int m_show(struct seq_file *m, void *p)
105898 mod->state == MODULE_STATE_COMING ? "Loading" :
105899 "Live");
105900 /* Used by oprofile and other similar tools. */
105901- seq_printf(m, " 0x%pK", mod->module_core);
105902+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
105903
105904 /* Taints info */
105905 if (mod->taints)
105906@@ -3770,7 +3943,17 @@ static const struct file_operations proc_modules_operations = {
105907
105908 static int __init proc_modules_init(void)
105909 {
105910+#ifndef CONFIG_GRKERNSEC_HIDESYM
105911+#ifdef CONFIG_GRKERNSEC_PROC_USER
105912+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
105913+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
105914+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
105915+#else
105916 proc_create("modules", 0, NULL, &proc_modules_operations);
105917+#endif
105918+#else
105919+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
105920+#endif
105921 return 0;
105922 }
105923 module_init(proc_modules_init);
105924@@ -3831,7 +4014,8 @@ struct module *__module_address(unsigned long addr)
105925 {
105926 struct module *mod;
105927
105928- if (addr < module_addr_min || addr > module_addr_max)
105929+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
105930+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
105931 return NULL;
105932
105933 list_for_each_entry_rcu(mod, &modules, list) {
105934@@ -3872,11 +4056,20 @@ bool is_module_text_address(unsigned long addr)
105935 */
105936 struct module *__module_text_address(unsigned long addr)
105937 {
105938- struct module *mod = __module_address(addr);
105939+ struct module *mod;
105940+
105941+#ifdef CONFIG_X86_32
105942+ addr = ktla_ktva(addr);
105943+#endif
105944+
105945+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
105946+ return NULL;
105947+
105948+ mod = __module_address(addr);
105949+
105950 if (mod) {
105951 /* Make sure it's within the text section. */
105952- if (!within(addr, mod->module_init, mod->init_text_size)
105953- && !within(addr, mod->module_core, mod->core_text_size))
105954+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
105955 mod = NULL;
105956 }
105957 return mod;
105958diff --git a/kernel/notifier.c b/kernel/notifier.c
105959index ae9fc7c..5085fbf 100644
105960--- a/kernel/notifier.c
105961+++ b/kernel/notifier.c
105962@@ -5,6 +5,7 @@
105963 #include <linux/rcupdate.h>
105964 #include <linux/vmalloc.h>
105965 #include <linux/reboot.h>
105966+#include <linux/mm.h>
105967
105968 /*
105969 * Notifier list for kernel code which wants to be called
105970@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
105971 while ((*nl) != NULL) {
105972 if (n->priority > (*nl)->priority)
105973 break;
105974- nl = &((*nl)->next);
105975+ nl = (struct notifier_block **)&((*nl)->next);
105976 }
105977- n->next = *nl;
105978+ pax_open_kernel();
105979+ *(const void **)&n->next = *nl;
105980 rcu_assign_pointer(*nl, n);
105981+ pax_close_kernel();
105982 return 0;
105983 }
105984
105985@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
105986 return 0;
105987 if (n->priority > (*nl)->priority)
105988 break;
105989- nl = &((*nl)->next);
105990+ nl = (struct notifier_block **)&((*nl)->next);
105991 }
105992- n->next = *nl;
105993+ pax_open_kernel();
105994+ *(const void **)&n->next = *nl;
105995 rcu_assign_pointer(*nl, n);
105996+ pax_close_kernel();
105997 return 0;
105998 }
105999
106000@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
106001 {
106002 while ((*nl) != NULL) {
106003 if ((*nl) == n) {
106004+ pax_open_kernel();
106005 rcu_assign_pointer(*nl, n->next);
106006+ pax_close_kernel();
106007 return 0;
106008 }
106009- nl = &((*nl)->next);
106010+ nl = (struct notifier_block **)&((*nl)->next);
106011 }
106012 return -ENOENT;
106013 }
106014diff --git a/kernel/padata.c b/kernel/padata.c
106015index b38bea9..91acfbe 100644
106016--- a/kernel/padata.c
106017+++ b/kernel/padata.c
106018@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
106019 * seq_nr mod. number of cpus in use.
106020 */
106021
106022- seq_nr = atomic_inc_return(&pd->seq_nr);
106023+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
106024 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
106025
106026 return padata_index_to_cpu(pd, cpu_index);
106027@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
106028 padata_init_pqueues(pd);
106029 padata_init_squeues(pd);
106030 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
106031- atomic_set(&pd->seq_nr, -1);
106032+ atomic_set_unchecked(&pd->seq_nr, -1);
106033 atomic_set(&pd->reorder_objects, 0);
106034 atomic_set(&pd->refcnt, 0);
106035 pd->pinst = pinst;
106036diff --git a/kernel/panic.c b/kernel/panic.c
106037index 8136ad7..15c857b 100644
106038--- a/kernel/panic.c
106039+++ b/kernel/panic.c
106040@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
106041 /*
106042 * Stop ourself in panic -- architecture code may override this
106043 */
106044-void __weak panic_smp_self_stop(void)
106045+void __weak __noreturn panic_smp_self_stop(void)
106046 {
106047 while (1)
106048 cpu_relax();
106049@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
106050 disable_trace_on_warning();
106051
106052 pr_warn("------------[ cut here ]------------\n");
106053- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
106054+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
106055 raw_smp_processor_id(), current->pid, file, line, caller);
106056
106057 if (args)
106058@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
106059 */
106060 __visible void __stack_chk_fail(void)
106061 {
106062- panic("stack-protector: Kernel stack is corrupted in: %p\n",
106063+ dump_stack();
106064+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
106065 __builtin_return_address(0));
106066 }
106067 EXPORT_SYMBOL(__stack_chk_fail);
106068diff --git a/kernel/pid.c b/kernel/pid.c
106069index 4fd07d5..02bce4f 100644
106070--- a/kernel/pid.c
106071+++ b/kernel/pid.c
106072@@ -33,6 +33,7 @@
106073 #include <linux/rculist.h>
106074 #include <linux/bootmem.h>
106075 #include <linux/hash.h>
106076+#include <linux/security.h>
106077 #include <linux/pid_namespace.h>
106078 #include <linux/init_task.h>
106079 #include <linux/syscalls.h>
106080@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
106081
106082 int pid_max = PID_MAX_DEFAULT;
106083
106084-#define RESERVED_PIDS 300
106085+#define RESERVED_PIDS 500
106086
106087 int pid_max_min = RESERVED_PIDS + 1;
106088 int pid_max_max = PID_MAX_LIMIT;
106089@@ -451,10 +452,18 @@ EXPORT_SYMBOL(pid_task);
106090 */
106091 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
106092 {
106093+ struct task_struct *task;
106094+
106095 rcu_lockdep_assert(rcu_read_lock_held(),
106096 "find_task_by_pid_ns() needs rcu_read_lock()"
106097 " protection");
106098- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106099+
106100+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106101+
106102+ if (gr_pid_is_chrooted(task))
106103+ return NULL;
106104+
106105+ return task;
106106 }
106107
106108 struct task_struct *find_task_by_vpid(pid_t vnr)
106109@@ -462,6 +471,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
106110 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
106111 }
106112
106113+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
106114+{
106115+ rcu_lockdep_assert(rcu_read_lock_held(),
106116+ "find_task_by_pid_ns() needs rcu_read_lock()"
106117+ " protection");
106118+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
106119+}
106120+
106121 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
106122 {
106123 struct pid *pid;
106124diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
106125index a65ba13..f600dbb 100644
106126--- a/kernel/pid_namespace.c
106127+++ b/kernel/pid_namespace.c
106128@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
106129 void __user *buffer, size_t *lenp, loff_t *ppos)
106130 {
106131 struct pid_namespace *pid_ns = task_active_pid_ns(current);
106132- struct ctl_table tmp = *table;
106133+ ctl_table_no_const tmp = *table;
106134
106135 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
106136 return -EPERM;
106137diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
106138index 9e30231..75a6d97 100644
106139--- a/kernel/power/Kconfig
106140+++ b/kernel/power/Kconfig
106141@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
106142 config HIBERNATION
106143 bool "Hibernation (aka 'suspend to disk')"
106144 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
106145+ depends on !GRKERNSEC_KMEM
106146+ depends on !PAX_MEMORY_SANITIZE
106147 select HIBERNATE_CALLBACKS
106148 select LZO_COMPRESS
106149 select LZO_DECOMPRESS
106150diff --git a/kernel/power/process.c b/kernel/power/process.c
106151index 564f786..361a18e 100644
106152--- a/kernel/power/process.c
106153+++ b/kernel/power/process.c
106154@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
106155 unsigned int elapsed_msecs;
106156 bool wakeup = false;
106157 int sleep_usecs = USEC_PER_MSEC;
106158+ bool timedout = false;
106159
106160 do_gettimeofday(&start);
106161
106162@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
106163
106164 while (true) {
106165 todo = 0;
106166+ if (time_after(jiffies, end_time))
106167+ timedout = true;
106168 read_lock(&tasklist_lock);
106169 for_each_process_thread(g, p) {
106170 if (p == current || !freeze_task(p))
106171 continue;
106172
106173- if (!freezer_should_skip(p))
106174+ if (!freezer_should_skip(p)) {
106175 todo++;
106176+ if (timedout) {
106177+ printk(KERN_ERR "Task refusing to freeze:\n");
106178+ sched_show_task(p);
106179+ }
106180+ }
106181 }
106182 read_unlock(&tasklist_lock);
106183
106184@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
106185 todo += wq_busy;
106186 }
106187
106188- if (!todo || time_after(jiffies, end_time))
106189+ if (!todo || timedout)
106190 break;
106191
106192 if (pm_wakeup_pending()) {
106193diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
106194index bff0169..c90815d 100644
106195--- a/kernel/printk/printk.c
106196+++ b/kernel/printk/printk.c
106197@@ -463,7 +463,7 @@ static int log_store(int facility, int level,
106198 return msg->text_len;
106199 }
106200
106201-int dmesg_restrict = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106202+int dmesg_restrict __read_only = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106203
106204 static int syslog_action_restricted(int type)
106205 {
106206@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
106207 if (from_file && type != SYSLOG_ACTION_OPEN)
106208 goto ok;
106209
106210+#ifdef CONFIG_GRKERNSEC_DMESG
106211+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
106212+ return -EPERM;
106213+#endif
106214+
106215 if (syslog_action_restricted(type)) {
106216 if (capable(CAP_SYSLOG))
106217 goto ok;
106218diff --git a/kernel/profile.c b/kernel/profile.c
106219index a7bcd28..5b368fa 100644
106220--- a/kernel/profile.c
106221+++ b/kernel/profile.c
106222@@ -37,7 +37,7 @@ struct profile_hit {
106223 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
106224 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
106225
106226-static atomic_t *prof_buffer;
106227+static atomic_unchecked_t *prof_buffer;
106228 static unsigned long prof_len, prof_shift;
106229
106230 int prof_on __read_mostly;
106231@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
106232 hits[i].pc = 0;
106233 continue;
106234 }
106235- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106236+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106237 hits[i].hits = hits[i].pc = 0;
106238 }
106239 }
106240@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106241 * Add the current hit(s) and flush the write-queue out
106242 * to the global buffer:
106243 */
106244- atomic_add(nr_hits, &prof_buffer[pc]);
106245+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
106246 for (i = 0; i < NR_PROFILE_HIT; ++i) {
106247- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106248+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106249 hits[i].pc = hits[i].hits = 0;
106250 }
106251 out:
106252@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106253 {
106254 unsigned long pc;
106255 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
106256- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106257+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106258 }
106259 #endif /* !CONFIG_SMP */
106260
106261@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
106262 return -EFAULT;
106263 buf++; p++; count--; read++;
106264 }
106265- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
106266+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
106267 if (copy_to_user(buf, (void *)pnt, count))
106268 return -EFAULT;
106269 read += count;
106270@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
106271 }
106272 #endif
106273 profile_discard_flip_buffers();
106274- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
106275+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
106276 return count;
106277 }
106278
106279diff --git a/kernel/ptrace.c b/kernel/ptrace.c
106280index c8e0e05..2be5614 100644
106281--- a/kernel/ptrace.c
106282+++ b/kernel/ptrace.c
106283@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
106284 if (seize)
106285 flags |= PT_SEIZED;
106286 rcu_read_lock();
106287- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106288+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106289 flags |= PT_PTRACE_CAP;
106290 rcu_read_unlock();
106291 task->ptrace = flags;
106292@@ -514,7 +514,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
106293 break;
106294 return -EIO;
106295 }
106296- if (copy_to_user(dst, buf, retval))
106297+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
106298 return -EFAULT;
106299 copied += retval;
106300 src += retval;
106301@@ -802,7 +802,7 @@ int ptrace_request(struct task_struct *child, long request,
106302 bool seized = child->ptrace & PT_SEIZED;
106303 int ret = -EIO;
106304 siginfo_t siginfo, *si;
106305- void __user *datavp = (void __user *) data;
106306+ void __user *datavp = (__force void __user *) data;
106307 unsigned long __user *datalp = datavp;
106308 unsigned long flags;
106309
106310@@ -1048,14 +1048,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
106311 goto out;
106312 }
106313
106314+ if (gr_handle_ptrace(child, request)) {
106315+ ret = -EPERM;
106316+ goto out_put_task_struct;
106317+ }
106318+
106319 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106320 ret = ptrace_attach(child, request, addr, data);
106321 /*
106322 * Some architectures need to do book-keeping after
106323 * a ptrace attach.
106324 */
106325- if (!ret)
106326+ if (!ret) {
106327 arch_ptrace_attach(child);
106328+ gr_audit_ptrace(child);
106329+ }
106330 goto out_put_task_struct;
106331 }
106332
106333@@ -1083,7 +1090,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
106334 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
106335 if (copied != sizeof(tmp))
106336 return -EIO;
106337- return put_user(tmp, (unsigned long __user *)data);
106338+ return put_user(tmp, (__force unsigned long __user *)data);
106339 }
106340
106341 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
106342@@ -1176,7 +1183,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
106343 }
106344
106345 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106346- compat_long_t, addr, compat_long_t, data)
106347+ compat_ulong_t, addr, compat_ulong_t, data)
106348 {
106349 struct task_struct *child;
106350 long ret;
106351@@ -1192,14 +1199,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106352 goto out;
106353 }
106354
106355+ if (gr_handle_ptrace(child, request)) {
106356+ ret = -EPERM;
106357+ goto out_put_task_struct;
106358+ }
106359+
106360 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106361 ret = ptrace_attach(child, request, addr, data);
106362 /*
106363 * Some architectures need to do book-keeping after
106364 * a ptrace attach.
106365 */
106366- if (!ret)
106367+ if (!ret) {
106368 arch_ptrace_attach(child);
106369+ gr_audit_ptrace(child);
106370+ }
106371 goto out_put_task_struct;
106372 }
106373
106374diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
106375index 8dbe276..8e87dbd 100644
106376--- a/kernel/rcu/rcutorture.c
106377+++ b/kernel/rcu/rcutorture.c
106378@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106379 rcu_torture_count) = { 0 };
106380 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106381 rcu_torture_batch) = { 0 };
106382-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106383-static atomic_t n_rcu_torture_alloc;
106384-static atomic_t n_rcu_torture_alloc_fail;
106385-static atomic_t n_rcu_torture_free;
106386-static atomic_t n_rcu_torture_mberror;
106387-static atomic_t n_rcu_torture_error;
106388+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106389+static atomic_unchecked_t n_rcu_torture_alloc;
106390+static atomic_unchecked_t n_rcu_torture_alloc_fail;
106391+static atomic_unchecked_t n_rcu_torture_free;
106392+static atomic_unchecked_t n_rcu_torture_mberror;
106393+static atomic_unchecked_t n_rcu_torture_error;
106394 static long n_rcu_torture_barrier_error;
106395 static long n_rcu_torture_boost_ktrerror;
106396 static long n_rcu_torture_boost_rterror;
106397@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
106398 static long n_rcu_torture_timers;
106399 static long n_barrier_attempts;
106400 static long n_barrier_successes;
106401-static atomic_long_t n_cbfloods;
106402+static atomic_long_unchecked_t n_cbfloods;
106403 static struct list_head rcu_torture_removed;
106404
106405 static int rcu_torture_writer_state;
106406@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
106407
106408 spin_lock_bh(&rcu_torture_lock);
106409 if (list_empty(&rcu_torture_freelist)) {
106410- atomic_inc(&n_rcu_torture_alloc_fail);
106411+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
106412 spin_unlock_bh(&rcu_torture_lock);
106413 return NULL;
106414 }
106415- atomic_inc(&n_rcu_torture_alloc);
106416+ atomic_inc_unchecked(&n_rcu_torture_alloc);
106417 p = rcu_torture_freelist.next;
106418 list_del_init(p);
106419 spin_unlock_bh(&rcu_torture_lock);
106420@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
106421 static void
106422 rcu_torture_free(struct rcu_torture *p)
106423 {
106424- atomic_inc(&n_rcu_torture_free);
106425+ atomic_inc_unchecked(&n_rcu_torture_free);
106426 spin_lock_bh(&rcu_torture_lock);
106427 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
106428 spin_unlock_bh(&rcu_torture_lock);
106429@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
106430 i = rp->rtort_pipe_count;
106431 if (i > RCU_TORTURE_PIPE_LEN)
106432 i = RCU_TORTURE_PIPE_LEN;
106433- atomic_inc(&rcu_torture_wcount[i]);
106434+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106435 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
106436 rp->rtort_mbtest = 0;
106437 return true;
106438@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
106439 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
106440 do {
106441 schedule_timeout_interruptible(cbflood_inter_holdoff);
106442- atomic_long_inc(&n_cbfloods);
106443+ atomic_long_inc_unchecked(&n_cbfloods);
106444 WARN_ON(signal_pending(current));
106445 for (i = 0; i < cbflood_n_burst; i++) {
106446 for (j = 0; j < cbflood_n_per_burst; j++) {
106447@@ -923,7 +923,7 @@ rcu_torture_writer(void *arg)
106448 i = old_rp->rtort_pipe_count;
106449 if (i > RCU_TORTURE_PIPE_LEN)
106450 i = RCU_TORTURE_PIPE_LEN;
106451- atomic_inc(&rcu_torture_wcount[i]);
106452+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106453 old_rp->rtort_pipe_count++;
106454 switch (synctype[torture_random(&rand) % nsynctypes]) {
106455 case RTWS_DEF_FREE:
106456@@ -1061,7 +1061,7 @@ static void rcu_torture_timer(unsigned long unused)
106457 return;
106458 }
106459 if (p->rtort_mbtest == 0)
106460- atomic_inc(&n_rcu_torture_mberror);
106461+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106462 spin_lock(&rand_lock);
106463 cur_ops->read_delay(&rand);
106464 n_rcu_torture_timers++;
106465@@ -1136,7 +1136,7 @@ rcu_torture_reader(void *arg)
106466 continue;
106467 }
106468 if (p->rtort_mbtest == 0)
106469- atomic_inc(&n_rcu_torture_mberror);
106470+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106471 cur_ops->read_delay(&rand);
106472 preempt_disable();
106473 pipe_count = p->rtort_pipe_count;
106474@@ -1205,11 +1205,11 @@ rcu_torture_stats_print(void)
106475 rcu_torture_current,
106476 rcu_torture_current_version,
106477 list_empty(&rcu_torture_freelist),
106478- atomic_read(&n_rcu_torture_alloc),
106479- atomic_read(&n_rcu_torture_alloc_fail),
106480- atomic_read(&n_rcu_torture_free));
106481+ atomic_read_unchecked(&n_rcu_torture_alloc),
106482+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
106483+ atomic_read_unchecked(&n_rcu_torture_free));
106484 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
106485- atomic_read(&n_rcu_torture_mberror),
106486+ atomic_read_unchecked(&n_rcu_torture_mberror),
106487 n_rcu_torture_boost_ktrerror,
106488 n_rcu_torture_boost_rterror);
106489 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
106490@@ -1221,17 +1221,17 @@ rcu_torture_stats_print(void)
106491 n_barrier_successes,
106492 n_barrier_attempts,
106493 n_rcu_torture_barrier_error);
106494- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
106495+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
106496
106497 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106498- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
106499+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
106500 n_rcu_torture_barrier_error != 0 ||
106501 n_rcu_torture_boost_ktrerror != 0 ||
106502 n_rcu_torture_boost_rterror != 0 ||
106503 n_rcu_torture_boost_failure != 0 ||
106504 i > 1) {
106505 pr_cont("%s", "!!! ");
106506- atomic_inc(&n_rcu_torture_error);
106507+ atomic_inc_unchecked(&n_rcu_torture_error);
106508 WARN_ON_ONCE(1);
106509 }
106510 pr_cont("Reader Pipe: ");
106511@@ -1248,7 +1248,7 @@ rcu_torture_stats_print(void)
106512 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106513 pr_cont("Free-Block Circulation: ");
106514 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106515- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
106516+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
106517 }
106518 pr_cont("\n");
106519
106520@@ -1595,7 +1595,7 @@ rcu_torture_cleanup(void)
106521
106522 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
106523
106524- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106525+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106526 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
106527 else if (torture_onoff_failures())
106528 rcu_torture_print_module_parms(cur_ops,
106529@@ -1720,18 +1720,18 @@ rcu_torture_init(void)
106530
106531 rcu_torture_current = NULL;
106532 rcu_torture_current_version = 0;
106533- atomic_set(&n_rcu_torture_alloc, 0);
106534- atomic_set(&n_rcu_torture_alloc_fail, 0);
106535- atomic_set(&n_rcu_torture_free, 0);
106536- atomic_set(&n_rcu_torture_mberror, 0);
106537- atomic_set(&n_rcu_torture_error, 0);
106538+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
106539+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
106540+ atomic_set_unchecked(&n_rcu_torture_free, 0);
106541+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
106542+ atomic_set_unchecked(&n_rcu_torture_error, 0);
106543 n_rcu_torture_barrier_error = 0;
106544 n_rcu_torture_boost_ktrerror = 0;
106545 n_rcu_torture_boost_rterror = 0;
106546 n_rcu_torture_boost_failure = 0;
106547 n_rcu_torture_boosts = 0;
106548 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
106549- atomic_set(&rcu_torture_wcount[i], 0);
106550+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
106551 for_each_possible_cpu(cpu) {
106552 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106553 per_cpu(rcu_torture_count, cpu)[i] = 0;
106554diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
106555index ec30868..89752ff 100644
106556--- a/kernel/rcu/tiny.c
106557+++ b/kernel/rcu/tiny.c
106558@@ -42,7 +42,7 @@
106559 /* Forward declarations for tiny_plugin.h. */
106560 struct rcu_ctrlblk;
106561 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
106562-static void rcu_process_callbacks(struct softirq_action *unused);
106563+static void rcu_process_callbacks(void);
106564 static void __call_rcu(struct rcu_head *head,
106565 void (*func)(struct rcu_head *rcu),
106566 struct rcu_ctrlblk *rcp);
106567@@ -203,7 +203,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
106568 false));
106569 }
106570
106571-static void rcu_process_callbacks(struct softirq_action *unused)
106572+static __latent_entropy void rcu_process_callbacks(void)
106573 {
106574 __rcu_process_callbacks(&rcu_sched_ctrlblk);
106575 __rcu_process_callbacks(&rcu_bh_ctrlblk);
106576diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
106577index f94e209..d2985bd 100644
106578--- a/kernel/rcu/tiny_plugin.h
106579+++ b/kernel/rcu/tiny_plugin.h
106580@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
106581 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
106582 jiffies - rcp->gp_start, rcp->qlen);
106583 dump_stack();
106584- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
106585+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
106586 3 * rcu_jiffies_till_stall_check() + 3;
106587 } else if (ULONG_CMP_GE(j, js)) {
106588- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106589+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106590 }
106591 }
106592
106593@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
106594 {
106595 rcp->ticks_this_gp = 0;
106596 rcp->gp_start = jiffies;
106597- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106598+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106599 }
106600
106601 static void check_cpu_stalls(void)
106602diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
106603index 8cf7304..953f8ad 100644
106604--- a/kernel/rcu/tree.c
106605+++ b/kernel/rcu/tree.c
106606@@ -290,7 +290,7 @@ static void rcu_momentary_dyntick_idle(void)
106607 */
106608 rdtp = this_cpu_ptr(&rcu_dynticks);
106609 smp_mb__before_atomic(); /* Earlier stuff before QS. */
106610- atomic_add(2, &rdtp->dynticks); /* QS. */
106611+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
106612 smp_mb__after_atomic(); /* Later stuff after QS. */
106613 break;
106614 }
106615@@ -602,9 +602,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
106616 rcu_prepare_for_idle();
106617 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106618 smp_mb__before_atomic(); /* See above. */
106619- atomic_inc(&rdtp->dynticks);
106620+ atomic_inc_unchecked(&rdtp->dynticks);
106621 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
106622- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106623+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106624 rcu_dynticks_task_enter();
106625
106626 /*
106627@@ -725,10 +725,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
106628
106629 rcu_dynticks_task_exit();
106630 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
106631- atomic_inc(&rdtp->dynticks);
106632+ atomic_inc_unchecked(&rdtp->dynticks);
106633 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
106634 smp_mb__after_atomic(); /* See above. */
106635- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106636+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106637 rcu_cleanup_after_idle();
106638 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
106639 if (!user && !is_idle_task(current)) {
106640@@ -862,12 +862,12 @@ void rcu_nmi_enter(void)
106641 * to be in the outermost NMI handler that interrupted an RCU-idle
106642 * period (observation due to Andy Lutomirski).
106643 */
106644- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
106645+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
106646 smp_mb__before_atomic(); /* Force delay from prior write. */
106647- atomic_inc(&rdtp->dynticks);
106648+ atomic_inc_unchecked(&rdtp->dynticks);
106649 /* atomic_inc() before later RCU read-side crit sects */
106650 smp_mb__after_atomic(); /* See above. */
106651- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106652+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106653 incby = 1;
106654 }
106655 rdtp->dynticks_nmi_nesting += incby;
106656@@ -892,7 +892,7 @@ void rcu_nmi_exit(void)
106657 * to us!)
106658 */
106659 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
106660- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106661+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106662
106663 /*
106664 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
106665@@ -907,9 +907,9 @@ void rcu_nmi_exit(void)
106666 rdtp->dynticks_nmi_nesting = 0;
106667 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106668 smp_mb__before_atomic(); /* See above. */
106669- atomic_inc(&rdtp->dynticks);
106670+ atomic_inc_unchecked(&rdtp->dynticks);
106671 smp_mb__after_atomic(); /* Force delay to next write. */
106672- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106673+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106674 }
106675
106676 /**
106677@@ -922,7 +922,7 @@ void rcu_nmi_exit(void)
106678 */
106679 bool notrace __rcu_is_watching(void)
106680 {
106681- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106682+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106683 }
106684
106685 /**
106686@@ -1005,7 +1005,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
106687 static int dyntick_save_progress_counter(struct rcu_data *rdp,
106688 bool *isidle, unsigned long *maxj)
106689 {
106690- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
106691+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106692 rcu_sysidle_check_cpu(rdp, isidle, maxj);
106693 if ((rdp->dynticks_snap & 0x1) == 0) {
106694 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
106695@@ -1013,7 +1013,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
106696 } else {
106697 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
106698 rdp->mynode->gpnum))
106699- ACCESS_ONCE(rdp->gpwrap) = true;
106700+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
106701 return 0;
106702 }
106703 }
106704@@ -1031,7 +1031,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106705 int *rcrmp;
106706 unsigned int snap;
106707
106708- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
106709+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106710 snap = (unsigned int)rdp->dynticks_snap;
106711
106712 /*
106713@@ -1094,10 +1094,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106714 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
106715 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
106716 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
106717- ACCESS_ONCE(rdp->cond_resched_completed) =
106718+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
106719 ACCESS_ONCE(rdp->mynode->completed);
106720 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
106721- ACCESS_ONCE(*rcrmp) =
106722+ ACCESS_ONCE_RW(*rcrmp) =
106723 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
106724 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
106725 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
106726@@ -1119,7 +1119,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
106727 rsp->gp_start = j;
106728 smp_wmb(); /* Record start time before stall time. */
106729 j1 = rcu_jiffies_till_stall_check();
106730- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
106731+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
106732 rsp->jiffies_resched = j + j1 / 2;
106733 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
106734 }
106735@@ -1178,7 +1178,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
106736 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106737 return;
106738 }
106739- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
106740+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
106741 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106742
106743 /*
106744@@ -1263,7 +1263,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
106745
106746 raw_spin_lock_irqsave(&rnp->lock, flags);
106747 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
106748- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
106749+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
106750 3 * rcu_jiffies_till_stall_check() + 3;
106751 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106752
106753@@ -1347,7 +1347,7 @@ void rcu_cpu_stall_reset(void)
106754 struct rcu_state *rsp;
106755
106756 for_each_rcu_flavor(rsp)
106757- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
106758+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
106759 }
106760
106761 /*
106762@@ -1704,7 +1704,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
106763 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
106764 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
106765 zero_cpu_stall_ticks(rdp);
106766- ACCESS_ONCE(rdp->gpwrap) = false;
106767+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
106768 }
106769 return ret;
106770 }
106771@@ -1740,7 +1740,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106772 struct rcu_data *rdp;
106773 struct rcu_node *rnp = rcu_get_root(rsp);
106774
106775- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106776+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106777 raw_spin_lock_irq(&rnp->lock);
106778 smp_mb__after_unlock_lock();
106779 if (!ACCESS_ONCE(rsp->gp_flags)) {
106780@@ -1748,7 +1748,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106781 raw_spin_unlock_irq(&rnp->lock);
106782 return 0;
106783 }
106784- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
106785+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
106786
106787 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
106788 /*
106789@@ -1834,9 +1834,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
106790 rdp = this_cpu_ptr(rsp->rda);
106791 rcu_preempt_check_blocked_tasks(rnp);
106792 rnp->qsmask = rnp->qsmaskinit;
106793- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
106794+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
106795 if (WARN_ON_ONCE(rnp->completed != rsp->completed))
106796- ACCESS_ONCE(rnp->completed) = rsp->completed;
106797+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
106798 if (rnp == rdp->mynode)
106799 (void)__note_gp_changes(rsp, rnp, rdp);
106800 rcu_preempt_boost_start_gp(rnp);
106801@@ -1845,7 +1845,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106802 rnp->grphi, rnp->qsmask);
106803 raw_spin_unlock_irq(&rnp->lock);
106804 cond_resched_rcu_qs();
106805- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106806+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106807 if (gp_init_delay > 0 &&
106808 !(rsp->gpnum % (rcu_num_nodes * PER_RCU_NODE_PERIOD)))
106809 schedule_timeout_uninterruptible(gp_init_delay);
106810@@ -1864,7 +1864,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
106811 unsigned long maxj;
106812 struct rcu_node *rnp = rcu_get_root(rsp);
106813
106814- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106815+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106816 rsp->n_force_qs++;
106817 if (fqs_state == RCU_SAVE_DYNTICK) {
106818 /* Collect dyntick-idle snapshots. */
106819@@ -1885,7 +1885,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
106820 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
106821 raw_spin_lock_irq(&rnp->lock);
106822 smp_mb__after_unlock_lock();
106823- ACCESS_ONCE(rsp->gp_flags) =
106824+ ACCESS_ONCE_RW(rsp->gp_flags) =
106825 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
106826 raw_spin_unlock_irq(&rnp->lock);
106827 }
106828@@ -1903,7 +1903,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106829 struct rcu_data *rdp;
106830 struct rcu_node *rnp = rcu_get_root(rsp);
106831
106832- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106833+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106834 raw_spin_lock_irq(&rnp->lock);
106835 smp_mb__after_unlock_lock();
106836 gp_duration = jiffies - rsp->gp_start;
106837@@ -1934,7 +1934,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106838 smp_mb__after_unlock_lock();
106839 WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp));
106840 WARN_ON_ONCE(rnp->qsmask);
106841- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
106842+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
106843 rdp = this_cpu_ptr(rsp->rda);
106844 if (rnp == rdp->mynode)
106845 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
106846@@ -1942,7 +1942,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106847 nocb += rcu_future_gp_cleanup(rsp, rnp);
106848 raw_spin_unlock_irq(&rnp->lock);
106849 cond_resched_rcu_qs();
106850- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106851+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106852 }
106853 rnp = rcu_get_root(rsp);
106854 raw_spin_lock_irq(&rnp->lock);
106855@@ -1950,14 +1950,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106856 rcu_nocb_gp_set(rnp, nocb);
106857
106858 /* Declare grace period done. */
106859- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
106860+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
106861 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
106862 rsp->fqs_state = RCU_GP_IDLE;
106863 rdp = this_cpu_ptr(rsp->rda);
106864 /* Advance CBs to reduce false positives below. */
106865 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
106866 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
106867- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
106868+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
106869 trace_rcu_grace_period(rsp->name,
106870 ACCESS_ONCE(rsp->gpnum),
106871 TPS("newreq"));
106872@@ -1993,7 +1993,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
106873 if (rcu_gp_init(rsp))
106874 break;
106875 cond_resched_rcu_qs();
106876- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106877+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106878 WARN_ON(signal_pending(current));
106879 trace_rcu_grace_period(rsp->name,
106880 ACCESS_ONCE(rsp->gpnum),
106881@@ -2037,11 +2037,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
106882 ACCESS_ONCE(rsp->gpnum),
106883 TPS("fqsend"));
106884 cond_resched_rcu_qs();
106885- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106886+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106887 } else {
106888 /* Deal with stray signal. */
106889 cond_resched_rcu_qs();
106890- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106891+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106892 WARN_ON(signal_pending(current));
106893 trace_rcu_grace_period(rsp->name,
106894 ACCESS_ONCE(rsp->gpnum),
106895@@ -2086,7 +2086,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
106896 */
106897 return false;
106898 }
106899- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
106900+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
106901 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
106902 TPS("newreq"));
106903
106904@@ -2359,7 +2359,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
106905 rsp->qlen += rdp->qlen;
106906 rdp->n_cbs_orphaned += rdp->qlen;
106907 rdp->qlen_lazy = 0;
106908- ACCESS_ONCE(rdp->qlen) = 0;
106909+ ACCESS_ONCE_RW(rdp->qlen) = 0;
106910 }
106911
106912 /*
106913@@ -2636,7 +2636,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
106914 }
106915 smp_mb(); /* List handling before counting for rcu_barrier(). */
106916 rdp->qlen_lazy -= count_lazy;
106917- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
106918+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
106919 rdp->n_cbs_invoked += count;
106920
106921 /* Reinstate batch limit if we have worked down the excess. */
106922@@ -2814,7 +2814,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
106923 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
106924 return; /* Someone beat us to it. */
106925 }
106926- ACCESS_ONCE(rsp->gp_flags) =
106927+ ACCESS_ONCE_RW(rsp->gp_flags) =
106928 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
106929 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
106930 rcu_gp_kthread_wake(rsp);
106931@@ -2860,7 +2860,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
106932 /*
106933 * Do RCU core processing for the current CPU.
106934 */
106935-static void rcu_process_callbacks(struct softirq_action *unused)
106936+static void rcu_process_callbacks(void)
106937 {
106938 struct rcu_state *rsp;
106939
106940@@ -2972,7 +2972,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
106941 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
106942 if (debug_rcu_head_queue(head)) {
106943 /* Probable double call_rcu(), so leak the callback. */
106944- ACCESS_ONCE(head->func) = rcu_leak_callback;
106945+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
106946 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
106947 return;
106948 }
106949@@ -3011,7 +3011,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
106950 if (!likely(rdp->nxtlist))
106951 init_default_callback_list(rdp);
106952 }
106953- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
106954+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
106955 if (lazy)
106956 rdp->qlen_lazy++;
106957 else
106958@@ -3284,11 +3284,11 @@ void synchronize_sched_expedited(void)
106959 * counter wrap on a 32-bit system. Quite a few more CPUs would of
106960 * course be required on a 64-bit system.
106961 */
106962- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
106963+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
106964 (ulong)atomic_long_read(&rsp->expedited_done) +
106965 ULONG_MAX / 8)) {
106966 synchronize_sched();
106967- atomic_long_inc(&rsp->expedited_wrap);
106968+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
106969 return;
106970 }
106971
106972@@ -3296,12 +3296,12 @@ void synchronize_sched_expedited(void)
106973 * Take a ticket. Note that atomic_inc_return() implies a
106974 * full memory barrier.
106975 */
106976- snap = atomic_long_inc_return(&rsp->expedited_start);
106977+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
106978 firstsnap = snap;
106979 if (!try_get_online_cpus()) {
106980 /* CPU hotplug operation in flight, fall back to normal GP. */
106981 wait_rcu_gp(call_rcu_sched);
106982- atomic_long_inc(&rsp->expedited_normal);
106983+ atomic_long_inc_unchecked(&rsp->expedited_normal);
106984 return;
106985 }
106986 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
106987@@ -3314,7 +3314,7 @@ void synchronize_sched_expedited(void)
106988 for_each_cpu(cpu, cm) {
106989 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
106990
106991- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
106992+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
106993 cpumask_clear_cpu(cpu, cm);
106994 }
106995 if (cpumask_weight(cm) == 0)
106996@@ -3329,14 +3329,14 @@ void synchronize_sched_expedited(void)
106997 synchronize_sched_expedited_cpu_stop,
106998 NULL) == -EAGAIN) {
106999 put_online_cpus();
107000- atomic_long_inc(&rsp->expedited_tryfail);
107001+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
107002
107003 /* Check to see if someone else did our work for us. */
107004 s = atomic_long_read(&rsp->expedited_done);
107005 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107006 /* ensure test happens before caller kfree */
107007 smp_mb__before_atomic(); /* ^^^ */
107008- atomic_long_inc(&rsp->expedited_workdone1);
107009+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
107010 free_cpumask_var(cm);
107011 return;
107012 }
107013@@ -3346,7 +3346,7 @@ void synchronize_sched_expedited(void)
107014 udelay(trycount * num_online_cpus());
107015 } else {
107016 wait_rcu_gp(call_rcu_sched);
107017- atomic_long_inc(&rsp->expedited_normal);
107018+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107019 free_cpumask_var(cm);
107020 return;
107021 }
107022@@ -3356,7 +3356,7 @@ void synchronize_sched_expedited(void)
107023 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107024 /* ensure test happens before caller kfree */
107025 smp_mb__before_atomic(); /* ^^^ */
107026- atomic_long_inc(&rsp->expedited_workdone2);
107027+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
107028 free_cpumask_var(cm);
107029 return;
107030 }
107031@@ -3371,14 +3371,14 @@ void synchronize_sched_expedited(void)
107032 if (!try_get_online_cpus()) {
107033 /* CPU hotplug operation in flight, use normal GP. */
107034 wait_rcu_gp(call_rcu_sched);
107035- atomic_long_inc(&rsp->expedited_normal);
107036+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107037 free_cpumask_var(cm);
107038 return;
107039 }
107040- snap = atomic_long_read(&rsp->expedited_start);
107041+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
107042 smp_mb(); /* ensure read is before try_stop_cpus(). */
107043 }
107044- atomic_long_inc(&rsp->expedited_stoppedcpus);
107045+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
107046
107047 all_cpus_idle:
107048 free_cpumask_var(cm);
107049@@ -3390,16 +3390,16 @@ all_cpus_idle:
107050 * than we did already did their update.
107051 */
107052 do {
107053- atomic_long_inc(&rsp->expedited_done_tries);
107054+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
107055 s = atomic_long_read(&rsp->expedited_done);
107056 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
107057 /* ensure test happens before caller kfree */
107058 smp_mb__before_atomic(); /* ^^^ */
107059- atomic_long_inc(&rsp->expedited_done_lost);
107060+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
107061 break;
107062 }
107063 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
107064- atomic_long_inc(&rsp->expedited_done_exit);
107065+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
107066
107067 put_online_cpus();
107068 }
107069@@ -3609,7 +3609,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107070 * ACCESS_ONCE() to prevent the compiler from speculating
107071 * the increment to precede the early-exit check.
107072 */
107073- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107074+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107075 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
107076 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
107077 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
107078@@ -3665,7 +3665,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107079
107080 /* Increment ->n_barrier_done to prevent duplicate work. */
107081 smp_mb(); /* Keep increment after above mechanism. */
107082- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107083+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107084 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
107085 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
107086 smp_mb(); /* Keep increment before caller's subsequent code. */
107087@@ -3732,7 +3732,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
107088 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
107089 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
107090 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
107091- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
107092+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
107093 rdp->cpu = cpu;
107094 rdp->rsp = rsp;
107095 rcu_boot_init_nocb_percpu_data(rdp);
107096@@ -3763,8 +3763,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
107097 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
107098 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
107099 rcu_sysidle_init_percpu_data(rdp->dynticks);
107100- atomic_set(&rdp->dynticks->dynticks,
107101- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
107102+ atomic_set_unchecked(&rdp->dynticks->dynticks,
107103+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
107104 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
107105
107106 /*
107107diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
107108index a69d3da..51993c4 100644
107109--- a/kernel/rcu/tree.h
107110+++ b/kernel/rcu/tree.h
107111@@ -86,11 +86,11 @@ struct rcu_dynticks {
107112 long long dynticks_nesting; /* Track irq/process nesting level. */
107113 /* Process level is worth LLONG_MAX/2. */
107114 int dynticks_nmi_nesting; /* Track NMI nesting level. */
107115- atomic_t dynticks; /* Even value for idle, else odd. */
107116+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
107117 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
107118 long long dynticks_idle_nesting;
107119 /* irq/process nesting level from idle. */
107120- atomic_t dynticks_idle; /* Even value for idle, else odd. */
107121+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
107122 /* "Idle" excludes userspace execution. */
107123 unsigned long dynticks_idle_jiffies;
107124 /* End of last non-NMI non-idle period. */
107125@@ -463,17 +463,17 @@ struct rcu_state {
107126 /* _rcu_barrier(). */
107127 /* End of fields guarded by barrier_mutex. */
107128
107129- atomic_long_t expedited_start; /* Starting ticket. */
107130- atomic_long_t expedited_done; /* Done ticket. */
107131- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
107132- atomic_long_t expedited_tryfail; /* # acquisition failures. */
107133- atomic_long_t expedited_workdone1; /* # done by others #1. */
107134- atomic_long_t expedited_workdone2; /* # done by others #2. */
107135- atomic_long_t expedited_normal; /* # fallbacks to normal. */
107136- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
107137- atomic_long_t expedited_done_tries; /* # tries to update _done. */
107138- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
107139- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
107140+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
107141+ atomic_long_t expedited_done; /* Done ticket. */
107142+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
107143+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
107144+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
107145+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
107146+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
107147+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
107148+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
107149+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
107150+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
107151
107152 unsigned long jiffies_force_qs; /* Time at which to invoke */
107153 /* force_quiescent_state(). */
107154diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
107155index 8c0ec0f..99d52c5 100644
107156--- a/kernel/rcu/tree_plugin.h
107157+++ b/kernel/rcu/tree_plugin.h
107158@@ -570,7 +570,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
107159 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
107160 {
107161 return !rcu_preempted_readers_exp(rnp) &&
107162- ACCESS_ONCE(rnp->expmask) == 0;
107163+ ACCESS_ONCE_RW(rnp->expmask) == 0;
107164 }
107165
107166 /*
107167@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
107168
107169 /* Clean up and exit. */
107170 smp_mb(); /* ensure expedited GP seen before counter increment. */
107171- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
107172+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
107173 sync_rcu_preempt_exp_count + 1;
107174 unlock_mb_ret:
107175 mutex_unlock(&sync_rcu_preempt_exp_mutex);
107176@@ -1286,7 +1286,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
107177 free_cpumask_var(cm);
107178 }
107179
107180-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
107181+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
107182 .store = &rcu_cpu_kthread_task,
107183 .thread_should_run = rcu_cpu_kthread_should_run,
107184 .thread_fn = rcu_cpu_kthread,
107185@@ -1757,7 +1757,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
107186 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
107187 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
107188 cpu, ticks_value, ticks_title,
107189- atomic_read(&rdtp->dynticks) & 0xfff,
107190+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
107191 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
107192 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
107193 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
107194@@ -1902,7 +1902,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
107195 return;
107196 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
107197 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
107198- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
107199+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
107200 wake_up(&rdp_leader->nocb_wq);
107201 }
107202 }
107203@@ -1975,7 +1975,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
107204 atomic_long_add(rhcount, &rdp->nocb_q_count);
107205 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
107206 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
107207- ACCESS_ONCE(*old_rhpp) = rhp;
107208+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
107209 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
107210 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
107211
107212@@ -2164,7 +2164,7 @@ wait_again:
107213 continue; /* No CBs here, try next follower. */
107214
107215 /* Move callbacks to wait-for-GP list, which is empty. */
107216- ACCESS_ONCE(rdp->nocb_head) = NULL;
107217+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
107218 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
107219 gotcbs = true;
107220 }
107221@@ -2285,7 +2285,7 @@ static int rcu_nocb_kthread(void *arg)
107222 list = ACCESS_ONCE(rdp->nocb_follower_head);
107223 BUG_ON(!list);
107224 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
107225- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
107226+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
107227 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
107228
107229 /* Each pass through the following loop invokes a callback. */
107230@@ -2335,7 +2335,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
107231 if (!rcu_nocb_need_deferred_wakeup(rdp))
107232 return;
107233 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
107234- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107235+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107236 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
107237 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
107238 }
107239@@ -2448,7 +2448,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
107240 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
107241 "rcuo%c/%d", rsp->abbr, cpu);
107242 BUG_ON(IS_ERR(t));
107243- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
107244+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
107245 }
107246
107247 /*
107248@@ -2663,11 +2663,11 @@ static void rcu_sysidle_enter(int irq)
107249
107250 /* Record start of fully idle period. */
107251 j = jiffies;
107252- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
107253+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
107254 smp_mb__before_atomic();
107255- atomic_inc(&rdtp->dynticks_idle);
107256+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107257 smp_mb__after_atomic();
107258- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
107259+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
107260 }
107261
107262 /*
107263@@ -2738,9 +2738,9 @@ static void rcu_sysidle_exit(int irq)
107264
107265 /* Record end of idle period. */
107266 smp_mb__before_atomic();
107267- atomic_inc(&rdtp->dynticks_idle);
107268+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107269 smp_mb__after_atomic();
107270- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
107271+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
107272
107273 /*
107274 * If we are the timekeeping CPU, we are permitted to be non-idle
107275@@ -2786,7 +2786,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
107276 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
107277
107278 /* Pick up current idle and NMI-nesting counter and check. */
107279- cur = atomic_read(&rdtp->dynticks_idle);
107280+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
107281 if (cur & 0x1) {
107282 *isidle = false; /* We are not idle! */
107283 return;
107284@@ -2835,7 +2835,7 @@ static void rcu_sysidle(unsigned long j)
107285 case RCU_SYSIDLE_NOT:
107286
107287 /* First time all are idle, so note a short idle period. */
107288- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107289+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107290 break;
107291
107292 case RCU_SYSIDLE_SHORT:
107293@@ -2873,7 +2873,7 @@ static void rcu_sysidle_cancel(void)
107294 {
107295 smp_mb();
107296 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
107297- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
107298+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
107299 }
107300
107301 /*
107302@@ -2925,7 +2925,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
107303 smp_mb(); /* grace period precedes setting inuse. */
107304
107305 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
107306- ACCESS_ONCE(rshp->inuse) = 0;
107307+ ACCESS_ONCE_RW(rshp->inuse) = 0;
107308 }
107309
107310 /*
107311@@ -3077,7 +3077,7 @@ static void rcu_bind_gp_kthread(void)
107312 static void rcu_dynticks_task_enter(void)
107313 {
107314 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107315- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
107316+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
107317 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107318 }
107319
107320@@ -3085,6 +3085,6 @@ static void rcu_dynticks_task_enter(void)
107321 static void rcu_dynticks_task_exit(void)
107322 {
107323 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107324- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
107325+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
107326 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107327 }
107328diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
107329index f92361e..0052f88 100644
107330--- a/kernel/rcu/tree_trace.c
107331+++ b/kernel/rcu/tree_trace.c
107332@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
107333 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
107334 rdp->qs_pending);
107335 seq_printf(m, " dt=%d/%llx/%d df=%lu",
107336- atomic_read(&rdp->dynticks->dynticks),
107337+ atomic_read_unchecked(&rdp->dynticks->dynticks),
107338 rdp->dynticks->dynticks_nesting,
107339 rdp->dynticks->dynticks_nmi_nesting,
107340 rdp->dynticks_fqs);
107341@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
107342 struct rcu_state *rsp = (struct rcu_state *)m->private;
107343
107344 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",
107345- atomic_long_read(&rsp->expedited_start),
107346+ atomic_long_read_unchecked(&rsp->expedited_start),
107347 atomic_long_read(&rsp->expedited_done),
107348- atomic_long_read(&rsp->expedited_wrap),
107349- atomic_long_read(&rsp->expedited_tryfail),
107350- atomic_long_read(&rsp->expedited_workdone1),
107351- atomic_long_read(&rsp->expedited_workdone2),
107352- atomic_long_read(&rsp->expedited_normal),
107353- atomic_long_read(&rsp->expedited_stoppedcpus),
107354- atomic_long_read(&rsp->expedited_done_tries),
107355- atomic_long_read(&rsp->expedited_done_lost),
107356- atomic_long_read(&rsp->expedited_done_exit));
107357+ atomic_long_read_unchecked(&rsp->expedited_wrap),
107358+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
107359+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
107360+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
107361+ atomic_long_read_unchecked(&rsp->expedited_normal),
107362+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
107363+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
107364+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
107365+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
107366 return 0;
107367 }
107368
107369diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
107370index 1f13335..77ebb7f 100644
107371--- a/kernel/rcu/update.c
107372+++ b/kernel/rcu/update.c
107373@@ -396,10 +396,10 @@ int rcu_jiffies_till_stall_check(void)
107374 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
107375 */
107376 if (till_stall_check < 3) {
107377- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
107378+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
107379 till_stall_check = 3;
107380 } else if (till_stall_check > 300) {
107381- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
107382+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
107383 till_stall_check = 300;
107384 }
107385 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
107386@@ -555,7 +555,7 @@ static void check_holdout_task(struct task_struct *t,
107387 !ACCESS_ONCE(t->on_rq) ||
107388 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
107389 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
107390- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
107391+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
107392 list_del_init(&t->rcu_tasks_holdout_list);
107393 put_task_struct(t);
107394 return;
107395@@ -643,7 +643,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
107396 !is_idle_task(t)) {
107397 get_task_struct(t);
107398 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
107399- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
107400+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
107401 list_add(&t->rcu_tasks_holdout_list,
107402 &rcu_tasks_holdouts);
107403 }
107404@@ -740,7 +740,7 @@ static void rcu_spawn_tasks_kthread(void)
107405 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
107406 BUG_ON(IS_ERR(t));
107407 smp_mb(); /* Ensure others see full kthread. */
107408- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
107409+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
107410 mutex_unlock(&rcu_tasks_kthread_mutex);
107411 }
107412
107413diff --git a/kernel/resource.c b/kernel/resource.c
107414index 90552aa..ad13346 100644
107415--- a/kernel/resource.c
107416+++ b/kernel/resource.c
107417@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
107418
107419 static int __init ioresources_init(void)
107420 {
107421+#ifdef CONFIG_GRKERNSEC_PROC_ADD
107422+#ifdef CONFIG_GRKERNSEC_PROC_USER
107423+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
107424+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
107425+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
107426+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
107427+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
107428+#endif
107429+#else
107430 proc_create("ioports", 0, NULL, &proc_ioports_operations);
107431 proc_create("iomem", 0, NULL, &proc_iomem_operations);
107432+#endif
107433 return 0;
107434 }
107435 __initcall(ioresources_init);
107436@@ -504,13 +514,13 @@ int region_is_ram(resource_size_t start, unsigned long size)
107437 {
107438 struct resource *p;
107439 resource_size_t end = start + size - 1;
107440- int flags = IORESOURCE_MEM | IORESOURCE_BUSY;
107441+ unsigned long flags = IORESOURCE_MEM | IORESOURCE_BUSY;
107442 const char *name = "System RAM";
107443 int ret = -1;
107444
107445 read_lock(&resource_lock);
107446 for (p = iomem_resource.child; p ; p = p->sibling) {
107447- if (end < p->start)
107448+ if (p->end < start)
107449 continue;
107450
107451 if (p->start <= start && end <= p->end) {
107452@@ -521,7 +531,7 @@ int region_is_ram(resource_size_t start, unsigned long size)
107453 ret = 1;
107454 break;
107455 }
107456- if (p->end < start)
107457+ if (end < p->start)
107458 break; /* not found */
107459 }
107460 read_unlock(&resource_lock);
107461diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
107462index eae160d..c9aa22e 100644
107463--- a/kernel/sched/auto_group.c
107464+++ b/kernel/sched/auto_group.c
107465@@ -11,7 +11,7 @@
107466
107467 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
107468 static struct autogroup autogroup_default;
107469-static atomic_t autogroup_seq_nr;
107470+static atomic_unchecked_t autogroup_seq_nr;
107471
107472 void __init autogroup_init(struct task_struct *init_task)
107473 {
107474@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
107475
107476 kref_init(&ag->kref);
107477 init_rwsem(&ag->lock);
107478- ag->id = atomic_inc_return(&autogroup_seq_nr);
107479+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
107480 ag->tg = tg;
107481 #ifdef CONFIG_RT_GROUP_SCHED
107482 /*
107483diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
107484index 8d0f35d..c16360d 100644
107485--- a/kernel/sched/completion.c
107486+++ b/kernel/sched/completion.c
107487@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
107488 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107489 * or number of jiffies left till timeout) if completed.
107490 */
107491-long __sched
107492+long __sched __intentional_overflow(-1)
107493 wait_for_completion_interruptible_timeout(struct completion *x,
107494 unsigned long timeout)
107495 {
107496@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
107497 *
107498 * Return: -ERESTARTSYS if interrupted, 0 if completed.
107499 */
107500-int __sched wait_for_completion_killable(struct completion *x)
107501+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
107502 {
107503 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
107504 if (t == -ERESTARTSYS)
107505@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
107506 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107507 * or number of jiffies left till timeout) if completed.
107508 */
107509-long __sched
107510+long __sched __intentional_overflow(-1)
107511 wait_for_completion_killable_timeout(struct completion *x,
107512 unsigned long timeout)
107513 {
107514diff --git a/kernel/sched/core.c b/kernel/sched/core.c
107515index 1236732..df281d6 100644
107516--- a/kernel/sched/core.c
107517+++ b/kernel/sched/core.c
107518@@ -1867,7 +1867,7 @@ void set_numabalancing_state(bool enabled)
107519 int sysctl_numa_balancing(struct ctl_table *table, int write,
107520 void __user *buffer, size_t *lenp, loff_t *ppos)
107521 {
107522- struct ctl_table t;
107523+ ctl_table_no_const t;
107524 int err;
107525 int state = numabalancing_enabled;
107526
107527@@ -2317,8 +2317,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
107528 next->active_mm = oldmm;
107529 atomic_inc(&oldmm->mm_count);
107530 enter_lazy_tlb(oldmm, next);
107531- } else
107532+ } else {
107533 switch_mm(oldmm, mm, next);
107534+ populate_stack();
107535+ }
107536
107537 if (!prev->mm) {
107538 prev->active_mm = NULL;
107539@@ -3129,6 +3131,8 @@ int can_nice(const struct task_struct *p, const int nice)
107540 /* convert nice value [19,-20] to rlimit style value [1,40] */
107541 int nice_rlim = nice_to_rlimit(nice);
107542
107543+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
107544+
107545 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
107546 capable(CAP_SYS_NICE));
107547 }
107548@@ -3155,7 +3159,8 @@ SYSCALL_DEFINE1(nice, int, increment)
107549 nice = task_nice(current) + increment;
107550
107551 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
107552- if (increment < 0 && !can_nice(current, nice))
107553+ if (increment < 0 && (!can_nice(current, nice) ||
107554+ gr_handle_chroot_nice()))
107555 return -EPERM;
107556
107557 retval = security_task_setnice(current, nice);
107558@@ -3467,6 +3472,7 @@ recheck:
107559 if (policy != p->policy && !rlim_rtprio)
107560 return -EPERM;
107561
107562+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
107563 /* can't increase priority */
107564 if (attr->sched_priority > p->rt_priority &&
107565 attr->sched_priority > rlim_rtprio)
107566@@ -4950,6 +4956,7 @@ void idle_task_exit(void)
107567
107568 if (mm != &init_mm) {
107569 switch_mm(mm, &init_mm, current);
107570+ populate_stack();
107571 finish_arch_post_lock_switch();
107572 }
107573 mmdrop(mm);
107574@@ -5045,7 +5052,7 @@ static void migrate_tasks(unsigned int dead_cpu)
107575
107576 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
107577
107578-static struct ctl_table sd_ctl_dir[] = {
107579+static ctl_table_no_const sd_ctl_dir[] __read_only = {
107580 {
107581 .procname = "sched_domain",
107582 .mode = 0555,
107583@@ -5062,17 +5069,17 @@ static struct ctl_table sd_ctl_root[] = {
107584 {}
107585 };
107586
107587-static struct ctl_table *sd_alloc_ctl_entry(int n)
107588+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
107589 {
107590- struct ctl_table *entry =
107591+ ctl_table_no_const *entry =
107592 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
107593
107594 return entry;
107595 }
107596
107597-static void sd_free_ctl_entry(struct ctl_table **tablep)
107598+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
107599 {
107600- struct ctl_table *entry;
107601+ ctl_table_no_const *entry;
107602
107603 /*
107604 * In the intermediate directories, both the child directory and
107605@@ -5080,22 +5087,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
107606 * will always be set. In the lowest directory the names are
107607 * static strings and all have proc handlers.
107608 */
107609- for (entry = *tablep; entry->mode; entry++) {
107610- if (entry->child)
107611- sd_free_ctl_entry(&entry->child);
107612+ for (entry = tablep; entry->mode; entry++) {
107613+ if (entry->child) {
107614+ sd_free_ctl_entry(entry->child);
107615+ pax_open_kernel();
107616+ entry->child = NULL;
107617+ pax_close_kernel();
107618+ }
107619 if (entry->proc_handler == NULL)
107620 kfree(entry->procname);
107621 }
107622
107623- kfree(*tablep);
107624- *tablep = NULL;
107625+ kfree(tablep);
107626 }
107627
107628 static int min_load_idx = 0;
107629 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
107630
107631 static void
107632-set_table_entry(struct ctl_table *entry,
107633+set_table_entry(ctl_table_no_const *entry,
107634 const char *procname, void *data, int maxlen,
107635 umode_t mode, proc_handler *proc_handler,
107636 bool load_idx)
107637@@ -5115,7 +5125,7 @@ set_table_entry(struct ctl_table *entry,
107638 static struct ctl_table *
107639 sd_alloc_ctl_domain_table(struct sched_domain *sd)
107640 {
107641- struct ctl_table *table = sd_alloc_ctl_entry(14);
107642+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
107643
107644 if (table == NULL)
107645 return NULL;
107646@@ -5153,9 +5163,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
107647 return table;
107648 }
107649
107650-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
107651+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
107652 {
107653- struct ctl_table *entry, *table;
107654+ ctl_table_no_const *entry, *table;
107655 struct sched_domain *sd;
107656 int domain_num = 0, i;
107657 char buf[32];
107658@@ -5182,11 +5192,13 @@ static struct ctl_table_header *sd_sysctl_header;
107659 static void register_sched_domain_sysctl(void)
107660 {
107661 int i, cpu_num = num_possible_cpus();
107662- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
107663+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
107664 char buf[32];
107665
107666 WARN_ON(sd_ctl_dir[0].child);
107667+ pax_open_kernel();
107668 sd_ctl_dir[0].child = entry;
107669+ pax_close_kernel();
107670
107671 if (entry == NULL)
107672 return;
107673@@ -5209,8 +5221,12 @@ static void unregister_sched_domain_sysctl(void)
107674 if (sd_sysctl_header)
107675 unregister_sysctl_table(sd_sysctl_header);
107676 sd_sysctl_header = NULL;
107677- if (sd_ctl_dir[0].child)
107678- sd_free_ctl_entry(&sd_ctl_dir[0].child);
107679+ if (sd_ctl_dir[0].child) {
107680+ sd_free_ctl_entry(sd_ctl_dir[0].child);
107681+ pax_open_kernel();
107682+ sd_ctl_dir[0].child = NULL;
107683+ pax_close_kernel();
107684+ }
107685 }
107686 #else
107687 static void register_sched_domain_sysctl(void)
107688diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
107689index c2980e8..4737a6d 100644
107690--- a/kernel/sched/fair.c
107691+++ b/kernel/sched/fair.c
107692@@ -2107,7 +2107,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
107693
107694 static void reset_ptenuma_scan(struct task_struct *p)
107695 {
107696- ACCESS_ONCE(p->mm->numa_scan_seq)++;
107697+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
107698 p->mm->numa_scan_offset = 0;
107699 }
107700
107701@@ -7753,7 +7753,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
107702 * run_rebalance_domains is triggered when needed from the scheduler tick.
107703 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
107704 */
107705-static void run_rebalance_domains(struct softirq_action *h)
107706+static __latent_entropy void run_rebalance_domains(void)
107707 {
107708 struct rq *this_rq = this_rq();
107709 enum cpu_idle_type idle = this_rq->idle_balance ?
107710diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
107711index e0e1299..e1e896b 100644
107712--- a/kernel/sched/sched.h
107713+++ b/kernel/sched/sched.h
107714@@ -1219,7 +1219,7 @@ struct sched_class {
107715 #ifdef CONFIG_FAIR_GROUP_SCHED
107716 void (*task_move_group) (struct task_struct *p, int on_rq);
107717 #endif
107718-};
107719+} __do_const;
107720
107721 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
107722 {
107723diff --git a/kernel/signal.c b/kernel/signal.c
107724index 0206be7..6445784 100644
107725--- a/kernel/signal.c
107726+++ b/kernel/signal.c
107727@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
107728
107729 int print_fatal_signals __read_mostly;
107730
107731-static void __user *sig_handler(struct task_struct *t, int sig)
107732+static __sighandler_t sig_handler(struct task_struct *t, int sig)
107733 {
107734 return t->sighand->action[sig - 1].sa.sa_handler;
107735 }
107736
107737-static int sig_handler_ignored(void __user *handler, int sig)
107738+static int sig_handler_ignored(__sighandler_t handler, int sig)
107739 {
107740 /* Is it explicitly or implicitly ignored? */
107741 return handler == SIG_IGN ||
107742@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
107743
107744 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
107745 {
107746- void __user *handler;
107747+ __sighandler_t handler;
107748
107749 handler = sig_handler(t, sig);
107750
107751@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
107752 atomic_inc(&user->sigpending);
107753 rcu_read_unlock();
107754
107755+ if (!override_rlimit)
107756+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
107757+
107758 if (override_rlimit ||
107759 atomic_read(&user->sigpending) <=
107760 task_rlimit(t, RLIMIT_SIGPENDING)) {
107761@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
107762
107763 int unhandled_signal(struct task_struct *tsk, int sig)
107764 {
107765- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
107766+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
107767 if (is_global_init(tsk))
107768 return 1;
107769 if (handler != SIG_IGN && handler != SIG_DFL)
107770@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
107771 }
107772 }
107773
107774+ /* allow glibc communication via tgkill to other threads in our
107775+ thread group */
107776+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
107777+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
107778+ && gr_handle_signal(t, sig))
107779+ return -EPERM;
107780+
107781 return security_task_kill(t, info, sig, 0);
107782 }
107783
107784@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
107785 return send_signal(sig, info, p, 1);
107786 }
107787
107788-static int
107789+int
107790 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107791 {
107792 return send_signal(sig, info, t, 0);
107793@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107794 unsigned long int flags;
107795 int ret, blocked, ignored;
107796 struct k_sigaction *action;
107797+ int is_unhandled = 0;
107798
107799 spin_lock_irqsave(&t->sighand->siglock, flags);
107800 action = &t->sighand->action[sig-1];
107801@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107802 }
107803 if (action->sa.sa_handler == SIG_DFL)
107804 t->signal->flags &= ~SIGNAL_UNKILLABLE;
107805+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
107806+ is_unhandled = 1;
107807 ret = specific_send_sig_info(sig, info, t);
107808 spin_unlock_irqrestore(&t->sighand->siglock, flags);
107809
107810+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
107811+ normal operation */
107812+ if (is_unhandled) {
107813+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
107814+ gr_handle_crash(t, sig);
107815+ }
107816+
107817 return ret;
107818 }
107819
107820@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
107821 ret = check_kill_permission(sig, info, p);
107822 rcu_read_unlock();
107823
107824- if (!ret && sig)
107825+ if (!ret && sig) {
107826 ret = do_send_sig_info(sig, info, p, true);
107827+ if (!ret)
107828+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
107829+ }
107830
107831 return ret;
107832 }
107833@@ -2918,7 +2941,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
107834 int error = -ESRCH;
107835
107836 rcu_read_lock();
107837- p = find_task_by_vpid(pid);
107838+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
107839+ /* allow glibc communication via tgkill to other threads in our
107840+ thread group */
107841+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
107842+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
107843+ p = find_task_by_vpid_unrestricted(pid);
107844+ else
107845+#endif
107846+ p = find_task_by_vpid(pid);
107847 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
107848 error = check_kill_permission(sig, info, p);
107849 /*
107850@@ -3247,8 +3278,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
107851 }
107852 seg = get_fs();
107853 set_fs(KERNEL_DS);
107854- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
107855- (stack_t __force __user *) &uoss,
107856+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
107857+ (stack_t __force_user *) &uoss,
107858 compat_user_stack_pointer());
107859 set_fs(seg);
107860 if (ret >= 0 && uoss_ptr) {
107861diff --git a/kernel/smpboot.c b/kernel/smpboot.c
107862index c697f73..4ef1c25 100644
107863--- a/kernel/smpboot.c
107864+++ b/kernel/smpboot.c
107865@@ -291,7 +291,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
107866 }
107867 smpboot_unpark_thread(plug_thread, cpu);
107868 }
107869- list_add(&plug_thread->list, &hotplug_threads);
107870+ pax_list_add(&plug_thread->list, &hotplug_threads);
107871 out:
107872 mutex_unlock(&smpboot_threads_lock);
107873 put_online_cpus();
107874@@ -309,7 +309,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
107875 {
107876 get_online_cpus();
107877 mutex_lock(&smpboot_threads_lock);
107878- list_del(&plug_thread->list);
107879+ pax_list_del(&plug_thread->list);
107880 smpboot_destroy_threads(plug_thread);
107881 mutex_unlock(&smpboot_threads_lock);
107882 put_online_cpus();
107883diff --git a/kernel/softirq.c b/kernel/softirq.c
107884index 479e443..66d845e1 100644
107885--- a/kernel/softirq.c
107886+++ b/kernel/softirq.c
107887@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
107888 EXPORT_SYMBOL(irq_stat);
107889 #endif
107890
107891-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
107892+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
107893
107894 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
107895
107896@@ -270,7 +270,7 @@ restart:
107897 kstat_incr_softirqs_this_cpu(vec_nr);
107898
107899 trace_softirq_entry(vec_nr);
107900- h->action(h);
107901+ h->action();
107902 trace_softirq_exit(vec_nr);
107903 if (unlikely(prev_count != preempt_count())) {
107904 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
107905@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
107906 or_softirq_pending(1UL << nr);
107907 }
107908
107909-void open_softirq(int nr, void (*action)(struct softirq_action *))
107910+void __init open_softirq(int nr, void (*action)(void))
107911 {
107912 softirq_vec[nr].action = action;
107913 }
107914@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
107915 }
107916 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
107917
107918-static void tasklet_action(struct softirq_action *a)
107919+static void tasklet_action(void)
107920 {
107921 struct tasklet_struct *list;
107922
107923@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
107924 }
107925 }
107926
107927-static void tasklet_hi_action(struct softirq_action *a)
107928+static __latent_entropy void tasklet_hi_action(void)
107929 {
107930 struct tasklet_struct *list;
107931
107932@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
107933 .notifier_call = cpu_callback
107934 };
107935
107936-static struct smp_hotplug_thread softirq_threads = {
107937+static struct smp_hotplug_thread softirq_threads __read_only = {
107938 .store = &ksoftirqd,
107939 .thread_should_run = ksoftirqd_should_run,
107940 .thread_fn = run_ksoftirqd,
107941diff --git a/kernel/sys.c b/kernel/sys.c
107942index a4e372b..766810e 100644
107943--- a/kernel/sys.c
107944+++ b/kernel/sys.c
107945@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
107946 error = -EACCES;
107947 goto out;
107948 }
107949+
107950+ if (gr_handle_chroot_setpriority(p, niceval)) {
107951+ error = -EACCES;
107952+ goto out;
107953+ }
107954+
107955 no_nice = security_task_setnice(p, niceval);
107956 if (no_nice) {
107957 error = no_nice;
107958@@ -366,6 +372,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
107959 goto error;
107960 }
107961
107962+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
107963+ goto error;
107964+
107965+ if (!gid_eq(new->gid, old->gid)) {
107966+ /* make sure we generate a learn log for what will
107967+ end up being a role transition after a full-learning
107968+ policy is generated
107969+ CAP_SETGID is required to perform a transition
107970+ we may not log a CAP_SETGID check above, e.g.
107971+ in the case where new rgid = old egid
107972+ */
107973+ gr_learn_cap(current, new, CAP_SETGID);
107974+ }
107975+
107976 if (rgid != (gid_t) -1 ||
107977 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
107978 new->sgid = new->egid;
107979@@ -401,6 +421,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
107980 old = current_cred();
107981
107982 retval = -EPERM;
107983+
107984+ if (gr_check_group_change(kgid, kgid, kgid))
107985+ goto error;
107986+
107987 if (ns_capable(old->user_ns, CAP_SETGID))
107988 new->gid = new->egid = new->sgid = new->fsgid = kgid;
107989 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
107990@@ -418,7 +442,7 @@ error:
107991 /*
107992 * change the user struct in a credentials set to match the new UID
107993 */
107994-static int set_user(struct cred *new)
107995+int set_user(struct cred *new)
107996 {
107997 struct user_struct *new_user;
107998
107999@@ -498,7 +522,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
108000 goto error;
108001 }
108002
108003+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
108004+ goto error;
108005+
108006 if (!uid_eq(new->uid, old->uid)) {
108007+ /* make sure we generate a learn log for what will
108008+ end up being a role transition after a full-learning
108009+ policy is generated
108010+ CAP_SETUID is required to perform a transition
108011+ we may not log a CAP_SETUID check above, e.g.
108012+ in the case where new ruid = old euid
108013+ */
108014+ gr_learn_cap(current, new, CAP_SETUID);
108015 retval = set_user(new);
108016 if (retval < 0)
108017 goto error;
108018@@ -548,6 +583,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
108019 old = current_cred();
108020
108021 retval = -EPERM;
108022+
108023+ if (gr_check_crash_uid(kuid))
108024+ goto error;
108025+ if (gr_check_user_change(kuid, kuid, kuid))
108026+ goto error;
108027+
108028 if (ns_capable(old->user_ns, CAP_SETUID)) {
108029 new->suid = new->uid = kuid;
108030 if (!uid_eq(kuid, old->uid)) {
108031@@ -617,6 +658,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
108032 goto error;
108033 }
108034
108035+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
108036+ goto error;
108037+
108038 if (ruid != (uid_t) -1) {
108039 new->uid = kruid;
108040 if (!uid_eq(kruid, old->uid)) {
108041@@ -701,6 +745,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
108042 goto error;
108043 }
108044
108045+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
108046+ goto error;
108047+
108048 if (rgid != (gid_t) -1)
108049 new->gid = krgid;
108050 if (egid != (gid_t) -1)
108051@@ -765,12 +812,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
108052 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
108053 ns_capable(old->user_ns, CAP_SETUID)) {
108054 if (!uid_eq(kuid, old->fsuid)) {
108055+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
108056+ goto error;
108057+
108058 new->fsuid = kuid;
108059 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
108060 goto change_okay;
108061 }
108062 }
108063
108064+error:
108065 abort_creds(new);
108066 return old_fsuid;
108067
108068@@ -803,12 +854,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
108069 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
108070 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
108071 ns_capable(old->user_ns, CAP_SETGID)) {
108072+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
108073+ goto error;
108074+
108075 if (!gid_eq(kgid, old->fsgid)) {
108076 new->fsgid = kgid;
108077 goto change_okay;
108078 }
108079 }
108080
108081+error:
108082 abort_creds(new);
108083 return old_fsgid;
108084
108085@@ -1187,19 +1242,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
108086 return -EFAULT;
108087
108088 down_read(&uts_sem);
108089- error = __copy_to_user(&name->sysname, &utsname()->sysname,
108090+ error = __copy_to_user(name->sysname, &utsname()->sysname,
108091 __OLD_UTS_LEN);
108092 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
108093- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
108094+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
108095 __OLD_UTS_LEN);
108096 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
108097- error |= __copy_to_user(&name->release, &utsname()->release,
108098+ error |= __copy_to_user(name->release, &utsname()->release,
108099 __OLD_UTS_LEN);
108100 error |= __put_user(0, name->release + __OLD_UTS_LEN);
108101- error |= __copy_to_user(&name->version, &utsname()->version,
108102+ error |= __copy_to_user(name->version, &utsname()->version,
108103 __OLD_UTS_LEN);
108104 error |= __put_user(0, name->version + __OLD_UTS_LEN);
108105- error |= __copy_to_user(&name->machine, &utsname()->machine,
108106+ error |= __copy_to_user(name->machine, &utsname()->machine,
108107 __OLD_UTS_LEN);
108108 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
108109 up_read(&uts_sem);
108110@@ -1400,6 +1455,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
108111 */
108112 new_rlim->rlim_cur = 1;
108113 }
108114+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
108115+ is changed to a lower value. Since tasks can be created by the same
108116+ user in between this limit change and an execve by this task, force
108117+ a recheck only for this task by setting PF_NPROC_EXCEEDED
108118+ */
108119+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
108120+ tsk->flags |= PF_NPROC_EXCEEDED;
108121 }
108122 if (!retval) {
108123 if (old_rlim)
108124diff --git a/kernel/sysctl.c b/kernel/sysctl.c
108125index c3eee4c..586e4a0 100644
108126--- a/kernel/sysctl.c
108127+++ b/kernel/sysctl.c
108128@@ -94,7 +94,6 @@
108129 #endif
108130
108131 #if defined(CONFIG_SYSCTL)
108132-
108133 /* External variables not in a header file. */
108134 extern int suid_dumpable;
108135 #ifdef CONFIG_COREDUMP
108136@@ -111,22 +110,24 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
108137 #ifndef CONFIG_MMU
108138 extern int sysctl_nr_trim_pages;
108139 #endif
108140+extern int sysctl_modify_ldt;
108141
108142 /* Constants used for minimum and maximum */
108143 #ifdef CONFIG_LOCKUP_DETECTOR
108144-static int sixty = 60;
108145+static int sixty __read_only = 60;
108146 #endif
108147
108148-static int __maybe_unused neg_one = -1;
108149+static int __maybe_unused neg_one __read_only = -1;
108150
108151-static int zero;
108152-static int __maybe_unused one = 1;
108153-static int __maybe_unused two = 2;
108154-static int __maybe_unused four = 4;
108155-static unsigned long one_ul = 1;
108156-static int one_hundred = 100;
108157+static int zero __read_only = 0;
108158+static int __maybe_unused one __read_only = 1;
108159+static int __maybe_unused two __read_only = 2;
108160+static int __maybe_unused three __read_only = 3;
108161+static int __maybe_unused four __read_only = 4;
108162+static unsigned long one_ul __read_only = 1;
108163+static int one_hundred __read_only = 100;
108164 #ifdef CONFIG_PRINTK
108165-static int ten_thousand = 10000;
108166+static int ten_thousand __read_only = 10000;
108167 #endif
108168
108169 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
108170@@ -180,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
108171 void __user *buffer, size_t *lenp, loff_t *ppos);
108172 #endif
108173
108174-#ifdef CONFIG_PRINTK
108175-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108176+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108177 void __user *buffer, size_t *lenp, loff_t *ppos);
108178-#endif
108179
108180 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
108181 void __user *buffer, size_t *lenp, loff_t *ppos);
108182@@ -214,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
108183
108184 #endif
108185
108186+extern struct ctl_table grsecurity_table[];
108187+
108188 static struct ctl_table kern_table[];
108189 static struct ctl_table vm_table[];
108190 static struct ctl_table fs_table[];
108191@@ -228,6 +229,20 @@ extern struct ctl_table epoll_table[];
108192 int sysctl_legacy_va_layout;
108193 #endif
108194
108195+#ifdef CONFIG_PAX_SOFTMODE
108196+static struct ctl_table pax_table[] = {
108197+ {
108198+ .procname = "softmode",
108199+ .data = &pax_softmode,
108200+ .maxlen = sizeof(unsigned int),
108201+ .mode = 0600,
108202+ .proc_handler = &proc_dointvec,
108203+ },
108204+
108205+ { }
108206+};
108207+#endif
108208+
108209 /* The default sysctl tables: */
108210
108211 static struct ctl_table sysctl_base_table[] = {
108212@@ -276,6 +291,22 @@ static int max_extfrag_threshold = 1000;
108213 #endif
108214
108215 static struct ctl_table kern_table[] = {
108216+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
108217+ {
108218+ .procname = "grsecurity",
108219+ .mode = 0500,
108220+ .child = grsecurity_table,
108221+ },
108222+#endif
108223+
108224+#ifdef CONFIG_PAX_SOFTMODE
108225+ {
108226+ .procname = "pax",
108227+ .mode = 0500,
108228+ .child = pax_table,
108229+ },
108230+#endif
108231+
108232 {
108233 .procname = "sched_child_runs_first",
108234 .data = &sysctl_sched_child_runs_first,
108235@@ -637,7 +668,7 @@ static struct ctl_table kern_table[] = {
108236 .maxlen = sizeof(int),
108237 .mode = 0644,
108238 /* only handle a transition from default "0" to "1" */
108239- .proc_handler = proc_dointvec_minmax,
108240+ .proc_handler = proc_dointvec_minmax_secure,
108241 .extra1 = &one,
108242 .extra2 = &one,
108243 },
108244@@ -648,7 +679,7 @@ static struct ctl_table kern_table[] = {
108245 .data = &modprobe_path,
108246 .maxlen = KMOD_PATH_LEN,
108247 .mode = 0644,
108248- .proc_handler = proc_dostring,
108249+ .proc_handler = proc_dostring_modpriv,
108250 },
108251 {
108252 .procname = "modules_disabled",
108253@@ -656,7 +687,7 @@ static struct ctl_table kern_table[] = {
108254 .maxlen = sizeof(int),
108255 .mode = 0644,
108256 /* only handle a transition from default "0" to "1" */
108257- .proc_handler = proc_dointvec_minmax,
108258+ .proc_handler = proc_dointvec_minmax_secure,
108259 .extra1 = &one,
108260 .extra2 = &one,
108261 },
108262@@ -811,20 +842,24 @@ static struct ctl_table kern_table[] = {
108263 .data = &dmesg_restrict,
108264 .maxlen = sizeof(int),
108265 .mode = 0644,
108266- .proc_handler = proc_dointvec_minmax_sysadmin,
108267+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108268 .extra1 = &zero,
108269 .extra2 = &one,
108270 },
108271+#endif
108272 {
108273 .procname = "kptr_restrict",
108274 .data = &kptr_restrict,
108275 .maxlen = sizeof(int),
108276 .mode = 0644,
108277- .proc_handler = proc_dointvec_minmax_sysadmin,
108278+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108279+#ifdef CONFIG_GRKERNSEC_HIDESYM
108280+ .extra1 = &two,
108281+#else
108282 .extra1 = &zero,
108283+#endif
108284 .extra2 = &two,
108285 },
108286-#endif
108287 {
108288 .procname = "ngroups_max",
108289 .data = &ngroups_max,
108290@@ -962,6 +997,15 @@ static struct ctl_table kern_table[] = {
108291 .mode = 0644,
108292 .proc_handler = proc_dointvec,
108293 },
108294+ {
108295+ .procname = "modify_ldt",
108296+ .data = &sysctl_modify_ldt,
108297+ .maxlen = sizeof(int),
108298+ .mode = 0644,
108299+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108300+ .extra1 = &zero,
108301+ .extra2 = &one,
108302+ },
108303 #endif
108304 #if defined(CONFIG_MMU)
108305 {
108306@@ -1084,10 +1128,17 @@ static struct ctl_table kern_table[] = {
108307 */
108308 {
108309 .procname = "perf_event_paranoid",
108310- .data = &sysctl_perf_event_paranoid,
108311- .maxlen = sizeof(sysctl_perf_event_paranoid),
108312+ .data = &sysctl_perf_event_legitimately_concerned,
108313+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
108314 .mode = 0644,
108315- .proc_handler = proc_dointvec,
108316+ /* go ahead, be a hero */
108317+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108318+ .extra1 = &neg_one,
108319+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
108320+ .extra2 = &three,
108321+#else
108322+ .extra2 = &two,
108323+#endif
108324 },
108325 {
108326 .procname = "perf_event_mlock_kb",
108327@@ -1369,6 +1420,13 @@ static struct ctl_table vm_table[] = {
108328 .proc_handler = proc_dointvec_minmax,
108329 .extra1 = &zero,
108330 },
108331+ {
108332+ .procname = "heap_stack_gap",
108333+ .data = &sysctl_heap_stack_gap,
108334+ .maxlen = sizeof(sysctl_heap_stack_gap),
108335+ .mode = 0644,
108336+ .proc_handler = proc_doulongvec_minmax,
108337+ },
108338 #else
108339 {
108340 .procname = "nr_trim_pages",
108341@@ -1845,6 +1903,16 @@ int proc_dostring(struct ctl_table *table, int write,
108342 (char __user *)buffer, lenp, ppos);
108343 }
108344
108345+int proc_dostring_modpriv(struct ctl_table *table, int write,
108346+ void __user *buffer, size_t *lenp, loff_t *ppos)
108347+{
108348+ if (write && !capable(CAP_SYS_MODULE))
108349+ return -EPERM;
108350+
108351+ return _proc_do_string(table->data, table->maxlen, write,
108352+ buffer, lenp, ppos);
108353+}
108354+
108355 static size_t proc_skip_spaces(char **buf)
108356 {
108357 size_t ret;
108358@@ -1950,6 +2018,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
108359 len = strlen(tmp);
108360 if (len > *size)
108361 len = *size;
108362+ if (len > sizeof(tmp))
108363+ len = sizeof(tmp);
108364 if (copy_to_user(*buf, tmp, len))
108365 return -EFAULT;
108366 *size -= len;
108367@@ -2128,6 +2198,44 @@ int proc_dointvec(struct ctl_table *table, int write,
108368 NULL,NULL);
108369 }
108370
108371+static int do_proc_dointvec_conv_secure(bool *negp, unsigned long *lvalp,
108372+ int *valp,
108373+ int write, void *data)
108374+{
108375+ if (write) {
108376+ if (*negp) {
108377+ if (*lvalp > (unsigned long) INT_MAX + 1)
108378+ return -EINVAL;
108379+ pax_open_kernel();
108380+ *valp = -*lvalp;
108381+ pax_close_kernel();
108382+ } else {
108383+ if (*lvalp > (unsigned long) INT_MAX)
108384+ return -EINVAL;
108385+ pax_open_kernel();
108386+ *valp = *lvalp;
108387+ pax_close_kernel();
108388+ }
108389+ } else {
108390+ int val = *valp;
108391+ if (val < 0) {
108392+ *negp = true;
108393+ *lvalp = (unsigned long)-val;
108394+ } else {
108395+ *negp = false;
108396+ *lvalp = (unsigned long)val;
108397+ }
108398+ }
108399+ return 0;
108400+}
108401+
108402+int proc_dointvec_secure(struct ctl_table *table, int write,
108403+ void __user *buffer, size_t *lenp, loff_t *ppos)
108404+{
108405+ return do_proc_dointvec(table,write,buffer,lenp,ppos,
108406+ do_proc_dointvec_conv_secure,NULL);
108407+}
108408+
108409 /*
108410 * Taint values can only be increased
108411 * This means we can safely use a temporary.
108412@@ -2135,7 +2243,7 @@ int proc_dointvec(struct ctl_table *table, int write,
108413 static int proc_taint(struct ctl_table *table, int write,
108414 void __user *buffer, size_t *lenp, loff_t *ppos)
108415 {
108416- struct ctl_table t;
108417+ ctl_table_no_const t;
108418 unsigned long tmptaint = get_taint();
108419 int err;
108420
108421@@ -2163,16 +2271,14 @@ static int proc_taint(struct ctl_table *table, int write,
108422 return err;
108423 }
108424
108425-#ifdef CONFIG_PRINTK
108426-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108427+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108428 void __user *buffer, size_t *lenp, loff_t *ppos)
108429 {
108430 if (write && !capable(CAP_SYS_ADMIN))
108431 return -EPERM;
108432
108433- return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
108434+ return proc_dointvec_minmax_secure(table, write, buffer, lenp, ppos);
108435 }
108436-#endif
108437
108438 struct do_proc_dointvec_minmax_conv_param {
108439 int *min;
108440@@ -2203,6 +2309,32 @@ static int do_proc_dointvec_minmax_conv(bool *negp, unsigned long *lvalp,
108441 return 0;
108442 }
108443
108444+static int do_proc_dointvec_minmax_conv_secure(bool *negp, unsigned long *lvalp,
108445+ int *valp,
108446+ int write, void *data)
108447+{
108448+ struct do_proc_dointvec_minmax_conv_param *param = data;
108449+ if (write) {
108450+ int val = *negp ? -*lvalp : *lvalp;
108451+ if ((param->min && *param->min > val) ||
108452+ (param->max && *param->max < val))
108453+ return -EINVAL;
108454+ pax_open_kernel();
108455+ *valp = val;
108456+ pax_close_kernel();
108457+ } else {
108458+ int val = *valp;
108459+ if (val < 0) {
108460+ *negp = true;
108461+ *lvalp = (unsigned long)-val;
108462+ } else {
108463+ *negp = false;
108464+ *lvalp = (unsigned long)val;
108465+ }
108466+ }
108467+ return 0;
108468+}
108469+
108470 /**
108471 * proc_dointvec_minmax - read a vector of integers with min/max values
108472 * @table: the sysctl table
108473@@ -2230,6 +2362,17 @@ int proc_dointvec_minmax(struct ctl_table *table, int write,
108474 do_proc_dointvec_minmax_conv, &param);
108475 }
108476
108477+int proc_dointvec_minmax_secure(struct ctl_table *table, int write,
108478+ void __user *buffer, size_t *lenp, loff_t *ppos)
108479+{
108480+ struct do_proc_dointvec_minmax_conv_param param = {
108481+ .min = (int *) table->extra1,
108482+ .max = (int *) table->extra2,
108483+ };
108484+ return do_proc_dointvec(table, write, buffer, lenp, ppos,
108485+ do_proc_dointvec_minmax_conv_secure, &param);
108486+}
108487+
108488 static void validate_coredump_safety(void)
108489 {
108490 #ifdef CONFIG_COREDUMP
108491@@ -2732,6 +2875,12 @@ int proc_dostring(struct ctl_table *table, int write,
108492 return -ENOSYS;
108493 }
108494
108495+int proc_dostring_modpriv(struct ctl_table *table, int write,
108496+ void __user *buffer, size_t *lenp, loff_t *ppos)
108497+{
108498+ return -ENOSYS;
108499+}
108500+
108501 int proc_dointvec(struct ctl_table *table, int write,
108502 void __user *buffer, size_t *lenp, loff_t *ppos)
108503 {
108504@@ -2788,5 +2937,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
108505 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
108506 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
108507 EXPORT_SYMBOL(proc_dostring);
108508+EXPORT_SYMBOL(proc_dostring_modpriv);
108509 EXPORT_SYMBOL(proc_doulongvec_minmax);
108510 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
108511diff --git a/kernel/taskstats.c b/kernel/taskstats.c
108512index 21f82c2..c1984e5 100644
108513--- a/kernel/taskstats.c
108514+++ b/kernel/taskstats.c
108515@@ -28,9 +28,12 @@
108516 #include <linux/fs.h>
108517 #include <linux/file.h>
108518 #include <linux/pid_namespace.h>
108519+#include <linux/grsecurity.h>
108520 #include <net/genetlink.h>
108521 #include <linux/atomic.h>
108522
108523+extern int gr_is_taskstats_denied(int pid);
108524+
108525 /*
108526 * Maximum length of a cpumask that can be specified in
108527 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
108528@@ -567,6 +570,9 @@ err:
108529
108530 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
108531 {
108532+ if (gr_is_taskstats_denied(current->pid))
108533+ return -EACCES;
108534+
108535 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
108536 return cmd_attr_register_cpumask(info);
108537 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
108538diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
108539index 1b001ed..55ef9e4 100644
108540--- a/kernel/time/alarmtimer.c
108541+++ b/kernel/time/alarmtimer.c
108542@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
108543 struct platform_device *pdev;
108544 int error = 0;
108545 int i;
108546- struct k_clock alarm_clock = {
108547+ static struct k_clock alarm_clock = {
108548 .clock_getres = alarm_clock_getres,
108549 .clock_get = alarm_clock_get,
108550 .timer_create = alarm_timer_create,
108551diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
108552index 93ef7190..7c85701 100644
108553--- a/kernel/time/hrtimer.c
108554+++ b/kernel/time/hrtimer.c
108555@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
108556 local_irq_restore(flags);
108557 }
108558
108559-static void run_hrtimer_softirq(struct softirq_action *h)
108560+static __latent_entropy void run_hrtimer_softirq(void)
108561 {
108562 hrtimer_peek_ahead_timers();
108563 }
108564diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
108565index 0075da7..63cc872 100644
108566--- a/kernel/time/posix-cpu-timers.c
108567+++ b/kernel/time/posix-cpu-timers.c
108568@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
108569
108570 static __init int init_posix_cpu_timers(void)
108571 {
108572- struct k_clock process = {
108573+ static struct k_clock process = {
108574 .clock_getres = process_cpu_clock_getres,
108575 .clock_get = process_cpu_clock_get,
108576 .timer_create = process_cpu_timer_create,
108577 .nsleep = process_cpu_nsleep,
108578 .nsleep_restart = process_cpu_nsleep_restart,
108579 };
108580- struct k_clock thread = {
108581+ static struct k_clock thread = {
108582 .clock_getres = thread_cpu_clock_getres,
108583 .clock_get = thread_cpu_clock_get,
108584 .timer_create = thread_cpu_timer_create,
108585diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
108586index 31ea01f..7fc61ef 100644
108587--- a/kernel/time/posix-timers.c
108588+++ b/kernel/time/posix-timers.c
108589@@ -43,6 +43,7 @@
108590 #include <linux/hash.h>
108591 #include <linux/posix-clock.h>
108592 #include <linux/posix-timers.h>
108593+#include <linux/grsecurity.h>
108594 #include <linux/syscalls.h>
108595 #include <linux/wait.h>
108596 #include <linux/workqueue.h>
108597@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
108598 * which we beg off on and pass to do_sys_settimeofday().
108599 */
108600
108601-static struct k_clock posix_clocks[MAX_CLOCKS];
108602+static struct k_clock *posix_clocks[MAX_CLOCKS];
108603
108604 /*
108605 * These ones are defined below.
108606@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
108607 */
108608 static __init int init_posix_timers(void)
108609 {
108610- struct k_clock clock_realtime = {
108611+ static struct k_clock clock_realtime = {
108612 .clock_getres = hrtimer_get_res,
108613 .clock_get = posix_clock_realtime_get,
108614 .clock_set = posix_clock_realtime_set,
108615@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
108616 .timer_get = common_timer_get,
108617 .timer_del = common_timer_del,
108618 };
108619- struct k_clock clock_monotonic = {
108620+ static struct k_clock clock_monotonic = {
108621 .clock_getres = hrtimer_get_res,
108622 .clock_get = posix_ktime_get_ts,
108623 .nsleep = common_nsleep,
108624@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
108625 .timer_get = common_timer_get,
108626 .timer_del = common_timer_del,
108627 };
108628- struct k_clock clock_monotonic_raw = {
108629+ static struct k_clock clock_monotonic_raw = {
108630 .clock_getres = hrtimer_get_res,
108631 .clock_get = posix_get_monotonic_raw,
108632 };
108633- struct k_clock clock_realtime_coarse = {
108634+ static struct k_clock clock_realtime_coarse = {
108635 .clock_getres = posix_get_coarse_res,
108636 .clock_get = posix_get_realtime_coarse,
108637 };
108638- struct k_clock clock_monotonic_coarse = {
108639+ static struct k_clock clock_monotonic_coarse = {
108640 .clock_getres = posix_get_coarse_res,
108641 .clock_get = posix_get_monotonic_coarse,
108642 };
108643- struct k_clock clock_tai = {
108644+ static struct k_clock clock_tai = {
108645 .clock_getres = hrtimer_get_res,
108646 .clock_get = posix_get_tai,
108647 .nsleep = common_nsleep,
108648@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
108649 .timer_get = common_timer_get,
108650 .timer_del = common_timer_del,
108651 };
108652- struct k_clock clock_boottime = {
108653+ static struct k_clock clock_boottime = {
108654 .clock_getres = hrtimer_get_res,
108655 .clock_get = posix_get_boottime,
108656 .nsleep = common_nsleep,
108657@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
108658 return;
108659 }
108660
108661- posix_clocks[clock_id] = *new_clock;
108662+ posix_clocks[clock_id] = new_clock;
108663 }
108664 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
108665
108666@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
108667 return (id & CLOCKFD_MASK) == CLOCKFD ?
108668 &clock_posix_dynamic : &clock_posix_cpu;
108669
108670- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
108671+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
108672 return NULL;
108673- return &posix_clocks[id];
108674+ return posix_clocks[id];
108675 }
108676
108677 static int common_timer_create(struct k_itimer *new_timer)
108678@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
108679 struct k_clock *kc = clockid_to_kclock(which_clock);
108680 struct k_itimer *new_timer;
108681 int error, new_timer_id;
108682- sigevent_t event;
108683+ sigevent_t event = { };
108684 int it_id_set = IT_ID_NOT_SET;
108685
108686 if (!kc)
108687@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
108688 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
108689 return -EFAULT;
108690
108691+ /* only the CLOCK_REALTIME clock can be set, all other clocks
108692+ have their clock_set fptr set to a nosettime dummy function
108693+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
108694+ call common_clock_set, which calls do_sys_settimeofday, which
108695+ we hook
108696+ */
108697+
108698 return kc->clock_set(which_clock, &new_tp);
108699 }
108700
108701diff --git a/kernel/time/time.c b/kernel/time/time.c
108702index 2c85b77..6530536 100644
108703--- a/kernel/time/time.c
108704+++ b/kernel/time/time.c
108705@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
108706 return error;
108707
108708 if (tz) {
108709+ /* we log in do_settimeofday called below, so don't log twice
108710+ */
108711+ if (!tv)
108712+ gr_log_timechange();
108713+
108714 sys_tz = *tz;
108715 update_vsyscall_tz();
108716 if (firsttime) {
108717diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
108718index 946acb7..1e13c0f 100644
108719--- a/kernel/time/timekeeping.c
108720+++ b/kernel/time/timekeeping.c
108721@@ -15,6 +15,7 @@
108722 #include <linux/init.h>
108723 #include <linux/mm.h>
108724 #include <linux/sched.h>
108725+#include <linux/grsecurity.h>
108726 #include <linux/syscore_ops.h>
108727 #include <linux/clocksource.h>
108728 #include <linux/jiffies.h>
108729@@ -915,6 +916,8 @@ int do_settimeofday64(const struct timespec64 *ts)
108730 if (!timespec64_valid_strict(ts))
108731 return -EINVAL;
108732
108733+ gr_log_timechange();
108734+
108735 raw_spin_lock_irqsave(&timekeeper_lock, flags);
108736 write_seqcount_begin(&tk_core.seq);
108737
108738diff --git a/kernel/time/timer.c b/kernel/time/timer.c
108739index 2ece3aa..055a295 100644
108740--- a/kernel/time/timer.c
108741+++ b/kernel/time/timer.c
108742@@ -1405,7 +1405,7 @@ void update_process_times(int user_tick)
108743 /*
108744 * This function runs timers and the timer-tq in bottom half context.
108745 */
108746-static void run_timer_softirq(struct softirq_action *h)
108747+static __latent_entropy void run_timer_softirq(void)
108748 {
108749 struct tvec_base *base = __this_cpu_read(tvec_bases);
108750
108751@@ -1468,7 +1468,7 @@ static void process_timeout(unsigned long __data)
108752 *
108753 * In all cases the return value is guaranteed to be non-negative.
108754 */
108755-signed long __sched schedule_timeout(signed long timeout)
108756+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
108757 {
108758 struct timer_list timer;
108759 unsigned long expire;
108760diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
108761index e878c2e..cf1546bb 100644
108762--- a/kernel/time/timer_list.c
108763+++ b/kernel/time/timer_list.c
108764@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
108765
108766 static void print_name_offset(struct seq_file *m, void *sym)
108767 {
108768+#ifdef CONFIG_GRKERNSEC_HIDESYM
108769+ SEQ_printf(m, "<%p>", NULL);
108770+#else
108771 char symname[KSYM_NAME_LEN];
108772
108773 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
108774 SEQ_printf(m, "<%pK>", sym);
108775 else
108776 SEQ_printf(m, "%s", symname);
108777+#endif
108778 }
108779
108780 static void
108781@@ -119,7 +123,11 @@ next_one:
108782 static void
108783 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
108784 {
108785+#ifdef CONFIG_GRKERNSEC_HIDESYM
108786+ SEQ_printf(m, " .base: %p\n", NULL);
108787+#else
108788 SEQ_printf(m, " .base: %pK\n", base);
108789+#endif
108790 SEQ_printf(m, " .index: %d\n",
108791 base->index);
108792 SEQ_printf(m, " .resolution: %Lu nsecs\n",
108793@@ -388,7 +396,11 @@ static int __init init_timer_list_procfs(void)
108794 {
108795 struct proc_dir_entry *pe;
108796
108797+#ifdef CONFIG_GRKERNSEC_PROC_ADD
108798+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
108799+#else
108800 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
108801+#endif
108802 if (!pe)
108803 return -ENOMEM;
108804 return 0;
108805diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
108806index 1fb08f2..ca4bb1e 100644
108807--- a/kernel/time/timer_stats.c
108808+++ b/kernel/time/timer_stats.c
108809@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
108810 static unsigned long nr_entries;
108811 static struct entry entries[MAX_ENTRIES];
108812
108813-static atomic_t overflow_count;
108814+static atomic_unchecked_t overflow_count;
108815
108816 /*
108817 * The entries are in a hash-table, for fast lookup:
108818@@ -140,7 +140,7 @@ static void reset_entries(void)
108819 nr_entries = 0;
108820 memset(entries, 0, sizeof(entries));
108821 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
108822- atomic_set(&overflow_count, 0);
108823+ atomic_set_unchecked(&overflow_count, 0);
108824 }
108825
108826 static struct entry *alloc_entry(void)
108827@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
108828 if (likely(entry))
108829 entry->count++;
108830 else
108831- atomic_inc(&overflow_count);
108832+ atomic_inc_unchecked(&overflow_count);
108833
108834 out_unlock:
108835 raw_spin_unlock_irqrestore(lock, flags);
108836@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
108837
108838 static void print_name_offset(struct seq_file *m, unsigned long addr)
108839 {
108840+#ifdef CONFIG_GRKERNSEC_HIDESYM
108841+ seq_printf(m, "<%p>", NULL);
108842+#else
108843 char symname[KSYM_NAME_LEN];
108844
108845 if (lookup_symbol_name(addr, symname) < 0)
108846- seq_printf(m, "<%p>", (void *)addr);
108847+ seq_printf(m, "<%pK>", (void *)addr);
108848 else
108849 seq_printf(m, "%s", symname);
108850+#endif
108851 }
108852
108853 static int tstats_show(struct seq_file *m, void *v)
108854@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
108855
108856 seq_puts(m, "Timer Stats Version: v0.3\n");
108857 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
108858- if (atomic_read(&overflow_count))
108859- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
108860+ if (atomic_read_unchecked(&overflow_count))
108861+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
108862 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
108863
108864 for (i = 0; i < nr_entries; i++) {
108865@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
108866 {
108867 struct proc_dir_entry *pe;
108868
108869+#ifdef CONFIG_GRKERNSEC_PROC_ADD
108870+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
108871+#else
108872 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
108873+#endif
108874 if (!pe)
108875 return -ENOMEM;
108876 return 0;
108877diff --git a/kernel/torture.c b/kernel/torture.c
108878index dd70993..0bf694b 100644
108879--- a/kernel/torture.c
108880+++ b/kernel/torture.c
108881@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
108882 mutex_lock(&fullstop_mutex);
108883 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
108884 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
108885- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
108886+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
108887 } else {
108888 pr_warn("Concurrent rmmod and shutdown illegal!\n");
108889 }
108890@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
108891 if (!torture_must_stop()) {
108892 if (stutter > 1) {
108893 schedule_timeout_interruptible(stutter - 1);
108894- ACCESS_ONCE(stutter_pause_test) = 2;
108895+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
108896 }
108897 schedule_timeout_interruptible(1);
108898- ACCESS_ONCE(stutter_pause_test) = 1;
108899+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
108900 }
108901 if (!torture_must_stop())
108902 schedule_timeout_interruptible(stutter);
108903- ACCESS_ONCE(stutter_pause_test) = 0;
108904+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
108905 torture_shutdown_absorb("torture_stutter");
108906 } while (!torture_must_stop());
108907 torture_kthread_stopping("torture_stutter");
108908@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
108909 schedule_timeout_uninterruptible(10);
108910 return true;
108911 }
108912- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
108913+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
108914 mutex_unlock(&fullstop_mutex);
108915 torture_shutdown_cleanup();
108916 torture_shuffle_cleanup();
108917diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
108918index 483cecf..ac46091 100644
108919--- a/kernel/trace/blktrace.c
108920+++ b/kernel/trace/blktrace.c
108921@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
108922 struct blk_trace *bt = filp->private_data;
108923 char buf[16];
108924
108925- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
108926+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
108927
108928 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
108929 }
108930@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
108931 return 1;
108932
108933 bt = buf->chan->private_data;
108934- atomic_inc(&bt->dropped);
108935+ atomic_inc_unchecked(&bt->dropped);
108936 return 0;
108937 }
108938
108939@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
108940
108941 bt->dir = dir;
108942 bt->dev = dev;
108943- atomic_set(&bt->dropped, 0);
108944+ atomic_set_unchecked(&bt->dropped, 0);
108945 INIT_LIST_HEAD(&bt->running_list);
108946
108947 ret = -EIO;
108948diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
108949index eb11011..43adc29 100644
108950--- a/kernel/trace/ftrace.c
108951+++ b/kernel/trace/ftrace.c
108952@@ -2413,12 +2413,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
108953 if (unlikely(ftrace_disabled))
108954 return 0;
108955
108956+ ret = ftrace_arch_code_modify_prepare();
108957+ FTRACE_WARN_ON(ret);
108958+ if (ret)
108959+ return 0;
108960+
108961 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
108962+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
108963 if (ret) {
108964 ftrace_bug(ret, rec);
108965- return 0;
108966 }
108967- return 1;
108968+ return ret ? 0 : 1;
108969 }
108970
108971 /*
108972@@ -4807,8 +4812,10 @@ static int ftrace_process_locs(struct module *mod,
108973 if (!count)
108974 return 0;
108975
108976+ pax_open_kernel();
108977 sort(start, count, sizeof(*start),
108978 ftrace_cmp_ips, ftrace_swap_ips);
108979+ pax_close_kernel();
108980
108981 start_pg = ftrace_allocate_pages(count);
108982 if (!start_pg)
108983@@ -5675,7 +5682,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
108984
108985 if (t->ret_stack == NULL) {
108986 atomic_set(&t->tracing_graph_pause, 0);
108987- atomic_set(&t->trace_overrun, 0);
108988+ atomic_set_unchecked(&t->trace_overrun, 0);
108989 t->curr_ret_stack = -1;
108990 /* Make sure the tasks see the -1 first: */
108991 smp_wmb();
108992@@ -5898,7 +5905,7 @@ static void
108993 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
108994 {
108995 atomic_set(&t->tracing_graph_pause, 0);
108996- atomic_set(&t->trace_overrun, 0);
108997+ atomic_set_unchecked(&t->trace_overrun, 0);
108998 t->ftrace_timestamp = 0;
108999 /* make curr_ret_stack visible before we add the ret_stack */
109000 smp_wmb();
109001diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
109002index 0315d43..2e5e9a2 100644
109003--- a/kernel/trace/ring_buffer.c
109004+++ b/kernel/trace/ring_buffer.c
109005@@ -348,9 +348,9 @@ struct buffer_data_page {
109006 */
109007 struct buffer_page {
109008 struct list_head list; /* list of buffer pages */
109009- local_t write; /* index for next write */
109010+ local_unchecked_t write; /* index for next write */
109011 unsigned read; /* index for next read */
109012- local_t entries; /* entries on this page */
109013+ local_unchecked_t entries; /* entries on this page */
109014 unsigned long real_end; /* real end of data */
109015 struct buffer_data_page *page; /* Actual data page */
109016 };
109017@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
109018 unsigned long last_overrun;
109019 local_t entries_bytes;
109020 local_t entries;
109021- local_t overrun;
109022- local_t commit_overrun;
109023- local_t dropped_events;
109024+ local_unchecked_t overrun;
109025+ local_unchecked_t commit_overrun;
109026+ local_unchecked_t dropped_events;
109027 local_t committing;
109028- local_t commits;
109029+ local_unchecked_t commits;
109030 unsigned long read;
109031 unsigned long read_bytes;
109032 u64 write_stamp;
109033@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109034 *
109035 * We add a counter to the write field to denote this.
109036 */
109037- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
109038- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
109039+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
109040+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
109041
109042 /*
109043 * Just make sure we have seen our old_write and synchronize
109044@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109045 * cmpxchg to only update if an interrupt did not already
109046 * do it for us. If the cmpxchg fails, we don't care.
109047 */
109048- (void)local_cmpxchg(&next_page->write, old_write, val);
109049- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
109050+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
109051+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
109052
109053 /*
109054 * No need to worry about races with clearing out the commit.
109055@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
109056
109057 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
109058 {
109059- return local_read(&bpage->entries) & RB_WRITE_MASK;
109060+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
109061 }
109062
109063 static inline unsigned long rb_page_write(struct buffer_page *bpage)
109064 {
109065- return local_read(&bpage->write) & RB_WRITE_MASK;
109066+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
109067 }
109068
109069 static int
109070@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
109071 * bytes consumed in ring buffer from here.
109072 * Increment overrun to account for the lost events.
109073 */
109074- local_add(page_entries, &cpu_buffer->overrun);
109075+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
109076 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109077 }
109078
109079@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
109080 * it is our responsibility to update
109081 * the counters.
109082 */
109083- local_add(entries, &cpu_buffer->overrun);
109084+ local_add_unchecked(entries, &cpu_buffer->overrun);
109085 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109086
109087 /*
109088@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109089 if (tail == BUF_PAGE_SIZE)
109090 tail_page->real_end = 0;
109091
109092- local_sub(length, &tail_page->write);
109093+ local_sub_unchecked(length, &tail_page->write);
109094 return;
109095 }
109096
109097@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109098 rb_event_set_padding(event);
109099
109100 /* Set the write back to the previous setting */
109101- local_sub(length, &tail_page->write);
109102+ local_sub_unchecked(length, &tail_page->write);
109103 return;
109104 }
109105
109106@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109107
109108 /* Set write to end of buffer */
109109 length = (tail + length) - BUF_PAGE_SIZE;
109110- local_sub(length, &tail_page->write);
109111+ local_sub_unchecked(length, &tail_page->write);
109112 }
109113
109114 /*
109115@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109116 * about it.
109117 */
109118 if (unlikely(next_page == commit_page)) {
109119- local_inc(&cpu_buffer->commit_overrun);
109120+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109121 goto out_reset;
109122 }
109123
109124@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109125 * this is easy, just stop here.
109126 */
109127 if (!(buffer->flags & RB_FL_OVERWRITE)) {
109128- local_inc(&cpu_buffer->dropped_events);
109129+ local_inc_unchecked(&cpu_buffer->dropped_events);
109130 goto out_reset;
109131 }
109132
109133@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109134 cpu_buffer->tail_page) &&
109135 (cpu_buffer->commit_page ==
109136 cpu_buffer->reader_page))) {
109137- local_inc(&cpu_buffer->commit_overrun);
109138+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109139 goto out_reset;
109140 }
109141 }
109142@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109143 length += RB_LEN_TIME_EXTEND;
109144
109145 tail_page = cpu_buffer->tail_page;
109146- write = local_add_return(length, &tail_page->write);
109147+ write = local_add_return_unchecked(length, &tail_page->write);
109148
109149 /* set write to only the index of the write */
109150 write &= RB_WRITE_MASK;
109151@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109152 kmemcheck_annotate_bitfield(event, bitfield);
109153 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
109154
109155- local_inc(&tail_page->entries);
109156+ local_inc_unchecked(&tail_page->entries);
109157
109158 /*
109159 * If this is the first commit on the page, then update
109160@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109161
109162 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
109163 unsigned long write_mask =
109164- local_read(&bpage->write) & ~RB_WRITE_MASK;
109165+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
109166 unsigned long event_length = rb_event_length(event);
109167 /*
109168 * This is on the tail page. It is possible that
109169@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109170 */
109171 old_index += write_mask;
109172 new_index += write_mask;
109173- index = local_cmpxchg(&bpage->write, old_index, new_index);
109174+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
109175 if (index == old_index) {
109176 /* update counters */
109177 local_sub(event_length, &cpu_buffer->entries_bytes);
109178@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109179 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
109180 {
109181 local_inc(&cpu_buffer->committing);
109182- local_inc(&cpu_buffer->commits);
109183+ local_inc_unchecked(&cpu_buffer->commits);
109184 }
109185
109186 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109187@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109188 return;
109189
109190 again:
109191- commits = local_read(&cpu_buffer->commits);
109192+ commits = local_read_unchecked(&cpu_buffer->commits);
109193 /* synchronize with interrupts */
109194 barrier();
109195 if (local_read(&cpu_buffer->committing) == 1)
109196@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109197 * updating of the commit page and the clearing of the
109198 * committing counter.
109199 */
109200- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
109201+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
109202 !local_read(&cpu_buffer->committing)) {
109203 local_inc(&cpu_buffer->committing);
109204 goto again;
109205@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
109206 barrier();
109207 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
109208 local_dec(&cpu_buffer->committing);
109209- local_dec(&cpu_buffer->commits);
109210+ local_dec_unchecked(&cpu_buffer->commits);
109211 return NULL;
109212 }
109213 #endif
109214@@ -2898,7 +2898,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109215
109216 /* Do the likely case first */
109217 if (likely(bpage->page == (void *)addr)) {
109218- local_dec(&bpage->entries);
109219+ local_dec_unchecked(&bpage->entries);
109220 return;
109221 }
109222
109223@@ -2910,7 +2910,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109224 start = bpage;
109225 do {
109226 if (bpage->page == (void *)addr) {
109227- local_dec(&bpage->entries);
109228+ local_dec_unchecked(&bpage->entries);
109229 return;
109230 }
109231 rb_inc_page(cpu_buffer, &bpage);
109232@@ -3194,7 +3194,7 @@ static inline unsigned long
109233 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
109234 {
109235 return local_read(&cpu_buffer->entries) -
109236- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
109237+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
109238 }
109239
109240 /**
109241@@ -3283,7 +3283,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
109242 return 0;
109243
109244 cpu_buffer = buffer->buffers[cpu];
109245- ret = local_read(&cpu_buffer->overrun);
109246+ ret = local_read_unchecked(&cpu_buffer->overrun);
109247
109248 return ret;
109249 }
109250@@ -3306,7 +3306,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
109251 return 0;
109252
109253 cpu_buffer = buffer->buffers[cpu];
109254- ret = local_read(&cpu_buffer->commit_overrun);
109255+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
109256
109257 return ret;
109258 }
109259@@ -3328,7 +3328,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
109260 return 0;
109261
109262 cpu_buffer = buffer->buffers[cpu];
109263- ret = local_read(&cpu_buffer->dropped_events);
109264+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
109265
109266 return ret;
109267 }
109268@@ -3391,7 +3391,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
109269 /* if you care about this being correct, lock the buffer */
109270 for_each_buffer_cpu(buffer, cpu) {
109271 cpu_buffer = buffer->buffers[cpu];
109272- overruns += local_read(&cpu_buffer->overrun);
109273+ overruns += local_read_unchecked(&cpu_buffer->overrun);
109274 }
109275
109276 return overruns;
109277@@ -3562,8 +3562,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109278 /*
109279 * Reset the reader page to size zero.
109280 */
109281- local_set(&cpu_buffer->reader_page->write, 0);
109282- local_set(&cpu_buffer->reader_page->entries, 0);
109283+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109284+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109285 local_set(&cpu_buffer->reader_page->page->commit, 0);
109286 cpu_buffer->reader_page->real_end = 0;
109287
109288@@ -3597,7 +3597,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109289 * want to compare with the last_overrun.
109290 */
109291 smp_mb();
109292- overwrite = local_read(&(cpu_buffer->overrun));
109293+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
109294
109295 /*
109296 * Here's the tricky part.
109297@@ -4169,8 +4169,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109298
109299 cpu_buffer->head_page
109300 = list_entry(cpu_buffer->pages, struct buffer_page, list);
109301- local_set(&cpu_buffer->head_page->write, 0);
109302- local_set(&cpu_buffer->head_page->entries, 0);
109303+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
109304+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
109305 local_set(&cpu_buffer->head_page->page->commit, 0);
109306
109307 cpu_buffer->head_page->read = 0;
109308@@ -4180,18 +4180,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109309
109310 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
109311 INIT_LIST_HEAD(&cpu_buffer->new_pages);
109312- local_set(&cpu_buffer->reader_page->write, 0);
109313- local_set(&cpu_buffer->reader_page->entries, 0);
109314+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109315+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109316 local_set(&cpu_buffer->reader_page->page->commit, 0);
109317 cpu_buffer->reader_page->read = 0;
109318
109319 local_set(&cpu_buffer->entries_bytes, 0);
109320- local_set(&cpu_buffer->overrun, 0);
109321- local_set(&cpu_buffer->commit_overrun, 0);
109322- local_set(&cpu_buffer->dropped_events, 0);
109323+ local_set_unchecked(&cpu_buffer->overrun, 0);
109324+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
109325+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
109326 local_set(&cpu_buffer->entries, 0);
109327 local_set(&cpu_buffer->committing, 0);
109328- local_set(&cpu_buffer->commits, 0);
109329+ local_set_unchecked(&cpu_buffer->commits, 0);
109330 cpu_buffer->read = 0;
109331 cpu_buffer->read_bytes = 0;
109332
109333@@ -4592,8 +4592,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
109334 rb_init_page(bpage);
109335 bpage = reader->page;
109336 reader->page = *data_page;
109337- local_set(&reader->write, 0);
109338- local_set(&reader->entries, 0);
109339+ local_set_unchecked(&reader->write, 0);
109340+ local_set_unchecked(&reader->entries, 0);
109341 reader->read = 0;
109342 *data_page = bpage;
109343
109344diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
109345index 0533049..85e27f0 100644
109346--- a/kernel/trace/trace.c
109347+++ b/kernel/trace/trace.c
109348@@ -3538,7 +3538,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
109349 return 0;
109350 }
109351
109352-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
109353+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
109354 {
109355 /* do nothing if flag is already set */
109356 if (!!(trace_flags & mask) == !!enabled)
109357diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
109358index 921691c..64e1da1 100644
109359--- a/kernel/trace/trace.h
109360+++ b/kernel/trace/trace.h
109361@@ -1272,7 +1272,7 @@ extern const char *__stop___tracepoint_str[];
109362 void trace_printk_init_buffers(void);
109363 void trace_printk_start_comm(void);
109364 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
109365-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
109366+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
109367
109368 /*
109369 * Normal trace_printk() and friends allocates special buffers
109370diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
109371index 57b67b1..66082a9 100644
109372--- a/kernel/trace/trace_clock.c
109373+++ b/kernel/trace/trace_clock.c
109374@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
109375 return now;
109376 }
109377
109378-static atomic64_t trace_counter;
109379+static atomic64_unchecked_t trace_counter;
109380
109381 /*
109382 * trace_clock_counter(): simply an atomic counter.
109383@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
109384 */
109385 u64 notrace trace_clock_counter(void)
109386 {
109387- return atomic64_add_return(1, &trace_counter);
109388+ return atomic64_inc_return_unchecked(&trace_counter);
109389 }
109390diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
109391index c4de47f..5f134b8 100644
109392--- a/kernel/trace/trace_events.c
109393+++ b/kernel/trace/trace_events.c
109394@@ -1887,7 +1887,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
109395 return 0;
109396 }
109397
109398-struct ftrace_module_file_ops;
109399 static void __add_event_to_tracers(struct ftrace_event_call *call);
109400
109401 /* Add an additional event_call dynamically */
109402diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
109403index a51e796..1f32ebd 100644
109404--- a/kernel/trace/trace_functions_graph.c
109405+++ b/kernel/trace/trace_functions_graph.c
109406@@ -132,7 +132,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
109407
109408 /* The return trace stack is full */
109409 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
109410- atomic_inc(&current->trace_overrun);
109411+ atomic_inc_unchecked(&current->trace_overrun);
109412 return -EBUSY;
109413 }
109414
109415@@ -229,7 +229,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
109416 *ret = current->ret_stack[index].ret;
109417 trace->func = current->ret_stack[index].func;
109418 trace->calltime = current->ret_stack[index].calltime;
109419- trace->overrun = atomic_read(&current->trace_overrun);
109420+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
109421 trace->depth = index;
109422 }
109423
109424diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
109425index 7a9ba62..2e0e4a1 100644
109426--- a/kernel/trace/trace_mmiotrace.c
109427+++ b/kernel/trace/trace_mmiotrace.c
109428@@ -24,7 +24,7 @@ struct header_iter {
109429 static struct trace_array *mmio_trace_array;
109430 static bool overrun_detected;
109431 static unsigned long prev_overruns;
109432-static atomic_t dropped_count;
109433+static atomic_unchecked_t dropped_count;
109434
109435 static void mmio_reset_data(struct trace_array *tr)
109436 {
109437@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
109438
109439 static unsigned long count_overruns(struct trace_iterator *iter)
109440 {
109441- unsigned long cnt = atomic_xchg(&dropped_count, 0);
109442+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
109443 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
109444
109445 if (over > prev_overruns)
109446@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
109447 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
109448 sizeof(*entry), 0, pc);
109449 if (!event) {
109450- atomic_inc(&dropped_count);
109451+ atomic_inc_unchecked(&dropped_count);
109452 return;
109453 }
109454 entry = ring_buffer_event_data(event);
109455@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
109456 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
109457 sizeof(*entry), 0, pc);
109458 if (!event) {
109459- atomic_inc(&dropped_count);
109460+ atomic_inc_unchecked(&dropped_count);
109461 return;
109462 }
109463 entry = ring_buffer_event_data(event);
109464diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
109465index 25a086b..a918131 100644
109466--- a/kernel/trace/trace_output.c
109467+++ b/kernel/trace/trace_output.c
109468@@ -752,14 +752,16 @@ int register_ftrace_event(struct trace_event *event)
109469 goto out;
109470 }
109471
109472+ pax_open_kernel();
109473 if (event->funcs->trace == NULL)
109474- event->funcs->trace = trace_nop_print;
109475+ *(void **)&event->funcs->trace = trace_nop_print;
109476 if (event->funcs->raw == NULL)
109477- event->funcs->raw = trace_nop_print;
109478+ *(void **)&event->funcs->raw = trace_nop_print;
109479 if (event->funcs->hex == NULL)
109480- event->funcs->hex = trace_nop_print;
109481+ *(void **)&event->funcs->hex = trace_nop_print;
109482 if (event->funcs->binary == NULL)
109483- event->funcs->binary = trace_nop_print;
109484+ *(void **)&event->funcs->binary = trace_nop_print;
109485+ pax_close_kernel();
109486
109487 key = event->type & (EVENT_HASHSIZE - 1);
109488
109489diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
109490index e694c9f..6775a38 100644
109491--- a/kernel/trace/trace_seq.c
109492+++ b/kernel/trace/trace_seq.c
109493@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
109494 return 0;
109495 }
109496
109497- seq_buf_path(&s->seq, path, "\n");
109498+ seq_buf_path(&s->seq, path, "\n\\");
109499
109500 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
109501 s->seq.len = save_len;
109502diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
109503index 3f34496..0492d95 100644
109504--- a/kernel/trace/trace_stack.c
109505+++ b/kernel/trace/trace_stack.c
109506@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
109507 return;
109508
109509 /* we do not handle interrupt stacks yet */
109510- if (!object_is_on_stack(stack))
109511+ if (!object_starts_on_stack(stack))
109512 return;
109513
109514 local_irq_save(flags);
109515diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
109516index f97f6e3..d367b48 100644
109517--- a/kernel/trace/trace_syscalls.c
109518+++ b/kernel/trace/trace_syscalls.c
109519@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
109520 int num;
109521
109522 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109523+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109524+ return -EINVAL;
109525
109526 mutex_lock(&syscall_trace_lock);
109527 if (!sys_perf_refcount_enter)
109528@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
109529 int num;
109530
109531 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109532+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109533+ return;
109534
109535 mutex_lock(&syscall_trace_lock);
109536 sys_perf_refcount_enter--;
109537@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
109538 int num;
109539
109540 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109541+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109542+ return -EINVAL;
109543
109544 mutex_lock(&syscall_trace_lock);
109545 if (!sys_perf_refcount_exit)
109546@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
109547 int num;
109548
109549 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109550+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109551+ return;
109552
109553 mutex_lock(&syscall_trace_lock);
109554 sys_perf_refcount_exit--;
109555diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
109556index 4109f83..fe1f830 100644
109557--- a/kernel/user_namespace.c
109558+++ b/kernel/user_namespace.c
109559@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
109560 !kgid_has_mapping(parent_ns, group))
109561 return -EPERM;
109562
109563+#ifdef CONFIG_GRKERNSEC
109564+ /*
109565+ * This doesn't really inspire confidence:
109566+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
109567+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
109568+ * Increases kernel attack surface in areas developers
109569+ * previously cared little about ("low importance due
109570+ * to requiring "root" capability")
109571+ * To be removed when this code receives *proper* review
109572+ */
109573+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
109574+ !capable(CAP_SETGID))
109575+ return -EPERM;
109576+#endif
109577+
109578 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
109579 if (!ns)
109580 return -ENOMEM;
109581@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
109582 if (atomic_read(&current->mm->mm_users) > 1)
109583 return -EINVAL;
109584
109585- if (current->fs->users != 1)
109586+ if (atomic_read(&current->fs->users) != 1)
109587 return -EINVAL;
109588
109589 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
109590diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
109591index c8eac43..4b5f08f 100644
109592--- a/kernel/utsname_sysctl.c
109593+++ b/kernel/utsname_sysctl.c
109594@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
109595 static int proc_do_uts_string(struct ctl_table *table, int write,
109596 void __user *buffer, size_t *lenp, loff_t *ppos)
109597 {
109598- struct ctl_table uts_table;
109599+ ctl_table_no_const uts_table;
109600 int r;
109601 memcpy(&uts_table, table, sizeof(uts_table));
109602 uts_table.data = get_uts(table, write);
109603diff --git a/kernel/watchdog.c b/kernel/watchdog.c
109604index 581a68a..7ff6a89 100644
109605--- a/kernel/watchdog.c
109606+++ b/kernel/watchdog.c
109607@@ -648,7 +648,7 @@ void watchdog_nmi_enable_all(void) {}
109608 void watchdog_nmi_disable_all(void) {}
109609 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
109610
109611-static struct smp_hotplug_thread watchdog_threads = {
109612+static struct smp_hotplug_thread watchdog_threads __read_only = {
109613 .store = &softlockup_watchdog,
109614 .thread_should_run = watchdog_should_run,
109615 .thread_fn = watchdog,
109616diff --git a/kernel/workqueue.c b/kernel/workqueue.c
109617index 586ad91..5f8844a 100644
109618--- a/kernel/workqueue.c
109619+++ b/kernel/workqueue.c
109620@@ -4428,7 +4428,7 @@ static void rebind_workers(struct worker_pool *pool)
109621 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
109622 worker_flags |= WORKER_REBOUND;
109623 worker_flags &= ~WORKER_UNBOUND;
109624- ACCESS_ONCE(worker->flags) = worker_flags;
109625+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
109626 }
109627
109628 spin_unlock_irq(&pool->lock);
109629diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
109630index ba2b0c8..a571efc 100644
109631--- a/lib/Kconfig.debug
109632+++ b/lib/Kconfig.debug
109633@@ -936,7 +936,7 @@ config DEBUG_MUTEXES
109634
109635 config DEBUG_WW_MUTEX_SLOWPATH
109636 bool "Wait/wound mutex debugging: Slowpath testing"
109637- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109638+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109639 select DEBUG_LOCK_ALLOC
109640 select DEBUG_SPINLOCK
109641 select DEBUG_MUTEXES
109642@@ -953,7 +953,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
109643
109644 config DEBUG_LOCK_ALLOC
109645 bool "Lock debugging: detect incorrect freeing of live locks"
109646- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109647+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109648 select DEBUG_SPINLOCK
109649 select DEBUG_MUTEXES
109650 select LOCKDEP
109651@@ -967,7 +967,7 @@ config DEBUG_LOCK_ALLOC
109652
109653 config PROVE_LOCKING
109654 bool "Lock debugging: prove locking correctness"
109655- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109656+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109657 select LOCKDEP
109658 select DEBUG_SPINLOCK
109659 select DEBUG_MUTEXES
109660@@ -1018,7 +1018,7 @@ config LOCKDEP
109661
109662 config LOCK_STAT
109663 bool "Lock usage statistics"
109664- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109665+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109666 select LOCKDEP
109667 select DEBUG_SPINLOCK
109668 select DEBUG_MUTEXES
109669@@ -1496,6 +1496,7 @@ config LATENCYTOP
109670 depends on DEBUG_KERNEL
109671 depends on STACKTRACE_SUPPORT
109672 depends on PROC_FS
109673+ depends on !GRKERNSEC_HIDESYM
109674 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
109675 select KALLSYMS
109676 select KALLSYMS_ALL
109677@@ -1512,7 +1513,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109678 config DEBUG_STRICT_USER_COPY_CHECKS
109679 bool "Strict user copy size checks"
109680 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109681- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
109682+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
109683 help
109684 Enabling this option turns a certain set of sanity checks for user
109685 copy operations into compile time failures.
109686@@ -1643,7 +1644,7 @@ endmenu # runtime tests
109687
109688 config PROVIDE_OHCI1394_DMA_INIT
109689 bool "Remote debugging over FireWire early on boot"
109690- depends on PCI && X86
109691+ depends on PCI && X86 && !GRKERNSEC
109692 help
109693 If you want to debug problems which hang or crash the kernel early
109694 on boot and the crashing machine has a FireWire port, you can use
109695diff --git a/lib/Makefile b/lib/Makefile
109696index 6c37933..d48e7ca 100644
109697--- a/lib/Makefile
109698+++ b/lib/Makefile
109699@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
109700 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
109701 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
109702 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
109703-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
109704+obj-y += list_debug.o
109705 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
109706
109707 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
109708diff --git a/lib/average.c b/lib/average.c
109709index 114d1be..ab0350c 100644
109710--- a/lib/average.c
109711+++ b/lib/average.c
109712@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
109713 {
109714 unsigned long internal = ACCESS_ONCE(avg->internal);
109715
109716- ACCESS_ONCE(avg->internal) = internal ?
109717+ ACCESS_ONCE_RW(avg->internal) = internal ?
109718 (((internal << avg->weight) - internal) +
109719 (val << avg->factor)) >> avg->weight :
109720 (val << avg->factor);
109721diff --git a/lib/bitmap.c b/lib/bitmap.c
109722index 40162f8..b55c7c7 100644
109723--- a/lib/bitmap.c
109724+++ b/lib/bitmap.c
109725@@ -234,7 +234,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
109726 }
109727 EXPORT_SYMBOL(__bitmap_subset);
109728
109729-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
109730+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
109731 {
109732 unsigned int k, lim = bits/BITS_PER_LONG;
109733 int w = 0;
109734@@ -361,7 +361,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
109735 {
109736 int c, old_c, totaldigits, ndigits, nchunks, nbits;
109737 u32 chunk;
109738- const char __user __force *ubuf = (const char __user __force *)buf;
109739+ const char __user *ubuf = (const char __force_user *)buf;
109740
109741 bitmap_zero(maskp, nmaskbits);
109742
109743@@ -446,7 +446,7 @@ int bitmap_parse_user(const char __user *ubuf,
109744 {
109745 if (!access_ok(VERIFY_READ, ubuf, ulen))
109746 return -EFAULT;
109747- return __bitmap_parse((const char __force *)ubuf,
109748+ return __bitmap_parse((const char __force_kernel *)ubuf,
109749 ulen, 1, maskp, nmaskbits);
109750
109751 }
109752@@ -505,7 +505,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
109753 {
109754 unsigned a, b;
109755 int c, old_c, totaldigits;
109756- const char __user __force *ubuf = (const char __user __force *)buf;
109757+ const char __user *ubuf = (const char __force_user *)buf;
109758 int at_start, in_range;
109759
109760 totaldigits = c = 0;
109761@@ -601,7 +601,7 @@ int bitmap_parselist_user(const char __user *ubuf,
109762 {
109763 if (!access_ok(VERIFY_READ, ubuf, ulen))
109764 return -EFAULT;
109765- return __bitmap_parselist((const char __force *)ubuf,
109766+ return __bitmap_parselist((const char __force_kernel *)ubuf,
109767 ulen, 1, maskp, nmaskbits);
109768 }
109769 EXPORT_SYMBOL(bitmap_parselist_user);
109770diff --git a/lib/bug.c b/lib/bug.c
109771index 0c3bd95..5a615a1 100644
109772--- a/lib/bug.c
109773+++ b/lib/bug.c
109774@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
109775 return BUG_TRAP_TYPE_NONE;
109776
109777 bug = find_bug(bugaddr);
109778+ if (!bug)
109779+ return BUG_TRAP_TYPE_NONE;
109780
109781 file = NULL;
109782 line = 0;
109783diff --git a/lib/debugobjects.c b/lib/debugobjects.c
109784index 547f7f9..a6d4ba0 100644
109785--- a/lib/debugobjects.c
109786+++ b/lib/debugobjects.c
109787@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
109788 if (limit > 4)
109789 return;
109790
109791- is_on_stack = object_is_on_stack(addr);
109792+ is_on_stack = object_starts_on_stack(addr);
109793 if (is_on_stack == onstack)
109794 return;
109795
109796diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
109797index 6dd0335..1e9c239 100644
109798--- a/lib/decompress_bunzip2.c
109799+++ b/lib/decompress_bunzip2.c
109800@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
109801
109802 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
109803 uncompressed data. Allocate intermediate buffer for block. */
109804- bd->dbufSize = 100000*(i-BZh0);
109805+ i -= BZh0;
109806+ bd->dbufSize = 100000 * i;
109807
109808 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
109809 if (!bd->dbuf)
109810diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
109811index 0be83af..4605e93 100644
109812--- a/lib/decompress_unlzma.c
109813+++ b/lib/decompress_unlzma.c
109814@@ -39,10 +39,10 @@
109815
109816 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
109817
109818-static long long INIT read_int(unsigned char *ptr, int size)
109819+static unsigned long long INIT read_int(unsigned char *ptr, int size)
109820 {
109821 int i;
109822- long long ret = 0;
109823+ unsigned long long ret = 0;
109824
109825 for (i = 0; i < size; i++)
109826 ret = (ret << 8) | ptr[size-i-1];
109827diff --git a/lib/div64.c b/lib/div64.c
109828index 19ea7ed..20cac21 100644
109829--- a/lib/div64.c
109830+++ b/lib/div64.c
109831@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
109832 EXPORT_SYMBOL(__div64_32);
109833
109834 #ifndef div_s64_rem
109835-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
109836+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
109837 {
109838 u64 quotient;
109839
109840@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
109841 * 'http://www.hackersdelight.org/hdcodetxt/divDouble.c.txt'
109842 */
109843 #ifndef div64_u64
109844-u64 div64_u64(u64 dividend, u64 divisor)
109845+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
109846 {
109847 u32 high = divisor >> 32;
109848 u64 quot;
109849diff --git a/lib/dma-debug.c b/lib/dma-debug.c
109850index dace71f..13da37b 100644
109851--- a/lib/dma-debug.c
109852+++ b/lib/dma-debug.c
109853@@ -982,7 +982,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
109854
109855 void dma_debug_add_bus(struct bus_type *bus)
109856 {
109857- struct notifier_block *nb;
109858+ notifier_block_no_const *nb;
109859
109860 if (dma_debug_disabled())
109861 return;
109862@@ -1164,7 +1164,7 @@ static void check_unmap(struct dma_debug_entry *ref)
109863
109864 static void check_for_stack(struct device *dev, void *addr)
109865 {
109866- if (object_is_on_stack(addr))
109867+ if (object_starts_on_stack(addr))
109868 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
109869 "stack [addr=%p]\n", addr);
109870 }
109871diff --git a/lib/inflate.c b/lib/inflate.c
109872index 013a761..c28f3fc 100644
109873--- a/lib/inflate.c
109874+++ b/lib/inflate.c
109875@@ -269,7 +269,7 @@ static void free(void *where)
109876 malloc_ptr = free_mem_ptr;
109877 }
109878 #else
109879-#define malloc(a) kmalloc(a, GFP_KERNEL)
109880+#define malloc(a) kmalloc((a), GFP_KERNEL)
109881 #define free(a) kfree(a)
109882 #endif
109883
109884diff --git a/lib/ioremap.c b/lib/ioremap.c
109885index 86c8911..f5bfc34 100644
109886--- a/lib/ioremap.c
109887+++ b/lib/ioremap.c
109888@@ -75,7 +75,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
109889 unsigned long next;
109890
109891 phys_addr -= addr;
109892- pmd = pmd_alloc(&init_mm, pud, addr);
109893+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
109894 if (!pmd)
109895 return -ENOMEM;
109896 do {
109897@@ -101,7 +101,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
109898 unsigned long next;
109899
109900 phys_addr -= addr;
109901- pud = pud_alloc(&init_mm, pgd, addr);
109902+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
109903 if (!pud)
109904 return -ENOMEM;
109905 do {
109906diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
109907index bd2bea9..6b3c95e 100644
109908--- a/lib/is_single_threaded.c
109909+++ b/lib/is_single_threaded.c
109910@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
109911 struct task_struct *p, *t;
109912 bool ret;
109913
109914+ if (!mm)
109915+ return true;
109916+
109917 if (atomic_read(&task->signal->live) != 1)
109918 return false;
109919
109920diff --git a/lib/kobject.c b/lib/kobject.c
109921index 3b841b9..7c215aa 100644
109922--- a/lib/kobject.c
109923+++ b/lib/kobject.c
109924@@ -340,8 +340,9 @@ error:
109925 }
109926 EXPORT_SYMBOL(kobject_init);
109927
109928-static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
109929- const char *fmt, va_list vargs)
109930+static __printf(3, 0) int kobject_add_varg(struct kobject *kobj,
109931+ struct kobject *parent,
109932+ const char *fmt, va_list vargs)
109933 {
109934 int retval;
109935
109936@@ -936,9 +937,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
109937
109938
109939 static DEFINE_SPINLOCK(kobj_ns_type_lock);
109940-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
109941+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
109942
109943-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
109944+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
109945 {
109946 enum kobj_ns_type type = ops->type;
109947 int error;
109948diff --git a/lib/list_debug.c b/lib/list_debug.c
109949index c24c2f7..f0296f4 100644
109950--- a/lib/list_debug.c
109951+++ b/lib/list_debug.c
109952@@ -11,7 +11,9 @@
109953 #include <linux/bug.h>
109954 #include <linux/kernel.h>
109955 #include <linux/rculist.h>
109956+#include <linux/mm.h>
109957
109958+#ifdef CONFIG_DEBUG_LIST
109959 /*
109960 * Insert a new entry between two known consecutive entries.
109961 *
109962@@ -19,21 +21,40 @@
109963 * the prev/next entries already!
109964 */
109965
109966+static bool __list_add_debug(struct list_head *new,
109967+ struct list_head *prev,
109968+ struct list_head *next)
109969+{
109970+ if (unlikely(next->prev != prev)) {
109971+ printk(KERN_ERR "list_add corruption. next->prev should be "
109972+ "prev (%p), but was %p. (next=%p).\n",
109973+ prev, next->prev, next);
109974+ BUG();
109975+ return false;
109976+ }
109977+ if (unlikely(prev->next != next)) {
109978+ printk(KERN_ERR "list_add corruption. prev->next should be "
109979+ "next (%p), but was %p. (prev=%p).\n",
109980+ next, prev->next, prev);
109981+ BUG();
109982+ return false;
109983+ }
109984+ if (unlikely(new == prev || new == next)) {
109985+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
109986+ new, prev, next);
109987+ BUG();
109988+ return false;
109989+ }
109990+ return true;
109991+}
109992+
109993 void __list_add(struct list_head *new,
109994- struct list_head *prev,
109995- struct list_head *next)
109996+ struct list_head *prev,
109997+ struct list_head *next)
109998 {
109999- WARN(next->prev != prev,
110000- "list_add corruption. next->prev should be "
110001- "prev (%p), but was %p. (next=%p).\n",
110002- prev, next->prev, next);
110003- WARN(prev->next != next,
110004- "list_add corruption. prev->next should be "
110005- "next (%p), but was %p. (prev=%p).\n",
110006- next, prev->next, prev);
110007- WARN(new == prev || new == next,
110008- "list_add double add: new=%p, prev=%p, next=%p.\n",
110009- new, prev, next);
110010+ if (!__list_add_debug(new, prev, next))
110011+ return;
110012+
110013 next->prev = new;
110014 new->next = next;
110015 new->prev = prev;
110016@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
110017 }
110018 EXPORT_SYMBOL(__list_add);
110019
110020-void __list_del_entry(struct list_head *entry)
110021+static bool __list_del_entry_debug(struct list_head *entry)
110022 {
110023 struct list_head *prev, *next;
110024
110025 prev = entry->prev;
110026 next = entry->next;
110027
110028- if (WARN(next == LIST_POISON1,
110029- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110030- entry, LIST_POISON1) ||
110031- WARN(prev == LIST_POISON2,
110032- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110033- entry, LIST_POISON2) ||
110034- WARN(prev->next != entry,
110035- "list_del corruption. prev->next should be %p, "
110036- "but was %p\n", entry, prev->next) ||
110037- WARN(next->prev != entry,
110038- "list_del corruption. next->prev should be %p, "
110039- "but was %p\n", entry, next->prev))
110040+ if (unlikely(next == LIST_POISON1)) {
110041+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110042+ entry, LIST_POISON1);
110043+ BUG();
110044+ return false;
110045+ }
110046+ if (unlikely(prev == LIST_POISON2)) {
110047+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110048+ entry, LIST_POISON2);
110049+ BUG();
110050+ return false;
110051+ }
110052+ if (unlikely(entry->prev->next != entry)) {
110053+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
110054+ "but was %p\n", entry, prev->next);
110055+ BUG();
110056+ return false;
110057+ }
110058+ if (unlikely(entry->next->prev != entry)) {
110059+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
110060+ "but was %p\n", entry, next->prev);
110061+ BUG();
110062+ return false;
110063+ }
110064+ return true;
110065+}
110066+
110067+void __list_del_entry(struct list_head *entry)
110068+{
110069+ if (!__list_del_entry_debug(entry))
110070 return;
110071
110072- __list_del(prev, next);
110073+ __list_del(entry->prev, entry->next);
110074 }
110075 EXPORT_SYMBOL(__list_del_entry);
110076
110077@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
110078 void __list_add_rcu(struct list_head *new,
110079 struct list_head *prev, struct list_head *next)
110080 {
110081- WARN(next->prev != prev,
110082- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
110083- prev, next->prev, next);
110084- WARN(prev->next != next,
110085- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
110086- next, prev->next, prev);
110087+ if (!__list_add_debug(new, prev, next))
110088+ return;
110089+
110090 new->next = next;
110091 new->prev = prev;
110092 rcu_assign_pointer(list_next_rcu(prev), new);
110093 next->prev = new;
110094 }
110095 EXPORT_SYMBOL(__list_add_rcu);
110096+#endif
110097+
110098+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
110099+{
110100+#ifdef CONFIG_DEBUG_LIST
110101+ if (!__list_add_debug(new, prev, next))
110102+ return;
110103+#endif
110104+
110105+ pax_open_kernel();
110106+ next->prev = new;
110107+ new->next = next;
110108+ new->prev = prev;
110109+ prev->next = new;
110110+ pax_close_kernel();
110111+}
110112+EXPORT_SYMBOL(__pax_list_add);
110113+
110114+void pax_list_del(struct list_head *entry)
110115+{
110116+#ifdef CONFIG_DEBUG_LIST
110117+ if (!__list_del_entry_debug(entry))
110118+ return;
110119+#endif
110120+
110121+ pax_open_kernel();
110122+ __list_del(entry->prev, entry->next);
110123+ entry->next = LIST_POISON1;
110124+ entry->prev = LIST_POISON2;
110125+ pax_close_kernel();
110126+}
110127+EXPORT_SYMBOL(pax_list_del);
110128+
110129+void pax_list_del_init(struct list_head *entry)
110130+{
110131+ pax_open_kernel();
110132+ __list_del(entry->prev, entry->next);
110133+ INIT_LIST_HEAD(entry);
110134+ pax_close_kernel();
110135+}
110136+EXPORT_SYMBOL(pax_list_del_init);
110137+
110138+void __pax_list_add_rcu(struct list_head *new,
110139+ struct list_head *prev, struct list_head *next)
110140+{
110141+#ifdef CONFIG_DEBUG_LIST
110142+ if (!__list_add_debug(new, prev, next))
110143+ return;
110144+#endif
110145+
110146+ pax_open_kernel();
110147+ new->next = next;
110148+ new->prev = prev;
110149+ rcu_assign_pointer(list_next_rcu(prev), new);
110150+ next->prev = new;
110151+ pax_close_kernel();
110152+}
110153+EXPORT_SYMBOL(__pax_list_add_rcu);
110154+
110155+void pax_list_del_rcu(struct list_head *entry)
110156+{
110157+#ifdef CONFIG_DEBUG_LIST
110158+ if (!__list_del_entry_debug(entry))
110159+ return;
110160+#endif
110161+
110162+ pax_open_kernel();
110163+ __list_del(entry->prev, entry->next);
110164+ entry->next = LIST_POISON1;
110165+ entry->prev = LIST_POISON2;
110166+ pax_close_kernel();
110167+}
110168+EXPORT_SYMBOL(pax_list_del_rcu);
110169diff --git a/lib/lockref.c b/lib/lockref.c
110170index 494994b..65caf94 100644
110171--- a/lib/lockref.c
110172+++ b/lib/lockref.c
110173@@ -48,13 +48,13 @@
110174 void lockref_get(struct lockref *lockref)
110175 {
110176 CMPXCHG_LOOP(
110177- new.count++;
110178+ __lockref_inc(&new);
110179 ,
110180 return;
110181 );
110182
110183 spin_lock(&lockref->lock);
110184- lockref->count++;
110185+ __lockref_inc(lockref);
110186 spin_unlock(&lockref->lock);
110187 }
110188 EXPORT_SYMBOL(lockref_get);
110189@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110190 int retval;
110191
110192 CMPXCHG_LOOP(
110193- new.count++;
110194- if (old.count <= 0)
110195+ __lockref_inc(&new);
110196+ if (__lockref_read(&old) <= 0)
110197 return 0;
110198 ,
110199 return 1;
110200@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110201
110202 spin_lock(&lockref->lock);
110203 retval = 0;
110204- if (lockref->count > 0) {
110205- lockref->count++;
110206+ if (__lockref_read(lockref) > 0) {
110207+ __lockref_inc(lockref);
110208 retval = 1;
110209 }
110210 spin_unlock(&lockref->lock);
110211@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
110212 int lockref_get_or_lock(struct lockref *lockref)
110213 {
110214 CMPXCHG_LOOP(
110215- new.count++;
110216- if (old.count <= 0)
110217+ __lockref_inc(&new);
110218+ if (__lockref_read(&old) <= 0)
110219 break;
110220 ,
110221 return 1;
110222 );
110223
110224 spin_lock(&lockref->lock);
110225- if (lockref->count <= 0)
110226+ if (__lockref_read(lockref) <= 0)
110227 return 0;
110228- lockref->count++;
110229+ __lockref_inc(lockref);
110230 spin_unlock(&lockref->lock);
110231 return 1;
110232 }
110233@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
110234 int lockref_put_return(struct lockref *lockref)
110235 {
110236 CMPXCHG_LOOP(
110237- new.count--;
110238- if (old.count <= 0)
110239+ __lockref_dec(&new);
110240+ if (__lockref_read(&old) <= 0)
110241 return -1;
110242 ,
110243- return new.count;
110244+ return __lockref_read(&new);
110245 );
110246 return -1;
110247 }
110248@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
110249 int lockref_put_or_lock(struct lockref *lockref)
110250 {
110251 CMPXCHG_LOOP(
110252- new.count--;
110253- if (old.count <= 1)
110254+ __lockref_dec(&new);
110255+ if (__lockref_read(&old) <= 1)
110256 break;
110257 ,
110258 return 1;
110259 );
110260
110261 spin_lock(&lockref->lock);
110262- if (lockref->count <= 1)
110263+ if (__lockref_read(lockref) <= 1)
110264 return 0;
110265- lockref->count--;
110266+ __lockref_dec(lockref);
110267 spin_unlock(&lockref->lock);
110268 return 1;
110269 }
110270@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
110271 void lockref_mark_dead(struct lockref *lockref)
110272 {
110273 assert_spin_locked(&lockref->lock);
110274- lockref->count = -128;
110275+ __lockref_set(lockref, -128);
110276 }
110277 EXPORT_SYMBOL(lockref_mark_dead);
110278
110279@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110280 int retval;
110281
110282 CMPXCHG_LOOP(
110283- new.count++;
110284- if (old.count < 0)
110285+ __lockref_inc(&new);
110286+ if (__lockref_read(&old) < 0)
110287 return 0;
110288 ,
110289 return 1;
110290@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110291
110292 spin_lock(&lockref->lock);
110293 retval = 0;
110294- if (lockref->count >= 0) {
110295- lockref->count++;
110296+ if (__lockref_read(lockref) >= 0) {
110297+ __lockref_inc(lockref);
110298 retval = 1;
110299 }
110300 spin_unlock(&lockref->lock);
110301diff --git a/lib/nlattr.c b/lib/nlattr.c
110302index f5907d2..36072be 100644
110303--- a/lib/nlattr.c
110304+++ b/lib/nlattr.c
110305@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
110306 {
110307 int minlen = min_t(int, count, nla_len(src));
110308
110309+ BUG_ON(minlen < 0);
110310+
110311 memcpy(dest, nla_data(src), minlen);
110312 if (count > minlen)
110313 memset(dest + minlen, 0, count - minlen);
110314diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
110315index 6111bcb..02e816b 100644
110316--- a/lib/percpu-refcount.c
110317+++ b/lib/percpu-refcount.c
110318@@ -31,7 +31,7 @@
110319 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
110320 */
110321
110322-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
110323+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
110324
110325 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
110326
110327diff --git a/lib/radix-tree.c b/lib/radix-tree.c
110328index 3d2aa27..a472f20 100644
110329--- a/lib/radix-tree.c
110330+++ b/lib/radix-tree.c
110331@@ -67,7 +67,7 @@ struct radix_tree_preload {
110332 int nr;
110333 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
110334 };
110335-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
110336+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
110337
110338 static inline void *ptr_to_indirect(void *ptr)
110339 {
110340diff --git a/lib/random32.c b/lib/random32.c
110341index 0bee183..526f12f 100644
110342--- a/lib/random32.c
110343+++ b/lib/random32.c
110344@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
110345 }
110346 #endif
110347
110348-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
110349+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
110350
110351 /**
110352 * prandom_u32_state - seeded pseudo-random number generator.
110353diff --git a/lib/rbtree.c b/lib/rbtree.c
110354index c16c81a..4dcbda1 100644
110355--- a/lib/rbtree.c
110356+++ b/lib/rbtree.c
110357@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
110358 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
110359
110360 static const struct rb_augment_callbacks dummy_callbacks = {
110361- dummy_propagate, dummy_copy, dummy_rotate
110362+ .propagate = dummy_propagate,
110363+ .copy = dummy_copy,
110364+ .rotate = dummy_rotate
110365 };
110366
110367 void rb_insert_color(struct rb_node *node, struct rb_root *root)
110368diff --git a/lib/show_mem.c b/lib/show_mem.c
110369index adc98e18..0ce83c2 100644
110370--- a/lib/show_mem.c
110371+++ b/lib/show_mem.c
110372@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
110373 quicklist_total_size());
110374 #endif
110375 #ifdef CONFIG_MEMORY_FAILURE
110376- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
110377+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
110378 #endif
110379 }
110380diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
110381index e0af6ff..fcc9f15 100644
110382--- a/lib/strncpy_from_user.c
110383+++ b/lib/strncpy_from_user.c
110384@@ -22,7 +22,7 @@
110385 */
110386 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
110387 {
110388- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110389+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110390 long res = 0;
110391
110392 /*
110393diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
110394index fe9a325..85cd8aa 100644
110395--- a/lib/strnlen_user.c
110396+++ b/lib/strnlen_user.c
110397@@ -26,7 +26,7 @@
110398 */
110399 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
110400 {
110401- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110402+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110403 long align, res = 0;
110404 unsigned long c;
110405
110406diff --git a/lib/swiotlb.c b/lib/swiotlb.c
110407index 3c365ab..75b43df 100644
110408--- a/lib/swiotlb.c
110409+++ b/lib/swiotlb.c
110410@@ -683,7 +683,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
110411
110412 void
110413 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
110414- dma_addr_t dev_addr)
110415+ dma_addr_t dev_addr, struct dma_attrs *attrs)
110416 {
110417 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
110418
110419diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
110420index c227cc4..5241df3 100644
110421--- a/lib/test-hexdump.c
110422+++ b/lib/test-hexdump.c
110423@@ -25,19 +25,19 @@ static const char * const test_data_1_le[] __initconst = {
110424 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
110425 };
110426
110427-static const char *test_data_2_le[] __initdata = {
110428+static const char * const test_data_2_le[] __initconst = {
110429 "32be", "7bdb", "180a", "b293",
110430 "ba70", "24c4", "837d", "9b34",
110431 "9ca6", "ad31", "0f9c", "e9ac",
110432 "d14c", "9919", "b143", "0caf",
110433 };
110434
110435-static const char *test_data_4_le[] __initdata = {
110436+static const char * const test_data_4_le[] __initconst = {
110437 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
110438 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
110439 };
110440
110441-static const char *test_data_8_le[] __initdata = {
110442+static const char * const test_data_8_le[] __initconst = {
110443 "b293180a7bdb32be", "9b34837d24c4ba70",
110444 "e9ac0f9cad319ca6", "0cafb1439919d14c",
110445 };
110446diff --git a/lib/usercopy.c b/lib/usercopy.c
110447index 4f5b1dd..7cab418 100644
110448--- a/lib/usercopy.c
110449+++ b/lib/usercopy.c
110450@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
110451 WARN(1, "Buffer overflow detected!\n");
110452 }
110453 EXPORT_SYMBOL(copy_from_user_overflow);
110454+
110455+void copy_to_user_overflow(void)
110456+{
110457+ WARN(1, "Buffer overflow detected!\n");
110458+}
110459+EXPORT_SYMBOL(copy_to_user_overflow);
110460diff --git a/lib/vsprintf.c b/lib/vsprintf.c
110461index da39c60..ac91239 100644
110462--- a/lib/vsprintf.c
110463+++ b/lib/vsprintf.c
110464@@ -16,6 +16,9 @@
110465 * - scnprintf and vscnprintf
110466 */
110467
110468+#ifdef CONFIG_GRKERNSEC_HIDESYM
110469+#define __INCLUDED_BY_HIDESYM 1
110470+#endif
110471 #include <stdarg.h>
110472 #include <linux/clk-provider.h>
110473 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
110474@@ -628,7 +631,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
110475 #ifdef CONFIG_KALLSYMS
110476 if (*fmt == 'B')
110477 sprint_backtrace(sym, value);
110478- else if (*fmt != 'f' && *fmt != 's')
110479+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
110480 sprint_symbol(sym, value);
110481 else
110482 sprint_symbol_no_offset(sym, value);
110483@@ -1360,7 +1363,11 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
110484 }
110485 }
110486
110487-int kptr_restrict __read_mostly;
110488+#ifdef CONFIG_GRKERNSEC_HIDESYM
110489+int kptr_restrict __read_only = 2;
110490+#else
110491+int kptr_restrict __read_only;
110492+#endif
110493
110494 /*
110495 * Show a '%p' thing. A kernel extension is that the '%p' is followed
110496@@ -1371,8 +1378,10 @@ int kptr_restrict __read_mostly;
110497 *
110498 * - 'F' For symbolic function descriptor pointers with offset
110499 * - 'f' For simple symbolic function names without offset
110500+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
110501 * - 'S' For symbolic direct pointers with offset
110502 * - 's' For symbolic direct pointers without offset
110503+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
110504 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
110505 * - 'B' For backtraced symbolic direct pointers with offset
110506 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
110507@@ -1460,12 +1469,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110508
110509 if (!ptr && *fmt != 'K') {
110510 /*
110511- * Print (null) with the same width as a pointer so it makes
110512+ * Print (nil) with the same width as a pointer so it makes
110513 * tabular output look nice.
110514 */
110515 if (spec.field_width == -1)
110516 spec.field_width = default_width;
110517- return string(buf, end, "(null)", spec);
110518+ return string(buf, end, "(nil)", spec);
110519 }
110520
110521 switch (*fmt) {
110522@@ -1475,6 +1484,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110523 /* Fallthrough */
110524 case 'S':
110525 case 's':
110526+#ifdef CONFIG_GRKERNSEC_HIDESYM
110527+ break;
110528+#else
110529+ return symbol_string(buf, end, ptr, spec, fmt);
110530+#endif
110531+ case 'X':
110532+ ptr = dereference_function_descriptor(ptr);
110533+ case 'A':
110534 case 'B':
110535 return symbol_string(buf, end, ptr, spec, fmt);
110536 case 'R':
110537@@ -1539,6 +1556,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110538 va_end(va);
110539 return buf;
110540 }
110541+ case 'P':
110542+ break;
110543 case 'K':
110544 /*
110545 * %pK cannot be used in IRQ context because its test
110546@@ -1598,6 +1617,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110547 ((const struct file *)ptr)->f_path.dentry,
110548 spec, fmt);
110549 }
110550+
110551+#ifdef CONFIG_GRKERNSEC_HIDESYM
110552+ /* 'P' = approved pointers to copy to userland,
110553+ as in the /proc/kallsyms case, as we make it display nothing
110554+ for non-root users, and the real contents for root users
110555+ 'X' = approved simple symbols
110556+ Also ignore 'K' pointers, since we force their NULLing for non-root users
110557+ above
110558+ */
110559+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
110560+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
110561+ dump_stack();
110562+ ptr = NULL;
110563+ }
110564+#endif
110565+
110566 spec.flags |= SMALL;
110567 if (spec.field_width == -1) {
110568 spec.field_width = default_width;
110569@@ -2296,11 +2331,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110570 typeof(type) value; \
110571 if (sizeof(type) == 8) { \
110572 args = PTR_ALIGN(args, sizeof(u32)); \
110573- *(u32 *)&value = *(u32 *)args; \
110574- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
110575+ *(u32 *)&value = *(const u32 *)args; \
110576+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
110577 } else { \
110578 args = PTR_ALIGN(args, sizeof(type)); \
110579- value = *(typeof(type) *)args; \
110580+ value = *(const typeof(type) *)args; \
110581 } \
110582 args += sizeof(type); \
110583 value; \
110584@@ -2363,7 +2398,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110585 case FORMAT_TYPE_STR: {
110586 const char *str_arg = args;
110587 args += strlen(str_arg) + 1;
110588- str = string(str, end, (char *)str_arg, spec);
110589+ str = string(str, end, str_arg, spec);
110590 break;
110591 }
110592
110593diff --git a/localversion-grsec b/localversion-grsec
110594new file mode 100644
110595index 0000000..7cd6065
110596--- /dev/null
110597+++ b/localversion-grsec
110598@@ -0,0 +1 @@
110599+-grsec
110600diff --git a/mm/Kconfig b/mm/Kconfig
110601index 390214d..f96e3b8 100644
110602--- a/mm/Kconfig
110603+++ b/mm/Kconfig
110604@@ -342,10 +342,11 @@ config KSM
110605 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
110606
110607 config DEFAULT_MMAP_MIN_ADDR
110608- int "Low address space to protect from user allocation"
110609+ int "Low address space to protect from user allocation"
110610 depends on MMU
110611- default 4096
110612- help
110613+ default 32768 if ALPHA || ARM || PARISC || SPARC32
110614+ default 65536
110615+ help
110616 This is the portion of low virtual memory which should be protected
110617 from userspace allocation. Keeping a user from writing to low pages
110618 can help reduce the impact of kernel NULL pointer bugs.
110619@@ -376,7 +377,7 @@ config MEMORY_FAILURE
110620
110621 config HWPOISON_INJECT
110622 tristate "HWPoison pages injector"
110623- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
110624+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
110625 select PROC_PAGE_MONITOR
110626
110627 config NOMMU_INITIAL_TRIM_EXCESS
110628diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
110629index 957d3da..1d34e20 100644
110630--- a/mm/Kconfig.debug
110631+++ b/mm/Kconfig.debug
110632@@ -10,6 +10,7 @@ config PAGE_EXTENSION
110633 config DEBUG_PAGEALLOC
110634 bool "Debug page memory allocations"
110635 depends on DEBUG_KERNEL
110636+ depends on !PAX_MEMORY_SANITIZE
110637 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
110638 depends on !KMEMCHECK
110639 select PAGE_EXTENSION
110640diff --git a/mm/backing-dev.c b/mm/backing-dev.c
110641index 000e7b3..aad2605 100644
110642--- a/mm/backing-dev.c
110643+++ b/mm/backing-dev.c
110644@@ -12,7 +12,7 @@
110645 #include <linux/device.h>
110646 #include <trace/events/writeback.h>
110647
110648-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
110649+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
110650
110651 struct backing_dev_info noop_backing_dev_info = {
110652 .name = "noop",
110653@@ -458,7 +458,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
110654 return err;
110655
110656 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
110657- atomic_long_inc_return(&bdi_seq));
110658+ atomic_long_inc_return_unchecked(&bdi_seq));
110659 if (err) {
110660 bdi_destroy(bdi);
110661 return err;
110662diff --git a/mm/cma_debug.c b/mm/cma_debug.c
110663index 7621ee3..f8e4b60 100644
110664--- a/mm/cma_debug.c
110665+++ b/mm/cma_debug.c
110666@@ -39,7 +39,7 @@ static int cma_used_get(void *data, u64 *val)
110667
110668 mutex_lock(&cma->lock);
110669 /* pages counter is smaller than sizeof(int) */
110670- used = bitmap_weight(cma->bitmap, (int)cma->count);
110671+ used = bitmap_weight(cma->bitmap, (int)cma_bitmap_maxno(cma));
110672 mutex_unlock(&cma->lock);
110673 *val = (u64)used << cma->order_per_bit;
110674
110675@@ -52,13 +52,14 @@ static int cma_maxchunk_get(void *data, u64 *val)
110676 struct cma *cma = data;
110677 unsigned long maxchunk = 0;
110678 unsigned long start, end = 0;
110679+ unsigned long bitmap_maxno = cma_bitmap_maxno(cma);
110680
110681 mutex_lock(&cma->lock);
110682 for (;;) {
110683- start = find_next_zero_bit(cma->bitmap, cma->count, end);
110684+ start = find_next_zero_bit(cma->bitmap, bitmap_maxno, end);
110685 if (start >= cma->count)
110686 break;
110687- end = find_next_bit(cma->bitmap, cma->count, start);
110688+ end = find_next_bit(cma->bitmap, bitmap_maxno, start);
110689 maxchunk = max(end - start, maxchunk);
110690 }
110691 mutex_unlock(&cma->lock);
110692@@ -170,10 +171,10 @@ static void cma_debugfs_add_one(struct cma *cma, int idx)
110693
110694 tmp = debugfs_create_dir(name, cma_debugfs_root);
110695
110696- debugfs_create_file("alloc", S_IWUSR, cma_debugfs_root, cma,
110697+ debugfs_create_file("alloc", S_IWUSR, tmp, cma,
110698 &cma_alloc_fops);
110699
110700- debugfs_create_file("free", S_IWUSR, cma_debugfs_root, cma,
110701+ debugfs_create_file("free", S_IWUSR, tmp, cma,
110702 &cma_free_fops);
110703
110704 debugfs_create_file("base_pfn", S_IRUGO, tmp,
110705diff --git a/mm/filemap.c b/mm/filemap.c
110706index 6bf5e42..1e631ee 100644
110707--- a/mm/filemap.c
110708+++ b/mm/filemap.c
110709@@ -2095,7 +2095,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
110710 struct address_space *mapping = file->f_mapping;
110711
110712 if (!mapping->a_ops->readpage)
110713- return -ENOEXEC;
110714+ return -ENODEV;
110715 file_accessed(file);
110716 vma->vm_ops = &generic_file_vm_ops;
110717 return 0;
110718@@ -2276,6 +2276,7 @@ inline ssize_t generic_write_checks(struct kiocb *iocb, struct iov_iter *from)
110719 pos = iocb->ki_pos;
110720
110721 if (limit != RLIM_INFINITY) {
110722+ gr_learn_resource(current, RLIMIT_FSIZE, iocb->ki_pos, 0);
110723 if (iocb->ki_pos >= limit) {
110724 send_sig(SIGXFSZ, current, 0);
110725 return -EFBIG;
110726diff --git a/mm/gup.c b/mm/gup.c
110727index 6297f6b..7652403 100644
110728--- a/mm/gup.c
110729+++ b/mm/gup.c
110730@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
110731 unsigned int fault_flags = 0;
110732 int ret;
110733
110734- /* For mm_populate(), just skip the stack guard page. */
110735- if ((*flags & FOLL_POPULATE) &&
110736- (stack_guard_page_start(vma, address) ||
110737- stack_guard_page_end(vma, address + PAGE_SIZE)))
110738- return -ENOENT;
110739 if (*flags & FOLL_WRITE)
110740 fault_flags |= FAULT_FLAG_WRITE;
110741 if (nonblocking)
110742@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
110743 if (!(gup_flags & FOLL_FORCE))
110744 gup_flags |= FOLL_NUMA;
110745
110746- do {
110747+ while (nr_pages) {
110748 struct page *page;
110749 unsigned int foll_flags = gup_flags;
110750 unsigned int page_increm;
110751
110752 /* first iteration or cross vma bound */
110753 if (!vma || start >= vma->vm_end) {
110754- vma = find_extend_vma(mm, start);
110755+ vma = find_vma(mm, start);
110756 if (!vma && in_gate_area(mm, start)) {
110757 int ret;
110758 ret = get_gate_page(mm, start & PAGE_MASK,
110759@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
110760 goto next_page;
110761 }
110762
110763- if (!vma || check_vma_flags(vma, gup_flags))
110764+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
110765 return i ? : -EFAULT;
110766 if (is_vm_hugetlb_page(vma)) {
110767 i = follow_hugetlb_page(mm, vma, pages, vmas,
110768@@ -509,7 +504,7 @@ next_page:
110769 i += page_increm;
110770 start += page_increm * PAGE_SIZE;
110771 nr_pages -= page_increm;
110772- } while (nr_pages);
110773+ }
110774 return i;
110775 }
110776 EXPORT_SYMBOL(__get_user_pages);
110777diff --git a/mm/highmem.c b/mm/highmem.c
110778index 123bcd3..0de52ba 100644
110779--- a/mm/highmem.c
110780+++ b/mm/highmem.c
110781@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
110782 * So no dangers, even with speculative execution.
110783 */
110784 page = pte_page(pkmap_page_table[i]);
110785+ pax_open_kernel();
110786 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
110787-
110788+ pax_close_kernel();
110789 set_page_address(page, NULL);
110790 need_flush = 1;
110791 }
110792@@ -259,9 +260,11 @@ start:
110793 }
110794 }
110795 vaddr = PKMAP_ADDR(last_pkmap_nr);
110796+
110797+ pax_open_kernel();
110798 set_pte_at(&init_mm, vaddr,
110799 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
110800-
110801+ pax_close_kernel();
110802 pkmap_count[last_pkmap_nr] = 1;
110803 set_page_address(page, (void *)vaddr);
110804
110805diff --git a/mm/hugetlb.c b/mm/hugetlb.c
110806index 8c4c1f9..7019e3d 100644
110807--- a/mm/hugetlb.c
110808+++ b/mm/hugetlb.c
110809@@ -2365,6 +2365,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
110810 struct ctl_table *table, int write,
110811 void __user *buffer, size_t *length, loff_t *ppos)
110812 {
110813+ ctl_table_no_const t;
110814 struct hstate *h = &default_hstate;
110815 unsigned long tmp = h->max_huge_pages;
110816 int ret;
110817@@ -2372,9 +2373,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
110818 if (!hugepages_supported())
110819 return -ENOTSUPP;
110820
110821- table->data = &tmp;
110822- table->maxlen = sizeof(unsigned long);
110823- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
110824+ t = *table;
110825+ t.data = &tmp;
110826+ t.maxlen = sizeof(unsigned long);
110827+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
110828 if (ret)
110829 goto out;
110830
110831@@ -2409,6 +2411,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
110832 struct hstate *h = &default_hstate;
110833 unsigned long tmp;
110834 int ret;
110835+ ctl_table_no_const hugetlb_table;
110836
110837 if (!hugepages_supported())
110838 return -ENOTSUPP;
110839@@ -2418,9 +2421,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
110840 if (write && hstate_is_gigantic(h))
110841 return -EINVAL;
110842
110843- table->data = &tmp;
110844- table->maxlen = sizeof(unsigned long);
110845- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
110846+ hugetlb_table = *table;
110847+ hugetlb_table.data = &tmp;
110848+ hugetlb_table.maxlen = sizeof(unsigned long);
110849+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
110850 if (ret)
110851 goto out;
110852
110853@@ -2910,6 +2914,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
110854 i_mmap_unlock_write(mapping);
110855 }
110856
110857+#ifdef CONFIG_PAX_SEGMEXEC
110858+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
110859+{
110860+ struct mm_struct *mm = vma->vm_mm;
110861+ struct vm_area_struct *vma_m;
110862+ unsigned long address_m;
110863+ pte_t *ptep_m;
110864+
110865+ vma_m = pax_find_mirror_vma(vma);
110866+ if (!vma_m)
110867+ return;
110868+
110869+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
110870+ address_m = address + SEGMEXEC_TASK_SIZE;
110871+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
110872+ get_page(page_m);
110873+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
110874+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
110875+}
110876+#endif
110877+
110878 /*
110879 * Hugetlb_cow() should be called with page lock of the original hugepage held.
110880 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
110881@@ -3023,6 +3048,11 @@ retry_avoidcopy:
110882 make_huge_pte(vma, new_page, 1));
110883 page_remove_rmap(old_page);
110884 hugepage_add_new_anon_rmap(new_page, vma, address);
110885+
110886+#ifdef CONFIG_PAX_SEGMEXEC
110887+ pax_mirror_huge_pte(vma, address, new_page);
110888+#endif
110889+
110890 /* Make the old page be freed below */
110891 new_page = old_page;
110892 }
110893@@ -3184,6 +3214,10 @@ retry:
110894 && (vma->vm_flags & VM_SHARED)));
110895 set_huge_pte_at(mm, address, ptep, new_pte);
110896
110897+#ifdef CONFIG_PAX_SEGMEXEC
110898+ pax_mirror_huge_pte(vma, address, page);
110899+#endif
110900+
110901 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
110902 /* Optimization, do the COW without a second fault */
110903 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
110904@@ -3251,6 +3285,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
110905 struct address_space *mapping;
110906 int need_wait_lock = 0;
110907
110908+#ifdef CONFIG_PAX_SEGMEXEC
110909+ struct vm_area_struct *vma_m;
110910+#endif
110911+
110912 address &= huge_page_mask(h);
110913
110914 ptep = huge_pte_offset(mm, address);
110915@@ -3264,6 +3302,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
110916 VM_FAULT_SET_HINDEX(hstate_index(h));
110917 }
110918
110919+#ifdef CONFIG_PAX_SEGMEXEC
110920+ vma_m = pax_find_mirror_vma(vma);
110921+ if (vma_m) {
110922+ unsigned long address_m;
110923+
110924+ if (vma->vm_start > vma_m->vm_start) {
110925+ address_m = address;
110926+ address -= SEGMEXEC_TASK_SIZE;
110927+ vma = vma_m;
110928+ h = hstate_vma(vma);
110929+ } else
110930+ address_m = address + SEGMEXEC_TASK_SIZE;
110931+
110932+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
110933+ return VM_FAULT_OOM;
110934+ address_m &= HPAGE_MASK;
110935+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
110936+ }
110937+#endif
110938+
110939 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
110940 if (!ptep)
110941 return VM_FAULT_OOM;
110942diff --git a/mm/internal.h b/mm/internal.h
110943index a25e359..e2c96e9 100644
110944--- a/mm/internal.h
110945+++ b/mm/internal.h
110946@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
110947
110948 extern int __isolate_free_page(struct page *page, unsigned int order);
110949 extern void __free_pages_bootmem(struct page *page, unsigned int order);
110950+extern void free_compound_page(struct page *page);
110951 extern void prep_compound_page(struct page *page, unsigned long order);
110952 #ifdef CONFIG_MEMORY_FAILURE
110953 extern bool is_free_buddy_page(struct page *page);
110954@@ -413,7 +414,7 @@ extern u32 hwpoison_filter_enable;
110955
110956 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
110957 unsigned long, unsigned long,
110958- unsigned long, unsigned long);
110959+ unsigned long, unsigned long) __intentional_overflow(-1);
110960
110961 extern void set_pageblock_order(void);
110962 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
110963diff --git a/mm/kmemleak.c b/mm/kmemleak.c
110964index 3716cdb..25b97dc 100644
110965--- a/mm/kmemleak.c
110966+++ b/mm/kmemleak.c
110967@@ -368,7 +368,7 @@ static void print_unreferenced(struct seq_file *seq,
110968
110969 for (i = 0; i < object->trace_len; i++) {
110970 void *ptr = (void *)object->trace[i];
110971- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
110972+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
110973 }
110974 }
110975
110976@@ -1926,7 +1926,7 @@ static int __init kmemleak_late_init(void)
110977 return -ENOMEM;
110978 }
110979
110980- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
110981+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
110982 &kmemleak_fops);
110983 if (!dentry)
110984 pr_warning("Failed to create the debugfs kmemleak file\n");
110985diff --git a/mm/maccess.c b/mm/maccess.c
110986index d53adf9..03a24bf 100644
110987--- a/mm/maccess.c
110988+++ b/mm/maccess.c
110989@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
110990 set_fs(KERNEL_DS);
110991 pagefault_disable();
110992 ret = __copy_from_user_inatomic(dst,
110993- (__force const void __user *)src, size);
110994+ (const void __force_user *)src, size);
110995 pagefault_enable();
110996 set_fs(old_fs);
110997
110998@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
110999
111000 set_fs(KERNEL_DS);
111001 pagefault_disable();
111002- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
111003+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
111004 pagefault_enable();
111005 set_fs(old_fs);
111006
111007diff --git a/mm/madvise.c b/mm/madvise.c
111008index d551475..8fdd7f3 100644
111009--- a/mm/madvise.c
111010+++ b/mm/madvise.c
111011@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
111012 pgoff_t pgoff;
111013 unsigned long new_flags = vma->vm_flags;
111014
111015+#ifdef CONFIG_PAX_SEGMEXEC
111016+ struct vm_area_struct *vma_m;
111017+#endif
111018+
111019 switch (behavior) {
111020 case MADV_NORMAL:
111021 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
111022@@ -126,6 +130,13 @@ success:
111023 /*
111024 * vm_flags is protected by the mmap_sem held in write mode.
111025 */
111026+
111027+#ifdef CONFIG_PAX_SEGMEXEC
111028+ vma_m = pax_find_mirror_vma(vma);
111029+ if (vma_m)
111030+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
111031+#endif
111032+
111033 vma->vm_flags = new_flags;
111034
111035 out:
111036@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
111037 struct vm_area_struct **prev,
111038 unsigned long start, unsigned long end)
111039 {
111040+
111041+#ifdef CONFIG_PAX_SEGMEXEC
111042+ struct vm_area_struct *vma_m;
111043+#endif
111044+
111045 *prev = vma;
111046 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111047 return -EINVAL;
111048
111049 zap_page_range(vma, start, end - start, NULL);
111050+
111051+#ifdef CONFIG_PAX_SEGMEXEC
111052+ vma_m = pax_find_mirror_vma(vma);
111053+ if (vma_m) {
111054+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111055+ return -EINVAL;
111056+
111057+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
111058+ }
111059+#endif
111060+
111061 return 0;
111062 }
111063
111064@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
111065 if (end < start)
111066 return error;
111067
111068+#ifdef CONFIG_PAX_SEGMEXEC
111069+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
111070+ if (end > SEGMEXEC_TASK_SIZE)
111071+ return error;
111072+ } else
111073+#endif
111074+
111075+ if (end > TASK_SIZE)
111076+ return error;
111077+
111078 error = 0;
111079 if (end == start)
111080 return error;
111081diff --git a/mm/memory-failure.c b/mm/memory-failure.c
111082index 501820c..9612bcf 100644
111083--- a/mm/memory-failure.c
111084+++ b/mm/memory-failure.c
111085@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
111086
111087 int sysctl_memory_failure_recovery __read_mostly = 1;
111088
111089-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111090+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111091
111092 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
111093
111094@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
111095 pfn, t->comm, t->pid);
111096 si.si_signo = SIGBUS;
111097 si.si_errno = 0;
111098- si.si_addr = (void *)addr;
111099+ si.si_addr = (void __user *)addr;
111100 #ifdef __ARCH_SI_TRAPNO
111101 si.si_trapno = trapno;
111102 #endif
111103@@ -825,7 +825,7 @@ static struct page_state {
111104 unsigned long res;
111105 enum action_page_type type;
111106 int (*action)(struct page *p, unsigned long pfn);
111107-} error_states[] = {
111108+} __do_const error_states[] = {
111109 { reserved, reserved, MSG_KERNEL, me_kernel },
111110 /*
111111 * free pages are specially detected outside this table:
111112@@ -1133,7 +1133,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111113 nr_pages = 1 << compound_order(hpage);
111114 else /* normal page or thp */
111115 nr_pages = 1;
111116- atomic_long_add(nr_pages, &num_poisoned_pages);
111117+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
111118
111119 /*
111120 * We need/can do nothing about count=0 pages.
111121@@ -1162,7 +1162,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111122 if (PageHWPoison(hpage)) {
111123 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
111124 || (p != hpage && TestSetPageHWPoison(hpage))) {
111125- atomic_long_sub(nr_pages, &num_poisoned_pages);
111126+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111127 unlock_page(hpage);
111128 return 0;
111129 }
111130@@ -1231,14 +1231,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111131 */
111132 if (!PageHWPoison(p)) {
111133 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
111134- atomic_long_sub(nr_pages, &num_poisoned_pages);
111135+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111136 put_page(hpage);
111137 res = 0;
111138 goto out;
111139 }
111140 if (hwpoison_filter(p)) {
111141 if (TestClearPageHWPoison(p))
111142- atomic_long_sub(nr_pages, &num_poisoned_pages);
111143+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111144 unlock_page(hpage);
111145 put_page(hpage);
111146 return 0;
111147@@ -1467,7 +1467,7 @@ int unpoison_memory(unsigned long pfn)
111148 return 0;
111149 }
111150 if (TestClearPageHWPoison(p))
111151- atomic_long_dec(&num_poisoned_pages);
111152+ atomic_long_dec_unchecked(&num_poisoned_pages);
111153 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
111154 return 0;
111155 }
111156@@ -1481,7 +1481,7 @@ int unpoison_memory(unsigned long pfn)
111157 */
111158 if (TestClearPageHWPoison(page)) {
111159 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
111160- atomic_long_sub(nr_pages, &num_poisoned_pages);
111161+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111162 freeit = 1;
111163 if (PageHuge(page))
111164 clear_page_hwpoison_huge_page(page);
111165@@ -1616,11 +1616,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
111166 if (PageHuge(page)) {
111167 set_page_hwpoison_huge_page(hpage);
111168 dequeue_hwpoisoned_huge_page(hpage);
111169- atomic_long_add(1 << compound_order(hpage),
111170+ atomic_long_add_unchecked(1 << compound_order(hpage),
111171 &num_poisoned_pages);
111172 } else {
111173 SetPageHWPoison(page);
111174- atomic_long_inc(&num_poisoned_pages);
111175+ atomic_long_inc_unchecked(&num_poisoned_pages);
111176 }
111177 }
111178 return ret;
111179@@ -1659,7 +1659,7 @@ static int __soft_offline_page(struct page *page, int flags)
111180 put_page(page);
111181 pr_info("soft_offline: %#lx: invalidated\n", pfn);
111182 SetPageHWPoison(page);
111183- atomic_long_inc(&num_poisoned_pages);
111184+ atomic_long_inc_unchecked(&num_poisoned_pages);
111185 return 0;
111186 }
111187
111188@@ -1708,7 +1708,7 @@ static int __soft_offline_page(struct page *page, int flags)
111189 if (!is_free_buddy_page(page))
111190 pr_info("soft offline: %#lx: page leaked\n",
111191 pfn);
111192- atomic_long_inc(&num_poisoned_pages);
111193+ atomic_long_inc_unchecked(&num_poisoned_pages);
111194 }
111195 } else {
111196 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
111197@@ -1778,11 +1778,11 @@ int soft_offline_page(struct page *page, int flags)
111198 if (PageHuge(page)) {
111199 set_page_hwpoison_huge_page(hpage);
111200 if (!dequeue_hwpoisoned_huge_page(hpage))
111201- atomic_long_add(1 << compound_order(hpage),
111202+ atomic_long_add_unchecked(1 << compound_order(hpage),
111203 &num_poisoned_pages);
111204 } else {
111205 if (!TestSetPageHWPoison(page))
111206- atomic_long_inc(&num_poisoned_pages);
111207+ atomic_long_inc_unchecked(&num_poisoned_pages);
111208 }
111209 }
111210 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
111211diff --git a/mm/memory.c b/mm/memory.c
111212index 2a9e098..4574079 100644
111213--- a/mm/memory.c
111214+++ b/mm/memory.c
111215@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111216 free_pte_range(tlb, pmd, addr);
111217 } while (pmd++, addr = next, addr != end);
111218
111219+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
111220 start &= PUD_MASK;
111221 if (start < floor)
111222 return;
111223@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111224 pud_clear(pud);
111225 pmd_free_tlb(tlb, pmd, start);
111226 mm_dec_nr_pmds(tlb->mm);
111227+#endif
111228 }
111229
111230 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111231@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111232 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
111233 } while (pud++, addr = next, addr != end);
111234
111235+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
111236 start &= PGDIR_MASK;
111237 if (start < floor)
111238 return;
111239@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111240 pud = pud_offset(pgd, start);
111241 pgd_clear(pgd);
111242 pud_free_tlb(tlb, pud, start);
111243+#endif
111244+
111245 }
111246
111247 /*
111248@@ -690,7 +695,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
111249 /*
111250 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
111251 */
111252- pr_alert("file:%pD fault:%pf mmap:%pf readpage:%pf\n",
111253+ pr_alert("file:%pD fault:%pX mmap:%pX readpage:%pX\n",
111254 vma->vm_file,
111255 vma->vm_ops ? vma->vm_ops->fault : NULL,
111256 vma->vm_file ? vma->vm_file->f_op->mmap : NULL,
111257@@ -1463,6 +1468,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
111258 page_add_file_rmap(page);
111259 set_pte_at(mm, addr, pte, mk_pte(page, prot));
111260
111261+#ifdef CONFIG_PAX_SEGMEXEC
111262+ pax_mirror_file_pte(vma, addr, page, ptl);
111263+#endif
111264+
111265 retval = 0;
111266 pte_unmap_unlock(pte, ptl);
111267 return retval;
111268@@ -1507,9 +1516,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
111269 if (!page_count(page))
111270 return -EINVAL;
111271 if (!(vma->vm_flags & VM_MIXEDMAP)) {
111272+
111273+#ifdef CONFIG_PAX_SEGMEXEC
111274+ struct vm_area_struct *vma_m;
111275+#endif
111276+
111277 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
111278 BUG_ON(vma->vm_flags & VM_PFNMAP);
111279 vma->vm_flags |= VM_MIXEDMAP;
111280+
111281+#ifdef CONFIG_PAX_SEGMEXEC
111282+ vma_m = pax_find_mirror_vma(vma);
111283+ if (vma_m)
111284+ vma_m->vm_flags |= VM_MIXEDMAP;
111285+#endif
111286+
111287 }
111288 return insert_page(vma, addr, page, vma->vm_page_prot);
111289 }
111290@@ -1592,6 +1613,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
111291 unsigned long pfn)
111292 {
111293 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
111294+ BUG_ON(vma->vm_mirror);
111295
111296 if (addr < vma->vm_start || addr >= vma->vm_end)
111297 return -EFAULT;
111298@@ -1839,7 +1861,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
111299
111300 BUG_ON(pud_huge(*pud));
111301
111302- pmd = pmd_alloc(mm, pud, addr);
111303+ pmd = (mm == &init_mm) ?
111304+ pmd_alloc_kernel(mm, pud, addr) :
111305+ pmd_alloc(mm, pud, addr);
111306 if (!pmd)
111307 return -ENOMEM;
111308 do {
111309@@ -1859,7 +1883,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
111310 unsigned long next;
111311 int err;
111312
111313- pud = pud_alloc(mm, pgd, addr);
111314+ pud = (mm == &init_mm) ?
111315+ pud_alloc_kernel(mm, pgd, addr) :
111316+ pud_alloc(mm, pgd, addr);
111317 if (!pud)
111318 return -ENOMEM;
111319 do {
111320@@ -2040,6 +2066,185 @@ static inline int wp_page_reuse(struct mm_struct *mm,
111321 return VM_FAULT_WRITE;
111322 }
111323
111324+#ifdef CONFIG_PAX_SEGMEXEC
111325+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
111326+{
111327+ struct mm_struct *mm = vma->vm_mm;
111328+ spinlock_t *ptl;
111329+ pte_t *pte, entry;
111330+
111331+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
111332+ entry = *pte;
111333+ if (!pte_present(entry)) {
111334+ if (!pte_none(entry)) {
111335+ free_swap_and_cache(pte_to_swp_entry(entry));
111336+ pte_clear_not_present_full(mm, address, pte, 0);
111337+ }
111338+ } else {
111339+ struct page *page;
111340+
111341+ flush_cache_page(vma, address, pte_pfn(entry));
111342+ entry = ptep_clear_flush(vma, address, pte);
111343+ BUG_ON(pte_dirty(entry));
111344+ page = vm_normal_page(vma, address, entry);
111345+ if (page) {
111346+ update_hiwater_rss(mm);
111347+ if (PageAnon(page))
111348+ dec_mm_counter_fast(mm, MM_ANONPAGES);
111349+ else
111350+ dec_mm_counter_fast(mm, MM_FILEPAGES);
111351+ page_remove_rmap(page);
111352+ page_cache_release(page);
111353+ }
111354+ }
111355+ pte_unmap_unlock(pte, ptl);
111356+}
111357+
111358+/* PaX: if vma is mirrored, synchronize the mirror's PTE
111359+ *
111360+ * the ptl of the lower mapped page is held on entry and is not released on exit
111361+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
111362+ */
111363+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111364+{
111365+ struct mm_struct *mm = vma->vm_mm;
111366+ unsigned long address_m;
111367+ spinlock_t *ptl_m;
111368+ struct vm_area_struct *vma_m;
111369+ pmd_t *pmd_m;
111370+ pte_t *pte_m, entry_m;
111371+
111372+ BUG_ON(!page_m || !PageAnon(page_m));
111373+
111374+ vma_m = pax_find_mirror_vma(vma);
111375+ if (!vma_m)
111376+ return;
111377+
111378+ BUG_ON(!PageLocked(page_m));
111379+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111380+ address_m = address + SEGMEXEC_TASK_SIZE;
111381+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111382+ pte_m = pte_offset_map(pmd_m, address_m);
111383+ ptl_m = pte_lockptr(mm, pmd_m);
111384+ if (ptl != ptl_m) {
111385+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111386+ if (!pte_none(*pte_m))
111387+ goto out;
111388+ }
111389+
111390+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111391+ page_cache_get(page_m);
111392+ page_add_anon_rmap(page_m, vma_m, address_m);
111393+ inc_mm_counter_fast(mm, MM_ANONPAGES);
111394+ set_pte_at(mm, address_m, pte_m, entry_m);
111395+ update_mmu_cache(vma_m, address_m, pte_m);
111396+out:
111397+ if (ptl != ptl_m)
111398+ spin_unlock(ptl_m);
111399+ pte_unmap(pte_m);
111400+ unlock_page(page_m);
111401+}
111402+
111403+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111404+{
111405+ struct mm_struct *mm = vma->vm_mm;
111406+ unsigned long address_m;
111407+ spinlock_t *ptl_m;
111408+ struct vm_area_struct *vma_m;
111409+ pmd_t *pmd_m;
111410+ pte_t *pte_m, entry_m;
111411+
111412+ BUG_ON(!page_m || PageAnon(page_m));
111413+
111414+ vma_m = pax_find_mirror_vma(vma);
111415+ if (!vma_m)
111416+ return;
111417+
111418+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111419+ address_m = address + SEGMEXEC_TASK_SIZE;
111420+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111421+ pte_m = pte_offset_map(pmd_m, address_m);
111422+ ptl_m = pte_lockptr(mm, pmd_m);
111423+ if (ptl != ptl_m) {
111424+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111425+ if (!pte_none(*pte_m))
111426+ goto out;
111427+ }
111428+
111429+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111430+ page_cache_get(page_m);
111431+ page_add_file_rmap(page_m);
111432+ inc_mm_counter_fast(mm, MM_FILEPAGES);
111433+ set_pte_at(mm, address_m, pte_m, entry_m);
111434+ update_mmu_cache(vma_m, address_m, pte_m);
111435+out:
111436+ if (ptl != ptl_m)
111437+ spin_unlock(ptl_m);
111438+ pte_unmap(pte_m);
111439+}
111440+
111441+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
111442+{
111443+ struct mm_struct *mm = vma->vm_mm;
111444+ unsigned long address_m;
111445+ spinlock_t *ptl_m;
111446+ struct vm_area_struct *vma_m;
111447+ pmd_t *pmd_m;
111448+ pte_t *pte_m, entry_m;
111449+
111450+ vma_m = pax_find_mirror_vma(vma);
111451+ if (!vma_m)
111452+ return;
111453+
111454+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111455+ address_m = address + SEGMEXEC_TASK_SIZE;
111456+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111457+ pte_m = pte_offset_map(pmd_m, address_m);
111458+ ptl_m = pte_lockptr(mm, pmd_m);
111459+ if (ptl != ptl_m) {
111460+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111461+ if (!pte_none(*pte_m))
111462+ goto out;
111463+ }
111464+
111465+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
111466+ set_pte_at(mm, address_m, pte_m, entry_m);
111467+out:
111468+ if (ptl != ptl_m)
111469+ spin_unlock(ptl_m);
111470+ pte_unmap(pte_m);
111471+}
111472+
111473+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
111474+{
111475+ struct page *page_m;
111476+ pte_t entry;
111477+
111478+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
111479+ goto out;
111480+
111481+ entry = *pte;
111482+ page_m = vm_normal_page(vma, address, entry);
111483+ if (!page_m)
111484+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
111485+ else if (PageAnon(page_m)) {
111486+ if (pax_find_mirror_vma(vma)) {
111487+ pte_unmap_unlock(pte, ptl);
111488+ lock_page(page_m);
111489+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
111490+ if (pte_same(entry, *pte))
111491+ pax_mirror_anon_pte(vma, address, page_m, ptl);
111492+ else
111493+ unlock_page(page_m);
111494+ }
111495+ } else
111496+ pax_mirror_file_pte(vma, address, page_m, ptl);
111497+
111498+out:
111499+ pte_unmap_unlock(pte, ptl);
111500+}
111501+#endif
111502+
111503 /*
111504 * Handle the case of a page which we actually need to copy to a new page.
111505 *
111506@@ -2093,6 +2298,12 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111507 */
111508 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111509 if (likely(pte_same(*page_table, orig_pte))) {
111510+
111511+#ifdef CONFIG_PAX_SEGMEXEC
111512+ if (pax_find_mirror_vma(vma))
111513+ BUG_ON(!trylock_page(new_page));
111514+#endif
111515+
111516 if (old_page) {
111517 if (!PageAnon(old_page)) {
111518 dec_mm_counter_fast(mm, MM_FILEPAGES);
111519@@ -2147,6 +2358,10 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111520 page_remove_rmap(old_page);
111521 }
111522
111523+#ifdef CONFIG_PAX_SEGMEXEC
111524+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111525+#endif
111526+
111527 /* Free the old page.. */
111528 new_page = old_page;
111529 page_copied = 1;
111530@@ -2578,6 +2793,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111531 swap_free(entry);
111532 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
111533 try_to_free_swap(page);
111534+
111535+#ifdef CONFIG_PAX_SEGMEXEC
111536+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
111537+#endif
111538+
111539 unlock_page(page);
111540 if (page != swapcache) {
111541 /*
111542@@ -2601,6 +2821,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111543
111544 /* No need to invalidate - it was non-present before */
111545 update_mmu_cache(vma, address, page_table);
111546+
111547+#ifdef CONFIG_PAX_SEGMEXEC
111548+ pax_mirror_anon_pte(vma, address, page, ptl);
111549+#endif
111550+
111551 unlock:
111552 pte_unmap_unlock(page_table, ptl);
111553 out:
111554@@ -2620,40 +2845,6 @@ out_release:
111555 }
111556
111557 /*
111558- * This is like a special single-page "expand_{down|up}wards()",
111559- * except we must first make sure that 'address{-|+}PAGE_SIZE'
111560- * doesn't hit another vma.
111561- */
111562-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
111563-{
111564- address &= PAGE_MASK;
111565- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
111566- struct vm_area_struct *prev = vma->vm_prev;
111567-
111568- /*
111569- * Is there a mapping abutting this one below?
111570- *
111571- * That's only ok if it's the same stack mapping
111572- * that has gotten split..
111573- */
111574- if (prev && prev->vm_end == address)
111575- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
111576-
111577- return expand_downwards(vma, address - PAGE_SIZE);
111578- }
111579- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
111580- struct vm_area_struct *next = vma->vm_next;
111581-
111582- /* As VM_GROWSDOWN but s/below/above/ */
111583- if (next && next->vm_start == address + PAGE_SIZE)
111584- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
111585-
111586- return expand_upwards(vma, address + PAGE_SIZE);
111587- }
111588- return 0;
111589-}
111590-
111591-/*
111592 * We enter with non-exclusive mmap_sem (to exclude vma changes,
111593 * but allow concurrent faults), and pte mapped but not yet locked.
111594 * We return with mmap_sem still held, but pte unmapped and unlocked.
111595@@ -2663,31 +2854,29 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111596 unsigned int flags)
111597 {
111598 struct mem_cgroup *memcg;
111599- struct page *page;
111600+ struct page *page = NULL;
111601 spinlock_t *ptl;
111602 pte_t entry;
111603
111604- pte_unmap(page_table);
111605-
111606 /* File mapping without ->vm_ops ? */
111607- if (vma->vm_flags & VM_SHARED)
111608+ if (vma->vm_flags & VM_SHARED) {
111609+ pte_unmap(page_table);
111610 return VM_FAULT_SIGBUS;
111611+ }
111612
111613- /* Check if we need to add a guard page to the stack */
111614- if (check_stack_guard_page(vma, address) < 0)
111615- return VM_FAULT_SIGSEGV;
111616-
111617- /* Use the zero-page for reads */
111618 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
111619 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
111620 vma->vm_page_prot));
111621- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111622+ ptl = pte_lockptr(mm, pmd);
111623+ spin_lock(ptl);
111624 if (!pte_none(*page_table))
111625 goto unlock;
111626 goto setpte;
111627 }
111628
111629 /* Allocate our own private page. */
111630+ pte_unmap(page_table);
111631+
111632 if (unlikely(anon_vma_prepare(vma)))
111633 goto oom;
111634 page = alloc_zeroed_user_highpage_movable(vma, address);
111635@@ -2711,6 +2900,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111636 if (!pte_none(*page_table))
111637 goto release;
111638
111639+#ifdef CONFIG_PAX_SEGMEXEC
111640+ if (pax_find_mirror_vma(vma))
111641+ BUG_ON(!trylock_page(page));
111642+#endif
111643+
111644 inc_mm_counter_fast(mm, MM_ANONPAGES);
111645 page_add_new_anon_rmap(page, vma, address);
111646 mem_cgroup_commit_charge(page, memcg, false);
111647@@ -2720,6 +2914,12 @@ setpte:
111648
111649 /* No need to invalidate - it was non-present before */
111650 update_mmu_cache(vma, address, page_table);
111651+
111652+#ifdef CONFIG_PAX_SEGMEXEC
111653+ if (page)
111654+ pax_mirror_anon_pte(vma, address, page, ptl);
111655+#endif
111656+
111657 unlock:
111658 pte_unmap_unlock(page_table, ptl);
111659 return 0;
111660@@ -2952,6 +3152,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111661 return ret;
111662 }
111663 do_set_pte(vma, address, fault_page, pte, false, false);
111664+
111665+#ifdef CONFIG_PAX_SEGMEXEC
111666+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111667+#endif
111668+
111669 unlock_page(fault_page);
111670 unlock_out:
111671 pte_unmap_unlock(pte, ptl);
111672@@ -3003,7 +3208,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111673 }
111674 goto uncharge_out;
111675 }
111676+
111677+#ifdef CONFIG_PAX_SEGMEXEC
111678+ if (pax_find_mirror_vma(vma))
111679+ BUG_ON(!trylock_page(new_page));
111680+#endif
111681+
111682 do_set_pte(vma, address, new_page, pte, true, true);
111683+
111684+#ifdef CONFIG_PAX_SEGMEXEC
111685+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111686+#endif
111687+
111688 mem_cgroup_commit_charge(new_page, memcg, false);
111689 lru_cache_add_active_or_unevictable(new_page, vma);
111690 pte_unmap_unlock(pte, ptl);
111691@@ -3061,6 +3277,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111692 return ret;
111693 }
111694 do_set_pte(vma, address, fault_page, pte, true, false);
111695+
111696+#ifdef CONFIG_PAX_SEGMEXEC
111697+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111698+#endif
111699+
111700 pte_unmap_unlock(pte, ptl);
111701
111702 if (set_page_dirty(fault_page))
111703@@ -3286,6 +3507,12 @@ static int handle_pte_fault(struct mm_struct *mm,
111704 if (flags & FAULT_FLAG_WRITE)
111705 flush_tlb_fix_spurious_fault(vma, address);
111706 }
111707+
111708+#ifdef CONFIG_PAX_SEGMEXEC
111709+ pax_mirror_pte(vma, address, pte, pmd, ptl);
111710+ return 0;
111711+#endif
111712+
111713 unlock:
111714 pte_unmap_unlock(pte, ptl);
111715 return 0;
111716@@ -3305,9 +3532,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111717 pmd_t *pmd;
111718 pte_t *pte;
111719
111720+#ifdef CONFIG_PAX_SEGMEXEC
111721+ struct vm_area_struct *vma_m;
111722+#endif
111723+
111724 if (unlikely(is_vm_hugetlb_page(vma)))
111725 return hugetlb_fault(mm, vma, address, flags);
111726
111727+#ifdef CONFIG_PAX_SEGMEXEC
111728+ vma_m = pax_find_mirror_vma(vma);
111729+ if (vma_m) {
111730+ unsigned long address_m;
111731+ pgd_t *pgd_m;
111732+ pud_t *pud_m;
111733+ pmd_t *pmd_m;
111734+
111735+ if (vma->vm_start > vma_m->vm_start) {
111736+ address_m = address;
111737+ address -= SEGMEXEC_TASK_SIZE;
111738+ vma = vma_m;
111739+ } else
111740+ address_m = address + SEGMEXEC_TASK_SIZE;
111741+
111742+ pgd_m = pgd_offset(mm, address_m);
111743+ pud_m = pud_alloc(mm, pgd_m, address_m);
111744+ if (!pud_m)
111745+ return VM_FAULT_OOM;
111746+ pmd_m = pmd_alloc(mm, pud_m, address_m);
111747+ if (!pmd_m)
111748+ return VM_FAULT_OOM;
111749+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
111750+ return VM_FAULT_OOM;
111751+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
111752+ }
111753+#endif
111754+
111755 pgd = pgd_offset(mm, address);
111756 pud = pud_alloc(mm, pgd, address);
111757 if (!pud)
111758@@ -3442,6 +3701,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
111759 spin_unlock(&mm->page_table_lock);
111760 return 0;
111761 }
111762+
111763+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
111764+{
111765+ pud_t *new = pud_alloc_one(mm, address);
111766+ if (!new)
111767+ return -ENOMEM;
111768+
111769+ smp_wmb(); /* See comment in __pte_alloc */
111770+
111771+ spin_lock(&mm->page_table_lock);
111772+ if (pgd_present(*pgd)) /* Another has populated it */
111773+ pud_free(mm, new);
111774+ else
111775+ pgd_populate_kernel(mm, pgd, new);
111776+ spin_unlock(&mm->page_table_lock);
111777+ return 0;
111778+}
111779 #endif /* __PAGETABLE_PUD_FOLDED */
111780
111781 #ifndef __PAGETABLE_PMD_FOLDED
111782@@ -3474,6 +3750,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
111783 spin_unlock(&mm->page_table_lock);
111784 return 0;
111785 }
111786+
111787+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
111788+{
111789+ pmd_t *new = pmd_alloc_one(mm, address);
111790+ if (!new)
111791+ return -ENOMEM;
111792+
111793+ smp_wmb(); /* See comment in __pte_alloc */
111794+
111795+ spin_lock(&mm->page_table_lock);
111796+#ifndef __ARCH_HAS_4LEVEL_HACK
111797+ if (!pud_present(*pud)) {
111798+ mm_inc_nr_pmds(mm);
111799+ pud_populate_kernel(mm, pud, new);
111800+ } else /* Another has populated it */
111801+ pmd_free(mm, new);
111802+#else
111803+ if (!pgd_present(*pud)) {
111804+ mm_inc_nr_pmds(mm);
111805+ pgd_populate_kernel(mm, pud, new);
111806+ } else /* Another has populated it */
111807+ pmd_free(mm, new);
111808+#endif /* __ARCH_HAS_4LEVEL_HACK */
111809+ spin_unlock(&mm->page_table_lock);
111810+ return 0;
111811+}
111812 #endif /* __PAGETABLE_PMD_FOLDED */
111813
111814 static int __follow_pte(struct mm_struct *mm, unsigned long address,
111815@@ -3583,8 +3885,8 @@ out:
111816 return ret;
111817 }
111818
111819-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
111820- void *buf, int len, int write)
111821+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
111822+ void *buf, size_t len, int write)
111823 {
111824 resource_size_t phys_addr;
111825 unsigned long prot = 0;
111826@@ -3610,8 +3912,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
111827 * Access another process' address space as given in mm. If non-NULL, use the
111828 * given task for page fault accounting.
111829 */
111830-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111831- unsigned long addr, void *buf, int len, int write)
111832+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111833+ unsigned long addr, void *buf, size_t len, int write)
111834 {
111835 struct vm_area_struct *vma;
111836 void *old_buf = buf;
111837@@ -3619,7 +3921,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111838 down_read(&mm->mmap_sem);
111839 /* ignore errors, just check how much was successfully transferred */
111840 while (len) {
111841- int bytes, ret, offset;
111842+ ssize_t bytes, ret, offset;
111843 void *maddr;
111844 struct page *page = NULL;
111845
111846@@ -3680,8 +3982,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111847 *
111848 * The caller must hold a reference on @mm.
111849 */
111850-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
111851- void *buf, int len, int write)
111852+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
111853+ void *buf, size_t len, int write)
111854 {
111855 return __access_remote_vm(NULL, mm, addr, buf, len, write);
111856 }
111857@@ -3691,11 +3993,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
111858 * Source/target buffer must be kernel space,
111859 * Do not walk the page table directly, use get_user_pages
111860 */
111861-int access_process_vm(struct task_struct *tsk, unsigned long addr,
111862- void *buf, int len, int write)
111863+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
111864+ void *buf, size_t len, int write)
111865 {
111866 struct mm_struct *mm;
111867- int ret;
111868+ ssize_t ret;
111869
111870 mm = get_task_mm(tsk);
111871 if (!mm)
111872diff --git a/mm/mempolicy.c b/mm/mempolicy.c
111873index 99d4c1d..a577817 100644
111874--- a/mm/mempolicy.c
111875+++ b/mm/mempolicy.c
111876@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
111877 unsigned long vmstart;
111878 unsigned long vmend;
111879
111880+#ifdef CONFIG_PAX_SEGMEXEC
111881+ struct vm_area_struct *vma_m;
111882+#endif
111883+
111884 vma = find_vma(mm, start);
111885 if (!vma || vma->vm_start > start)
111886 return -EFAULT;
111887@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
111888 err = vma_replace_policy(vma, new_pol);
111889 if (err)
111890 goto out;
111891+
111892+#ifdef CONFIG_PAX_SEGMEXEC
111893+ vma_m = pax_find_mirror_vma(vma);
111894+ if (vma_m) {
111895+ err = vma_replace_policy(vma_m, new_pol);
111896+ if (err)
111897+ goto out;
111898+ }
111899+#endif
111900+
111901 }
111902
111903 out:
111904@@ -1161,6 +1175,17 @@ static long do_mbind(unsigned long start, unsigned long len,
111905
111906 if (end < start)
111907 return -EINVAL;
111908+
111909+#ifdef CONFIG_PAX_SEGMEXEC
111910+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
111911+ if (end > SEGMEXEC_TASK_SIZE)
111912+ return -EINVAL;
111913+ } else
111914+#endif
111915+
111916+ if (end > TASK_SIZE)
111917+ return -EINVAL;
111918+
111919 if (end == start)
111920 return 0;
111921
111922@@ -1386,8 +1411,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
111923 */
111924 tcred = __task_cred(task);
111925 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
111926- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
111927- !capable(CAP_SYS_NICE)) {
111928+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
111929 rcu_read_unlock();
111930 err = -EPERM;
111931 goto out_put;
111932@@ -1418,6 +1442,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
111933 goto out;
111934 }
111935
111936+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
111937+ if (mm != current->mm &&
111938+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
111939+ mmput(mm);
111940+ err = -EPERM;
111941+ goto out;
111942+ }
111943+#endif
111944+
111945 err = do_migrate_pages(mm, old, new,
111946 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
111947
111948diff --git a/mm/migrate.c b/mm/migrate.c
111949index f53838f..a26fa94 100644
111950--- a/mm/migrate.c
111951+++ b/mm/migrate.c
111952@@ -1484,8 +1484,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
111953 */
111954 tcred = __task_cred(task);
111955 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
111956- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
111957- !capable(CAP_SYS_NICE)) {
111958+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
111959 rcu_read_unlock();
111960 err = -EPERM;
111961 goto out;
111962diff --git a/mm/mlock.c b/mm/mlock.c
111963index 6fd2cf1..cbae765 100644
111964--- a/mm/mlock.c
111965+++ b/mm/mlock.c
111966@@ -14,6 +14,7 @@
111967 #include <linux/pagevec.h>
111968 #include <linux/mempolicy.h>
111969 #include <linux/syscalls.h>
111970+#include <linux/security.h>
111971 #include <linux/sched.h>
111972 #include <linux/export.h>
111973 #include <linux/rmap.h>
111974@@ -557,7 +558,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
111975 {
111976 unsigned long nstart, end, tmp;
111977 struct vm_area_struct * vma, * prev;
111978- int error;
111979+ int error = 0;
111980
111981 VM_BUG_ON(start & ~PAGE_MASK);
111982 VM_BUG_ON(len != PAGE_ALIGN(len));
111983@@ -566,6 +567,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
111984 return -EINVAL;
111985 if (end == start)
111986 return 0;
111987+ if (end > TASK_SIZE)
111988+ return -EINVAL;
111989+
111990 vma = find_vma(current->mm, start);
111991 if (!vma || vma->vm_start > start)
111992 return -ENOMEM;
111993@@ -577,6 +581,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
111994 for (nstart = start ; ; ) {
111995 vm_flags_t newflags;
111996
111997+#ifdef CONFIG_PAX_SEGMEXEC
111998+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
111999+ break;
112000+#endif
112001+
112002 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
112003
112004 newflags = vma->vm_flags & ~VM_LOCKED;
112005@@ -627,6 +636,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
112006 locked += current->mm->locked_vm;
112007
112008 /* check against resource limits */
112009+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
112010 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
112011 error = do_mlock(start, len, 1);
112012
112013@@ -668,6 +678,11 @@ static int do_mlockall(int flags)
112014 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
112015 vm_flags_t newflags;
112016
112017+#ifdef CONFIG_PAX_SEGMEXEC
112018+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
112019+ break;
112020+#endif
112021+
112022 newflags = vma->vm_flags & ~VM_LOCKED;
112023 if (flags & MCL_CURRENT)
112024 newflags |= VM_LOCKED;
112025@@ -699,8 +714,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
112026 lock_limit >>= PAGE_SHIFT;
112027
112028 ret = -ENOMEM;
112029+
112030+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
112031+
112032 down_write(&current->mm->mmap_sem);
112033-
112034 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
112035 capable(CAP_IPC_LOCK))
112036 ret = do_mlockall(flags);
112037diff --git a/mm/mm_init.c b/mm/mm_init.c
112038index 5f420f7..dd42fb1b 100644
112039--- a/mm/mm_init.c
112040+++ b/mm/mm_init.c
112041@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
112042 return NOTIFY_OK;
112043 }
112044
112045-static struct notifier_block compute_batch_nb __meminitdata = {
112046+static struct notifier_block compute_batch_nb __meminitconst = {
112047 .notifier_call = mm_compute_batch_notifier,
112048 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
112049 };
112050diff --git a/mm/mmap.c b/mm/mmap.c
112051index bb50cac..6d50a9f 100644
112052--- a/mm/mmap.c
112053+++ b/mm/mmap.c
112054@@ -41,6 +41,7 @@
112055 #include <linux/notifier.h>
112056 #include <linux/memory.h>
112057 #include <linux/printk.h>
112058+#include <linux/random.h>
112059
112060 #include <asm/uaccess.h>
112061 #include <asm/cacheflush.h>
112062@@ -57,6 +58,16 @@
112063 #define arch_rebalance_pgtables(addr, len) (addr)
112064 #endif
112065
112066+static inline void verify_mm_writelocked(struct mm_struct *mm)
112067+{
112068+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
112069+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
112070+ up_read(&mm->mmap_sem);
112071+ BUG();
112072+ }
112073+#endif
112074+}
112075+
112076 static void unmap_region(struct mm_struct *mm,
112077 struct vm_area_struct *vma, struct vm_area_struct *prev,
112078 unsigned long start, unsigned long end);
112079@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
112080 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
112081 *
112082 */
112083-pgprot_t protection_map[16] = {
112084+pgprot_t protection_map[16] __read_only = {
112085 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
112086 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
112087 };
112088
112089-pgprot_t vm_get_page_prot(unsigned long vm_flags)
112090+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
112091 {
112092- return __pgprot(pgprot_val(protection_map[vm_flags &
112093+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
112094 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
112095 pgprot_val(arch_vm_get_page_prot(vm_flags)));
112096+
112097+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112098+ if (!(__supported_pte_mask & _PAGE_NX) &&
112099+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
112100+ (vm_flags & (VM_READ | VM_WRITE)))
112101+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
112102+#endif
112103+
112104+ return prot;
112105 }
112106 EXPORT_SYMBOL(vm_get_page_prot);
112107
112108@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
112109 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
112110 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
112111 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
112112+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
112113 /*
112114 * Make sure vm_committed_as in one cacheline and not cacheline shared with
112115 * other variables. It can be updated by several CPUs frequently.
112116@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
112117 struct vm_area_struct *next = vma->vm_next;
112118
112119 might_sleep();
112120+ BUG_ON(vma->vm_mirror);
112121 if (vma->vm_ops && vma->vm_ops->close)
112122 vma->vm_ops->close(vma);
112123 if (vma->vm_file)
112124@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
112125
112126 SYSCALL_DEFINE1(brk, unsigned long, brk)
112127 {
112128+ unsigned long rlim;
112129 unsigned long retval;
112130 unsigned long newbrk, oldbrk;
112131 struct mm_struct *mm = current->mm;
112132@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
112133 * segment grow beyond its set limit the in case where the limit is
112134 * not page aligned -Ram Gupta
112135 */
112136- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
112137+ rlim = rlimit(RLIMIT_DATA);
112138+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
112139+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
112140+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
112141+ rlim = 4096 * PAGE_SIZE;
112142+#endif
112143+ if (check_data_rlimit(rlim, brk, mm->start_brk,
112144 mm->end_data, mm->start_data))
112145 goto out;
112146
112147@@ -967,6 +996,12 @@ static int
112148 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
112149 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112150 {
112151+
112152+#ifdef CONFIG_PAX_SEGMEXEC
112153+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
112154+ return 0;
112155+#endif
112156+
112157 if (is_mergeable_vma(vma, file, vm_flags) &&
112158 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112159 if (vma->vm_pgoff == vm_pgoff)
112160@@ -986,6 +1021,12 @@ static int
112161 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
112162 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112163 {
112164+
112165+#ifdef CONFIG_PAX_SEGMEXEC
112166+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
112167+ return 0;
112168+#endif
112169+
112170 if (is_mergeable_vma(vma, file, vm_flags) &&
112171 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112172 pgoff_t vm_pglen;
112173@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112174 struct vm_area_struct *area, *next;
112175 int err;
112176
112177+#ifdef CONFIG_PAX_SEGMEXEC
112178+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
112179+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
112180+
112181+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
112182+#endif
112183+
112184 /*
112185 * We later require that vma->vm_flags == vm_flags,
112186 * so this tests vma->vm_flags & VM_SPECIAL, too.
112187@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112188 if (next && next->vm_end == end) /* cases 6, 7, 8 */
112189 next = next->vm_next;
112190
112191+#ifdef CONFIG_PAX_SEGMEXEC
112192+ if (prev)
112193+ prev_m = pax_find_mirror_vma(prev);
112194+ if (area)
112195+ area_m = pax_find_mirror_vma(area);
112196+ if (next)
112197+ next_m = pax_find_mirror_vma(next);
112198+#endif
112199+
112200 /*
112201 * Can it merge with the predecessor?
112202 */
112203@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112204 /* cases 1, 6 */
112205 err = vma_adjust(prev, prev->vm_start,
112206 next->vm_end, prev->vm_pgoff, NULL);
112207- } else /* cases 2, 5, 7 */
112208+
112209+#ifdef CONFIG_PAX_SEGMEXEC
112210+ if (!err && prev_m)
112211+ err = vma_adjust(prev_m, prev_m->vm_start,
112212+ next_m->vm_end, prev_m->vm_pgoff, NULL);
112213+#endif
112214+
112215+ } else { /* cases 2, 5, 7 */
112216 err = vma_adjust(prev, prev->vm_start,
112217 end, prev->vm_pgoff, NULL);
112218+
112219+#ifdef CONFIG_PAX_SEGMEXEC
112220+ if (!err && prev_m)
112221+ err = vma_adjust(prev_m, prev_m->vm_start,
112222+ end_m, prev_m->vm_pgoff, NULL);
112223+#endif
112224+
112225+ }
112226 if (err)
112227 return NULL;
112228 khugepaged_enter_vma_merge(prev, vm_flags);
112229@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112230 mpol_equal(policy, vma_policy(next)) &&
112231 can_vma_merge_before(next, vm_flags,
112232 anon_vma, file, pgoff+pglen)) {
112233- if (prev && addr < prev->vm_end) /* case 4 */
112234+ if (prev && addr < prev->vm_end) { /* case 4 */
112235 err = vma_adjust(prev, prev->vm_start,
112236 addr, prev->vm_pgoff, NULL);
112237- else /* cases 3, 8 */
112238+
112239+#ifdef CONFIG_PAX_SEGMEXEC
112240+ if (!err && prev_m)
112241+ err = vma_adjust(prev_m, prev_m->vm_start,
112242+ addr_m, prev_m->vm_pgoff, NULL);
112243+#endif
112244+
112245+ } else { /* cases 3, 8 */
112246 err = vma_adjust(area, addr, next->vm_end,
112247 next->vm_pgoff - pglen, NULL);
112248+
112249+#ifdef CONFIG_PAX_SEGMEXEC
112250+ if (!err && area_m)
112251+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
112252+ next_m->vm_pgoff - pglen, NULL);
112253+#endif
112254+
112255+ }
112256 if (err)
112257 return NULL;
112258 khugepaged_enter_vma_merge(area, vm_flags);
112259@@ -1199,8 +1286,10 @@ none:
112260 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112261 struct file *file, long pages)
112262 {
112263- const unsigned long stack_flags
112264- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
112265+
112266+#ifdef CONFIG_PAX_RANDMMAP
112267+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112268+#endif
112269
112270 mm->total_vm += pages;
112271
112272@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112273 mm->shared_vm += pages;
112274 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
112275 mm->exec_vm += pages;
112276- } else if (flags & stack_flags)
112277+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
112278 mm->stack_vm += pages;
112279 }
112280 #endif /* CONFIG_PROC_FS */
112281@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
112282 locked += mm->locked_vm;
112283 lock_limit = rlimit(RLIMIT_MEMLOCK);
112284 lock_limit >>= PAGE_SHIFT;
112285+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112286 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
112287 return -EAGAIN;
112288 }
112289@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112290 * (the exception is when the underlying filesystem is noexec
112291 * mounted, in which case we dont add PROT_EXEC.)
112292 */
112293- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
112294+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
112295 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
112296 prot |= PROT_EXEC;
112297
112298@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112299 /* Obtain the address to map to. we verify (or select) it and ensure
112300 * that it represents a valid section of the address space.
112301 */
112302- addr = get_unmapped_area(file, addr, len, pgoff, flags);
112303+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
112304 if (addr & ~PAGE_MASK)
112305 return addr;
112306
112307@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112308 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
112309 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
112310
112311+#ifdef CONFIG_PAX_MPROTECT
112312+ if (mm->pax_flags & MF_PAX_MPROTECT) {
112313+
112314+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
112315+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
112316+ mm->binfmt->handle_mmap)
112317+ mm->binfmt->handle_mmap(file);
112318+#endif
112319+
112320+#ifndef CONFIG_PAX_MPROTECT_COMPAT
112321+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
112322+ gr_log_rwxmmap(file);
112323+
112324+#ifdef CONFIG_PAX_EMUPLT
112325+ vm_flags &= ~VM_EXEC;
112326+#else
112327+ return -EPERM;
112328+#endif
112329+
112330+ }
112331+
112332+ if (!(vm_flags & VM_EXEC))
112333+ vm_flags &= ~VM_MAYEXEC;
112334+#else
112335+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
112336+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
112337+#endif
112338+ else
112339+ vm_flags &= ~VM_MAYWRITE;
112340+ }
112341+#endif
112342+
112343+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112344+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
112345+ vm_flags &= ~VM_PAGEEXEC;
112346+#endif
112347+
112348 if (flags & MAP_LOCKED)
112349 if (!can_do_mlock())
112350 return -EPERM;
112351@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112352 vm_flags |= VM_NORESERVE;
112353 }
112354
112355+ if (!gr_acl_handle_mmap(file, prot))
112356+ return -EACCES;
112357+
112358 addr = mmap_region(file, addr, len, vm_flags, pgoff);
112359 if (!IS_ERR_VALUE(addr) &&
112360 ((vm_flags & VM_LOCKED) ||
112361@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
112362 vm_flags_t vm_flags = vma->vm_flags;
112363
112364 /* If it was private or non-writable, the write bit is already clear */
112365- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
112366+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
112367 return 0;
112368
112369 /* The backer wishes to know when pages are first written to? */
112370@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112371 struct rb_node **rb_link, *rb_parent;
112372 unsigned long charged = 0;
112373
112374+#ifdef CONFIG_PAX_SEGMEXEC
112375+ struct vm_area_struct *vma_m = NULL;
112376+#endif
112377+
112378+ /*
112379+ * mm->mmap_sem is required to protect against another thread
112380+ * changing the mappings in case we sleep.
112381+ */
112382+ verify_mm_writelocked(mm);
112383+
112384 /* Check against address space limit. */
112385+
112386+#ifdef CONFIG_PAX_RANDMMAP
112387+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112388+#endif
112389+
112390 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
112391 unsigned long nr_pages;
112392
112393@@ -1555,6 +1700,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112394 &rb_parent)) {
112395 if (do_munmap(mm, addr, len))
112396 return -ENOMEM;
112397+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
112398 }
112399
112400 /*
112401@@ -1586,6 +1732,16 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112402 goto unacct_error;
112403 }
112404
112405+#ifdef CONFIG_PAX_SEGMEXEC
112406+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
112407+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
112408+ if (!vma_m) {
112409+ error = -ENOMEM;
112410+ goto free_vma;
112411+ }
112412+ }
112413+#endif
112414+
112415 vma->vm_mm = mm;
112416 vma->vm_start = addr;
112417 vma->vm_end = addr + len;
112418@@ -1616,6 +1772,13 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112419 if (error)
112420 goto unmap_and_free_vma;
112421
112422+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112423+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
112424+ vma->vm_flags |= VM_PAGEEXEC;
112425+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
112426+ }
112427+#endif
112428+
112429 /* Can addr have changed??
112430 *
112431 * Answer: Yes, several device drivers can do it in their
112432@@ -1634,6 +1797,12 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112433 }
112434
112435 vma_link(mm, vma, prev, rb_link, rb_parent);
112436+
112437+#ifdef CONFIG_PAX_SEGMEXEC
112438+ if (vma_m)
112439+ BUG_ON(pax_mirror_vma(vma_m, vma));
112440+#endif
112441+
112442 /* Once vma denies write, undo our temporary denial count */
112443 if (file) {
112444 if (vm_flags & VM_SHARED)
112445@@ -1646,6 +1815,7 @@ out:
112446 perf_event_mmap(vma);
112447
112448 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
112449+ track_exec_limit(mm, addr, addr + len, vm_flags);
112450 if (vm_flags & VM_LOCKED) {
112451 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
112452 vma == get_gate_vma(current->mm)))
112453@@ -1683,6 +1853,12 @@ allow_write_and_free_vma:
112454 if (vm_flags & VM_DENYWRITE)
112455 allow_write_access(file);
112456 free_vma:
112457+
112458+#ifdef CONFIG_PAX_SEGMEXEC
112459+ if (vma_m)
112460+ kmem_cache_free(vm_area_cachep, vma_m);
112461+#endif
112462+
112463 kmem_cache_free(vm_area_cachep, vma);
112464 unacct_error:
112465 if (charged)
112466@@ -1690,7 +1866,63 @@ unacct_error:
112467 return error;
112468 }
112469
112470-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112471+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
112472+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
112473+{
112474+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
112475+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
112476+
112477+ return 0;
112478+}
112479+#endif
112480+
112481+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
112482+{
112483+ if (!vma) {
112484+#ifdef CONFIG_STACK_GROWSUP
112485+ if (addr > sysctl_heap_stack_gap)
112486+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
112487+ else
112488+ vma = find_vma(current->mm, 0);
112489+ if (vma && (vma->vm_flags & VM_GROWSUP))
112490+ return false;
112491+#endif
112492+ return true;
112493+ }
112494+
112495+ if (addr + len > vma->vm_start)
112496+ return false;
112497+
112498+ if (vma->vm_flags & VM_GROWSDOWN)
112499+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
112500+#ifdef CONFIG_STACK_GROWSUP
112501+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
112502+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
112503+#endif
112504+ else if (offset)
112505+ return offset <= vma->vm_start - addr - len;
112506+
112507+ return true;
112508+}
112509+
112510+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
112511+{
112512+ if (vma->vm_start < len)
112513+ return -ENOMEM;
112514+
112515+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
112516+ if (offset <= vma->vm_start - len)
112517+ return vma->vm_start - len - offset;
112518+ else
112519+ return -ENOMEM;
112520+ }
112521+
112522+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
112523+ return vma->vm_start - len - sysctl_heap_stack_gap;
112524+ return -ENOMEM;
112525+}
112526+
112527+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
112528 {
112529 /*
112530 * We implement the search by looking for an rbtree node that
112531@@ -1738,11 +1970,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112532 }
112533 }
112534
112535- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
112536+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
112537 check_current:
112538 /* Check if current node has a suitable gap */
112539 if (gap_start > high_limit)
112540 return -ENOMEM;
112541+
112542+ if (gap_end - gap_start > info->threadstack_offset)
112543+ gap_start += info->threadstack_offset;
112544+ else
112545+ gap_start = gap_end;
112546+
112547+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112548+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112549+ gap_start += sysctl_heap_stack_gap;
112550+ else
112551+ gap_start = gap_end;
112552+ }
112553+ if (vma->vm_flags & VM_GROWSDOWN) {
112554+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112555+ gap_end -= sysctl_heap_stack_gap;
112556+ else
112557+ gap_end = gap_start;
112558+ }
112559 if (gap_end >= low_limit && gap_end - gap_start >= length)
112560 goto found;
112561
112562@@ -1792,7 +2042,7 @@ found:
112563 return gap_start;
112564 }
112565
112566-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
112567+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
112568 {
112569 struct mm_struct *mm = current->mm;
112570 struct vm_area_struct *vma;
112571@@ -1846,6 +2096,24 @@ check_current:
112572 gap_end = vma->vm_start;
112573 if (gap_end < low_limit)
112574 return -ENOMEM;
112575+
112576+ if (gap_end - gap_start > info->threadstack_offset)
112577+ gap_end -= info->threadstack_offset;
112578+ else
112579+ gap_end = gap_start;
112580+
112581+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112582+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112583+ gap_start += sysctl_heap_stack_gap;
112584+ else
112585+ gap_start = gap_end;
112586+ }
112587+ if (vma->vm_flags & VM_GROWSDOWN) {
112588+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112589+ gap_end -= sysctl_heap_stack_gap;
112590+ else
112591+ gap_end = gap_start;
112592+ }
112593 if (gap_start <= high_limit && gap_end - gap_start >= length)
112594 goto found;
112595
112596@@ -1909,6 +2177,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112597 struct mm_struct *mm = current->mm;
112598 struct vm_area_struct *vma;
112599 struct vm_unmapped_area_info info;
112600+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112601
112602 if (len > TASK_SIZE - mmap_min_addr)
112603 return -ENOMEM;
112604@@ -1916,11 +2185,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112605 if (flags & MAP_FIXED)
112606 return addr;
112607
112608+#ifdef CONFIG_PAX_RANDMMAP
112609+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112610+#endif
112611+
112612 if (addr) {
112613 addr = PAGE_ALIGN(addr);
112614 vma = find_vma(mm, addr);
112615 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112616- (!vma || addr + len <= vma->vm_start))
112617+ check_heap_stack_gap(vma, addr, len, offset))
112618 return addr;
112619 }
112620
112621@@ -1929,6 +2202,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112622 info.low_limit = mm->mmap_base;
112623 info.high_limit = TASK_SIZE;
112624 info.align_mask = 0;
112625+ info.threadstack_offset = offset;
112626 return vm_unmapped_area(&info);
112627 }
112628 #endif
112629@@ -1947,6 +2221,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112630 struct mm_struct *mm = current->mm;
112631 unsigned long addr = addr0;
112632 struct vm_unmapped_area_info info;
112633+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112634
112635 /* requested length too big for entire address space */
112636 if (len > TASK_SIZE - mmap_min_addr)
112637@@ -1955,12 +2230,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112638 if (flags & MAP_FIXED)
112639 return addr;
112640
112641+#ifdef CONFIG_PAX_RANDMMAP
112642+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112643+#endif
112644+
112645 /* requesting a specific address */
112646 if (addr) {
112647 addr = PAGE_ALIGN(addr);
112648 vma = find_vma(mm, addr);
112649 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112650- (!vma || addr + len <= vma->vm_start))
112651+ check_heap_stack_gap(vma, addr, len, offset))
112652 return addr;
112653 }
112654
112655@@ -1969,6 +2248,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112656 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
112657 info.high_limit = mm->mmap_base;
112658 info.align_mask = 0;
112659+ info.threadstack_offset = offset;
112660 addr = vm_unmapped_area(&info);
112661
112662 /*
112663@@ -1981,6 +2261,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112664 VM_BUG_ON(addr != -ENOMEM);
112665 info.flags = 0;
112666 info.low_limit = TASK_UNMAPPED_BASE;
112667+
112668+#ifdef CONFIG_PAX_RANDMMAP
112669+ if (mm->pax_flags & MF_PAX_RANDMMAP)
112670+ info.low_limit += mm->delta_mmap;
112671+#endif
112672+
112673 info.high_limit = TASK_SIZE;
112674 addr = vm_unmapped_area(&info);
112675 }
112676@@ -2081,6 +2367,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
112677 return vma;
112678 }
112679
112680+#ifdef CONFIG_PAX_SEGMEXEC
112681+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
112682+{
112683+ struct vm_area_struct *vma_m;
112684+
112685+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
112686+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
112687+ BUG_ON(vma->vm_mirror);
112688+ return NULL;
112689+ }
112690+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
112691+ vma_m = vma->vm_mirror;
112692+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
112693+ BUG_ON(vma->vm_file != vma_m->vm_file);
112694+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
112695+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
112696+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
112697+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
112698+ return vma_m;
112699+}
112700+#endif
112701+
112702 /*
112703 * Verify that the stack growth is acceptable and
112704 * update accounting. This is shared with both the
112705@@ -2098,8 +2406,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112706
112707 /* Stack limit test */
112708 actual_size = size;
112709- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
112710- actual_size -= PAGE_SIZE;
112711+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
112712 if (actual_size > READ_ONCE(rlim[RLIMIT_STACK].rlim_cur))
112713 return -ENOMEM;
112714
112715@@ -2110,6 +2417,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112716 locked = mm->locked_vm + grow;
112717 limit = READ_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
112718 limit >>= PAGE_SHIFT;
112719+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112720 if (locked > limit && !capable(CAP_IPC_LOCK))
112721 return -ENOMEM;
112722 }
112723@@ -2139,37 +2447,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112724 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
112725 * vma is the last one with address > vma->vm_end. Have to extend vma.
112726 */
112727+#ifndef CONFIG_IA64
112728+static
112729+#endif
112730 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
112731 {
112732 int error;
112733+ bool locknext;
112734
112735 if (!(vma->vm_flags & VM_GROWSUP))
112736 return -EFAULT;
112737
112738+ /* Also guard against wrapping around to address 0. */
112739+ if (address < PAGE_ALIGN(address+1))
112740+ address = PAGE_ALIGN(address+1);
112741+ else
112742+ return -ENOMEM;
112743+
112744 /*
112745 * We must make sure the anon_vma is allocated
112746 * so that the anon_vma locking is not a noop.
112747 */
112748 if (unlikely(anon_vma_prepare(vma)))
112749 return -ENOMEM;
112750+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
112751+ if (locknext && anon_vma_prepare(vma->vm_next))
112752+ return -ENOMEM;
112753 vma_lock_anon_vma(vma);
112754+ if (locknext)
112755+ vma_lock_anon_vma(vma->vm_next);
112756
112757 /*
112758 * vma->vm_start/vm_end cannot change under us because the caller
112759 * is required to hold the mmap_sem in read mode. We need the
112760- * anon_vma lock to serialize against concurrent expand_stacks.
112761- * Also guard against wrapping around to address 0.
112762+ * anon_vma locks to serialize against concurrent expand_stacks
112763+ * and expand_upwards.
112764 */
112765- if (address < PAGE_ALIGN(address+4))
112766- address = PAGE_ALIGN(address+4);
112767- else {
112768- vma_unlock_anon_vma(vma);
112769- return -ENOMEM;
112770- }
112771 error = 0;
112772
112773 /* Somebody else might have raced and expanded it already */
112774- if (address > vma->vm_end) {
112775+ 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)
112776+ error = -ENOMEM;
112777+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
112778 unsigned long size, grow;
112779
112780 size = address - vma->vm_start;
112781@@ -2204,6 +2523,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
112782 }
112783 }
112784 }
112785+ if (locknext)
112786+ vma_unlock_anon_vma(vma->vm_next);
112787 vma_unlock_anon_vma(vma);
112788 khugepaged_enter_vma_merge(vma, vma->vm_flags);
112789 validate_mm(vma->vm_mm);
112790@@ -2218,6 +2539,8 @@ int expand_downwards(struct vm_area_struct *vma,
112791 unsigned long address)
112792 {
112793 int error;
112794+ bool lockprev = false;
112795+ struct vm_area_struct *prev;
112796
112797 /*
112798 * We must make sure the anon_vma is allocated
112799@@ -2231,6 +2554,15 @@ int expand_downwards(struct vm_area_struct *vma,
112800 if (error)
112801 return error;
112802
112803+ prev = vma->vm_prev;
112804+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
112805+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
112806+#endif
112807+ if (lockprev && anon_vma_prepare(prev))
112808+ return -ENOMEM;
112809+ if (lockprev)
112810+ vma_lock_anon_vma(prev);
112811+
112812 vma_lock_anon_vma(vma);
112813
112814 /*
112815@@ -2240,9 +2572,17 @@ int expand_downwards(struct vm_area_struct *vma,
112816 */
112817
112818 /* Somebody else might have raced and expanded it already */
112819- if (address < vma->vm_start) {
112820+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
112821+ error = -ENOMEM;
112822+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
112823 unsigned long size, grow;
112824
112825+#ifdef CONFIG_PAX_SEGMEXEC
112826+ struct vm_area_struct *vma_m;
112827+
112828+ vma_m = pax_find_mirror_vma(vma);
112829+#endif
112830+
112831 size = vma->vm_end - address;
112832 grow = (vma->vm_start - address) >> PAGE_SHIFT;
112833
112834@@ -2267,13 +2607,27 @@ int expand_downwards(struct vm_area_struct *vma,
112835 vma->vm_pgoff -= grow;
112836 anon_vma_interval_tree_post_update_vma(vma);
112837 vma_gap_update(vma);
112838+
112839+#ifdef CONFIG_PAX_SEGMEXEC
112840+ if (vma_m) {
112841+ anon_vma_interval_tree_pre_update_vma(vma_m);
112842+ vma_m->vm_start -= grow << PAGE_SHIFT;
112843+ vma_m->vm_pgoff -= grow;
112844+ anon_vma_interval_tree_post_update_vma(vma_m);
112845+ vma_gap_update(vma_m);
112846+ }
112847+#endif
112848+
112849 spin_unlock(&vma->vm_mm->page_table_lock);
112850
112851+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
112852 perf_event_mmap(vma);
112853 }
112854 }
112855 }
112856 vma_unlock_anon_vma(vma);
112857+ if (lockprev)
112858+ vma_unlock_anon_vma(prev);
112859 khugepaged_enter_vma_merge(vma, vma->vm_flags);
112860 validate_mm(vma->vm_mm);
112861 return error;
112862@@ -2373,6 +2727,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
112863 do {
112864 long nrpages = vma_pages(vma);
112865
112866+#ifdef CONFIG_PAX_SEGMEXEC
112867+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
112868+ vma = remove_vma(vma);
112869+ continue;
112870+ }
112871+#endif
112872+
112873 if (vma->vm_flags & VM_ACCOUNT)
112874 nr_accounted += nrpages;
112875 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
112876@@ -2417,6 +2778,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
112877 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
112878 vma->vm_prev = NULL;
112879 do {
112880+
112881+#ifdef CONFIG_PAX_SEGMEXEC
112882+ if (vma->vm_mirror) {
112883+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
112884+ vma->vm_mirror->vm_mirror = NULL;
112885+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
112886+ vma->vm_mirror = NULL;
112887+ }
112888+#endif
112889+
112890 vma_rb_erase(vma, &mm->mm_rb);
112891 mm->map_count--;
112892 tail_vma = vma;
112893@@ -2444,14 +2815,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
112894 struct vm_area_struct *new;
112895 int err = -ENOMEM;
112896
112897+#ifdef CONFIG_PAX_SEGMEXEC
112898+ struct vm_area_struct *vma_m, *new_m = NULL;
112899+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
112900+#endif
112901+
112902 if (is_vm_hugetlb_page(vma) && (addr &
112903 ~(huge_page_mask(hstate_vma(vma)))))
112904 return -EINVAL;
112905
112906+#ifdef CONFIG_PAX_SEGMEXEC
112907+ vma_m = pax_find_mirror_vma(vma);
112908+#endif
112909+
112910 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
112911 if (!new)
112912 goto out_err;
112913
112914+#ifdef CONFIG_PAX_SEGMEXEC
112915+ if (vma_m) {
112916+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
112917+ if (!new_m) {
112918+ kmem_cache_free(vm_area_cachep, new);
112919+ goto out_err;
112920+ }
112921+ }
112922+#endif
112923+
112924 /* most fields are the same, copy all, and then fixup */
112925 *new = *vma;
112926
112927@@ -2464,6 +2854,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
112928 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
112929 }
112930
112931+#ifdef CONFIG_PAX_SEGMEXEC
112932+ if (vma_m) {
112933+ *new_m = *vma_m;
112934+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
112935+ new_m->vm_mirror = new;
112936+ new->vm_mirror = new_m;
112937+
112938+ if (new_below)
112939+ new_m->vm_end = addr_m;
112940+ else {
112941+ new_m->vm_start = addr_m;
112942+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
112943+ }
112944+ }
112945+#endif
112946+
112947 err = vma_dup_policy(vma, new);
112948 if (err)
112949 goto out_free_vma;
112950@@ -2484,6 +2890,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
112951 else
112952 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
112953
112954+#ifdef CONFIG_PAX_SEGMEXEC
112955+ if (!err && vma_m) {
112956+ struct mempolicy *pol = vma_policy(new);
112957+
112958+ if (anon_vma_clone(new_m, vma_m))
112959+ goto out_free_mpol;
112960+
112961+ mpol_get(pol);
112962+ set_vma_policy(new_m, pol);
112963+
112964+ if (new_m->vm_file)
112965+ get_file(new_m->vm_file);
112966+
112967+ if (new_m->vm_ops && new_m->vm_ops->open)
112968+ new_m->vm_ops->open(new_m);
112969+
112970+ if (new_below)
112971+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
112972+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
112973+ else
112974+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
112975+
112976+ if (err) {
112977+ if (new_m->vm_ops && new_m->vm_ops->close)
112978+ new_m->vm_ops->close(new_m);
112979+ if (new_m->vm_file)
112980+ fput(new_m->vm_file);
112981+ mpol_put(pol);
112982+ }
112983+ }
112984+#endif
112985+
112986 /* Success. */
112987 if (!err)
112988 return 0;
112989@@ -2493,10 +2931,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
112990 new->vm_ops->close(new);
112991 if (new->vm_file)
112992 fput(new->vm_file);
112993- unlink_anon_vmas(new);
112994 out_free_mpol:
112995 mpol_put(vma_policy(new));
112996 out_free_vma:
112997+
112998+#ifdef CONFIG_PAX_SEGMEXEC
112999+ if (new_m) {
113000+ unlink_anon_vmas(new_m);
113001+ kmem_cache_free(vm_area_cachep, new_m);
113002+ }
113003+#endif
113004+
113005+ unlink_anon_vmas(new);
113006 kmem_cache_free(vm_area_cachep, new);
113007 out_err:
113008 return err;
113009@@ -2509,6 +2955,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113010 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113011 unsigned long addr, int new_below)
113012 {
113013+
113014+#ifdef CONFIG_PAX_SEGMEXEC
113015+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
113016+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
113017+ if (mm->map_count >= sysctl_max_map_count-1)
113018+ return -ENOMEM;
113019+ } else
113020+#endif
113021+
113022 if (mm->map_count >= sysctl_max_map_count)
113023 return -ENOMEM;
113024
113025@@ -2520,11 +2975,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113026 * work. This now handles partial unmappings.
113027 * Jeremy Fitzhardinge <jeremy@goop.org>
113028 */
113029+#ifdef CONFIG_PAX_SEGMEXEC
113030 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113031 {
113032+ int ret = __do_munmap(mm, start, len);
113033+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
113034+ return ret;
113035+
113036+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
113037+}
113038+
113039+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113040+#else
113041+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113042+#endif
113043+{
113044 unsigned long end;
113045 struct vm_area_struct *vma, *prev, *last;
113046
113047+ /*
113048+ * mm->mmap_sem is required to protect against another thread
113049+ * changing the mappings in case we sleep.
113050+ */
113051+ verify_mm_writelocked(mm);
113052+
113053 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
113054 return -EINVAL;
113055
113056@@ -2602,6 +3076,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113057 /* Fix up all other VM information */
113058 remove_vma_list(mm, vma);
113059
113060+ track_exec_limit(mm, start, end, 0UL);
113061+
113062 return 0;
113063 }
113064
113065@@ -2610,6 +3086,13 @@ int vm_munmap(unsigned long start, size_t len)
113066 int ret;
113067 struct mm_struct *mm = current->mm;
113068
113069+
113070+#ifdef CONFIG_PAX_SEGMEXEC
113071+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
113072+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
113073+ return -EINVAL;
113074+#endif
113075+
113076 down_write(&mm->mmap_sem);
113077 ret = do_munmap(mm, start, len);
113078 up_write(&mm->mmap_sem);
113079@@ -2656,6 +3139,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
113080 down_write(&mm->mmap_sem);
113081 vma = find_vma(mm, start);
113082
113083+#ifdef CONFIG_PAX_SEGMEXEC
113084+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
113085+ goto out;
113086+#endif
113087+
113088 if (!vma || !(vma->vm_flags & VM_SHARED))
113089 goto out;
113090
113091@@ -2692,16 +3180,6 @@ out:
113092 return ret;
113093 }
113094
113095-static inline void verify_mm_writelocked(struct mm_struct *mm)
113096-{
113097-#ifdef CONFIG_DEBUG_VM
113098- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
113099- WARN_ON(1);
113100- up_read(&mm->mmap_sem);
113101- }
113102-#endif
113103-}
113104-
113105 /*
113106 * this is really a simplified "do_mmap". it only handles
113107 * anonymous maps. eventually we may be able to do some
113108@@ -2715,6 +3193,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113109 struct rb_node **rb_link, *rb_parent;
113110 pgoff_t pgoff = addr >> PAGE_SHIFT;
113111 int error;
113112+ unsigned long charged;
113113
113114 len = PAGE_ALIGN(len);
113115 if (!len)
113116@@ -2722,10 +3201,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113117
113118 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
113119
113120+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
113121+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
113122+ flags &= ~VM_EXEC;
113123+
113124+#ifdef CONFIG_PAX_MPROTECT
113125+ if (mm->pax_flags & MF_PAX_MPROTECT)
113126+ flags &= ~VM_MAYEXEC;
113127+#endif
113128+
113129+ }
113130+#endif
113131+
113132 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
113133 if (error & ~PAGE_MASK)
113134 return error;
113135
113136+ charged = len >> PAGE_SHIFT;
113137+
113138 error = mlock_future_check(mm, mm->def_flags, len);
113139 if (error)
113140 return error;
113141@@ -2743,16 +3236,17 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113142 &rb_parent)) {
113143 if (do_munmap(mm, addr, len))
113144 return -ENOMEM;
113145+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
113146 }
113147
113148 /* Check against address space limits *after* clearing old maps... */
113149- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
113150+ if (!may_expand_vm(mm, charged))
113151 return -ENOMEM;
113152
113153 if (mm->map_count > sysctl_max_map_count)
113154 return -ENOMEM;
113155
113156- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
113157+ if (security_vm_enough_memory_mm(mm, charged))
113158 return -ENOMEM;
113159
113160 /* Can we just expand an old private anonymous mapping? */
113161@@ -2766,7 +3260,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113162 */
113163 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113164 if (!vma) {
113165- vm_unacct_memory(len >> PAGE_SHIFT);
113166+ vm_unacct_memory(charged);
113167 return -ENOMEM;
113168 }
113169
113170@@ -2780,10 +3274,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113171 vma_link(mm, vma, prev, rb_link, rb_parent);
113172 out:
113173 perf_event_mmap(vma);
113174- mm->total_vm += len >> PAGE_SHIFT;
113175+ mm->total_vm += charged;
113176 if (flags & VM_LOCKED)
113177- mm->locked_vm += (len >> PAGE_SHIFT);
113178+ mm->locked_vm += charged;
113179 vma->vm_flags |= VM_SOFTDIRTY;
113180+ track_exec_limit(mm, addr, addr + len, flags);
113181 return addr;
113182 }
113183
113184@@ -2845,6 +3340,7 @@ void exit_mmap(struct mm_struct *mm)
113185 while (vma) {
113186 if (vma->vm_flags & VM_ACCOUNT)
113187 nr_accounted += vma_pages(vma);
113188+ vma->vm_mirror = NULL;
113189 vma = remove_vma(vma);
113190 }
113191 vm_unacct_memory(nr_accounted);
113192@@ -2859,6 +3355,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113193 struct vm_area_struct *prev;
113194 struct rb_node **rb_link, *rb_parent;
113195
113196+#ifdef CONFIG_PAX_SEGMEXEC
113197+ struct vm_area_struct *vma_m = NULL;
113198+#endif
113199+
113200+ if (security_mmap_addr(vma->vm_start))
113201+ return -EPERM;
113202+
113203 /*
113204 * The vm_pgoff of a purely anonymous vma should be irrelevant
113205 * until its first write fault, when page's anon_vma and index
113206@@ -2882,7 +3385,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113207 security_vm_enough_memory_mm(mm, vma_pages(vma)))
113208 return -ENOMEM;
113209
113210+#ifdef CONFIG_PAX_SEGMEXEC
113211+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
113212+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113213+ if (!vma_m)
113214+ return -ENOMEM;
113215+ }
113216+#endif
113217+
113218 vma_link(mm, vma, prev, rb_link, rb_parent);
113219+
113220+#ifdef CONFIG_PAX_SEGMEXEC
113221+ if (vma_m)
113222+ BUG_ON(pax_mirror_vma(vma_m, vma));
113223+#endif
113224+
113225 return 0;
113226 }
113227
113228@@ -2901,6 +3418,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113229 struct rb_node **rb_link, *rb_parent;
113230 bool faulted_in_anon_vma = true;
113231
113232+ BUG_ON(vma->vm_mirror);
113233+
113234 /*
113235 * If anonymous vma has not yet been faulted, update new pgoff
113236 * to match new location, to increase its chance of merging.
113237@@ -2965,6 +3484,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113238 return NULL;
113239 }
113240
113241+#ifdef CONFIG_PAX_SEGMEXEC
113242+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
113243+{
113244+ struct vm_area_struct *prev_m;
113245+ struct rb_node **rb_link_m, *rb_parent_m;
113246+ struct mempolicy *pol_m;
113247+
113248+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
113249+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
113250+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
113251+ *vma_m = *vma;
113252+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
113253+ if (anon_vma_clone(vma_m, vma))
113254+ return -ENOMEM;
113255+ pol_m = vma_policy(vma_m);
113256+ mpol_get(pol_m);
113257+ set_vma_policy(vma_m, pol_m);
113258+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
113259+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
113260+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
113261+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
113262+ if (vma_m->vm_file)
113263+ get_file(vma_m->vm_file);
113264+ if (vma_m->vm_ops && vma_m->vm_ops->open)
113265+ vma_m->vm_ops->open(vma_m);
113266+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
113267+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
113268+ vma_m->vm_mirror = vma;
113269+ vma->vm_mirror = vma_m;
113270+ return 0;
113271+}
113272+#endif
113273+
113274 /*
113275 * Return true if the calling process may expand its vm space by the passed
113276 * number of pages
113277@@ -2976,6 +3528,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
113278
113279 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
113280
113281+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
113282 if (cur + npages > lim)
113283 return 0;
113284 return 1;
113285@@ -3058,6 +3611,22 @@ static struct vm_area_struct *__install_special_mapping(
113286 vma->vm_start = addr;
113287 vma->vm_end = addr + len;
113288
113289+#ifdef CONFIG_PAX_MPROTECT
113290+ if (mm->pax_flags & MF_PAX_MPROTECT) {
113291+#ifndef CONFIG_PAX_MPROTECT_COMPAT
113292+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
113293+ return ERR_PTR(-EPERM);
113294+ if (!(vm_flags & VM_EXEC))
113295+ vm_flags &= ~VM_MAYEXEC;
113296+#else
113297+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
113298+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
113299+#endif
113300+ else
113301+ vm_flags &= ~VM_MAYWRITE;
113302+ }
113303+#endif
113304+
113305 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
113306 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
113307
113308diff --git a/mm/mprotect.c b/mm/mprotect.c
113309index 8858483..72f2464 100644
113310--- a/mm/mprotect.c
113311+++ b/mm/mprotect.c
113312@@ -24,10 +24,18 @@
113313 #include <linux/migrate.h>
113314 #include <linux/perf_event.h>
113315 #include <linux/ksm.h>
113316+#include <linux/sched/sysctl.h>
113317+
113318+#ifdef CONFIG_PAX_MPROTECT
113319+#include <linux/elf.h>
113320+#include <linux/binfmts.h>
113321+#endif
113322+
113323 #include <asm/uaccess.h>
113324 #include <asm/pgtable.h>
113325 #include <asm/cacheflush.h>
113326 #include <asm/tlbflush.h>
113327+#include <asm/mmu_context.h>
113328
113329 /*
113330 * For a prot_numa update we only hold mmap_sem for read so there is a
113331@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
113332 return pages;
113333 }
113334
113335+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113336+/* called while holding the mmap semaphor for writing except stack expansion */
113337+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
113338+{
113339+ unsigned long oldlimit, newlimit = 0UL;
113340+
113341+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
113342+ return;
113343+
113344+ spin_lock(&mm->page_table_lock);
113345+ oldlimit = mm->context.user_cs_limit;
113346+ if ((prot & VM_EXEC) && oldlimit < end)
113347+ /* USER_CS limit moved up */
113348+ newlimit = end;
113349+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
113350+ /* USER_CS limit moved down */
113351+ newlimit = start;
113352+
113353+ if (newlimit) {
113354+ mm->context.user_cs_limit = newlimit;
113355+
113356+#ifdef CONFIG_SMP
113357+ wmb();
113358+ cpumask_clear(&mm->context.cpu_user_cs_mask);
113359+ cpumask_set_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask);
113360+#endif
113361+
113362+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
113363+ }
113364+ spin_unlock(&mm->page_table_lock);
113365+ if (newlimit == end) {
113366+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
113367+
113368+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
113369+ if (is_vm_hugetlb_page(vma))
113370+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
113371+ else
113372+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
113373+ }
113374+}
113375+#endif
113376+
113377 int
113378 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113379 unsigned long start, unsigned long end, unsigned long newflags)
113380@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113381 int error;
113382 int dirty_accountable = 0;
113383
113384+#ifdef CONFIG_PAX_SEGMEXEC
113385+ struct vm_area_struct *vma_m = NULL;
113386+ unsigned long start_m, end_m;
113387+
113388+ start_m = start + SEGMEXEC_TASK_SIZE;
113389+ end_m = end + SEGMEXEC_TASK_SIZE;
113390+#endif
113391+
113392 if (newflags == oldflags) {
113393 *pprev = vma;
113394 return 0;
113395 }
113396
113397+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
113398+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
113399+
113400+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
113401+ return -ENOMEM;
113402+
113403+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
113404+ return -ENOMEM;
113405+ }
113406+
113407 /*
113408 * If we make a private mapping writable we increase our commit;
113409 * but (without finer accounting) cannot reduce our commit if we
113410@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113411 }
113412 }
113413
113414+#ifdef CONFIG_PAX_SEGMEXEC
113415+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
113416+ if (start != vma->vm_start) {
113417+ error = split_vma(mm, vma, start, 1);
113418+ if (error)
113419+ goto fail;
113420+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
113421+ *pprev = (*pprev)->vm_next;
113422+ }
113423+
113424+ if (end != vma->vm_end) {
113425+ error = split_vma(mm, vma, end, 0);
113426+ if (error)
113427+ goto fail;
113428+ }
113429+
113430+ if (pax_find_mirror_vma(vma)) {
113431+ error = __do_munmap(mm, start_m, end_m - start_m);
113432+ if (error)
113433+ goto fail;
113434+ } else {
113435+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113436+ if (!vma_m) {
113437+ error = -ENOMEM;
113438+ goto fail;
113439+ }
113440+ vma->vm_flags = newflags;
113441+ error = pax_mirror_vma(vma_m, vma);
113442+ if (error) {
113443+ vma->vm_flags = oldflags;
113444+ goto fail;
113445+ }
113446+ }
113447+ }
113448+#endif
113449+
113450 /*
113451 * First try to merge with previous and/or next vma.
113452 */
113453@@ -315,7 +419,19 @@ success:
113454 * vm_flags and vm_page_prot are protected by the mmap_sem
113455 * held in write mode.
113456 */
113457+
113458+#ifdef CONFIG_PAX_SEGMEXEC
113459+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
113460+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
113461+#endif
113462+
113463 vma->vm_flags = newflags;
113464+
113465+#ifdef CONFIG_PAX_MPROTECT
113466+ if (mm->binfmt && mm->binfmt->handle_mprotect)
113467+ mm->binfmt->handle_mprotect(vma, newflags);
113468+#endif
113469+
113470 dirty_accountable = vma_wants_writenotify(vma);
113471 vma_set_page_prot(vma);
113472
113473@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113474 end = start + len;
113475 if (end <= start)
113476 return -ENOMEM;
113477+
113478+#ifdef CONFIG_PAX_SEGMEXEC
113479+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
113480+ if (end > SEGMEXEC_TASK_SIZE)
113481+ return -EINVAL;
113482+ } else
113483+#endif
113484+
113485+ if (end > TASK_SIZE)
113486+ return -EINVAL;
113487+
113488 if (!arch_validate_prot(prot))
113489 return -EINVAL;
113490
113491@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113492 /*
113493 * Does the application expect PROT_READ to imply PROT_EXEC:
113494 */
113495- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
113496+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
113497 prot |= PROT_EXEC;
113498
113499 vm_flags = calc_vm_prot_bits(prot);
113500@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113501 if (start > vma->vm_start)
113502 prev = vma;
113503
113504+#ifdef CONFIG_PAX_MPROTECT
113505+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
113506+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
113507+#endif
113508+
113509 for (nstart = start ; ; ) {
113510 unsigned long newflags;
113511
113512@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113513
113514 /* newflags >> 4 shift VM_MAY% in place of VM_% */
113515 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
113516+ if (prot & (PROT_WRITE | PROT_EXEC))
113517+ gr_log_rwxmprotect(vma);
113518+
113519+ error = -EACCES;
113520+ goto out;
113521+ }
113522+
113523+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
113524 error = -EACCES;
113525 goto out;
113526 }
113527@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113528 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
113529 if (error)
113530 goto out;
113531+
113532+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
113533+
113534 nstart = tmp;
113535
113536 if (nstart < prev->vm_end)
113537diff --git a/mm/mremap.c b/mm/mremap.c
113538index 034e2d3..81deca5 100644
113539--- a/mm/mremap.c
113540+++ b/mm/mremap.c
113541@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
113542 continue;
113543 pte = ptep_get_and_clear(mm, old_addr, old_pte);
113544 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
113545+
113546+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113547+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
113548+ pte = pte_exprotect(pte);
113549+#endif
113550+
113551 pte = move_soft_dirty_pte(pte);
113552 set_pte_at(mm, new_addr, new_pte, pte);
113553 }
113554@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
113555 if (is_vm_hugetlb_page(vma))
113556 return ERR_PTR(-EINVAL);
113557
113558+#ifdef CONFIG_PAX_SEGMEXEC
113559+ if (pax_find_mirror_vma(vma))
113560+ return ERR_PTR(-EINVAL);
113561+#endif
113562+
113563 /* We can't remap across vm area boundaries */
113564 if (old_len > vma->vm_end - addr)
113565 return ERR_PTR(-EFAULT);
113566@@ -396,20 +407,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
113567 unsigned long ret = -EINVAL;
113568 unsigned long charged = 0;
113569 unsigned long map_flags;
113570+ unsigned long pax_task_size = TASK_SIZE;
113571
113572 if (new_addr & ~PAGE_MASK)
113573 goto out;
113574
113575- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
113576+#ifdef CONFIG_PAX_SEGMEXEC
113577+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113578+ pax_task_size = SEGMEXEC_TASK_SIZE;
113579+#endif
113580+
113581+ pax_task_size -= PAGE_SIZE;
113582+
113583+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
113584 goto out;
113585
113586 /* Check if the location we're moving into overlaps the
113587 * old location at all, and fail if it does.
113588 */
113589- if ((new_addr <= addr) && (new_addr+new_len) > addr)
113590- goto out;
113591-
113592- if ((addr <= new_addr) && (addr+old_len) > new_addr)
113593+ if (addr + old_len > new_addr && new_addr + new_len > addr)
113594 goto out;
113595
113596 ret = do_munmap(mm, new_addr, new_len);
113597@@ -478,6 +494,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113598 unsigned long ret = -EINVAL;
113599 unsigned long charged = 0;
113600 bool locked = false;
113601+ unsigned long pax_task_size = TASK_SIZE;
113602
113603 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
113604 return ret;
113605@@ -499,6 +516,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113606 if (!new_len)
113607 return ret;
113608
113609+#ifdef CONFIG_PAX_SEGMEXEC
113610+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113611+ pax_task_size = SEGMEXEC_TASK_SIZE;
113612+#endif
113613+
113614+ pax_task_size -= PAGE_SIZE;
113615+
113616+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
113617+ old_len > pax_task_size || addr > pax_task_size-old_len)
113618+ return ret;
113619+
113620 down_write(&current->mm->mmap_sem);
113621
113622 if (flags & MREMAP_FIXED) {
113623@@ -549,6 +577,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113624 new_addr = addr;
113625 }
113626 ret = addr;
113627+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
113628 goto out;
113629 }
113630 }
113631@@ -572,7 +601,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113632 goto out;
113633 }
113634
113635+ map_flags = vma->vm_flags;
113636 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
113637+ if (!(ret & ~PAGE_MASK)) {
113638+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
113639+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
113640+ }
113641 }
113642 out:
113643 if (ret & ~PAGE_MASK)
113644diff --git a/mm/nommu.c b/mm/nommu.c
113645index e544508..b56ce7a 100644
113646--- a/mm/nommu.c
113647+++ b/mm/nommu.c
113648@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
113649 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
113650 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
113651 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
113652-int heap_stack_gap = 0;
113653
113654 atomic_long_t mmap_pages_allocated;
113655
113656@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
113657 EXPORT_SYMBOL(find_vma);
113658
113659 /*
113660- * find a VMA
113661- * - we don't extend stack VMAs under NOMMU conditions
113662- */
113663-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
113664-{
113665- return find_vma(mm, addr);
113666-}
113667-
113668-/*
113669 * expand a stack to a given address
113670 * - not supported under NOMMU conditions
113671 */
113672@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113673
113674 /* most fields are the same, copy all, and then fixup */
113675 *new = *vma;
113676+ INIT_LIST_HEAD(&new->anon_vma_chain);
113677 *region = *vma->vm_region;
113678 new->vm_region = region;
113679
113680@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
113681 }
113682 EXPORT_SYMBOL(filemap_map_pages);
113683
113684-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113685- unsigned long addr, void *buf, int len, int write)
113686+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113687+ unsigned long addr, void *buf, size_t len, int write)
113688 {
113689 struct vm_area_struct *vma;
113690
113691@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113692 *
113693 * The caller must hold a reference on @mm.
113694 */
113695-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113696- void *buf, int len, int write)
113697+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
113698+ void *buf, size_t len, int write)
113699 {
113700 return __access_remote_vm(NULL, mm, addr, buf, len, write);
113701 }
113702@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113703 * Access another process' address space.
113704 * - source/target buffer must be kernel space
113705 */
113706-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
113707+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
113708 {
113709 struct mm_struct *mm;
113710
113711diff --git a/mm/page-writeback.c b/mm/page-writeback.c
113712index eb59f7e..b23a2a8 100644
113713--- a/mm/page-writeback.c
113714+++ b/mm/page-writeback.c
113715@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
113716 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
113717 * - the bdi dirty thresh drops quickly due to change of JBOD workload
113718 */
113719-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
113720+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
113721 unsigned long thresh,
113722 unsigned long bg_thresh,
113723 unsigned long dirty,
113724diff --git a/mm/page_alloc.c b/mm/page_alloc.c
113725index ebffa0e..c61160a 100644
113726--- a/mm/page_alloc.c
113727+++ b/mm/page_alloc.c
113728@@ -61,6 +61,7 @@
113729 #include <linux/hugetlb.h>
113730 #include <linux/sched/rt.h>
113731 #include <linux/page_owner.h>
113732+#include <linux/random.h>
113733
113734 #include <asm/sections.h>
113735 #include <asm/tlbflush.h>
113736@@ -357,7 +358,7 @@ out:
113737 * This usage means that zero-order pages may not be compound.
113738 */
113739
113740-static void free_compound_page(struct page *page)
113741+void free_compound_page(struct page *page)
113742 {
113743 __free_pages_ok(page, compound_order(page));
113744 }
113745@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
113746 __mod_zone_freepage_state(zone, (1 << order), migratetype);
113747 }
113748 #else
113749-struct page_ext_operations debug_guardpage_ops = { NULL, };
113750+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
113751 static inline void set_page_guard(struct zone *zone, struct page *page,
113752 unsigned int order, int migratetype) {}
113753 static inline void clear_page_guard(struct zone *zone, struct page *page,
113754@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
113755 bool compound = PageCompound(page);
113756 int i, bad = 0;
113757
113758+#ifdef CONFIG_PAX_MEMORY_SANITIZE
113759+ unsigned long index = 1UL << order;
113760+#endif
113761+
113762 VM_BUG_ON_PAGE(PageTail(page), page);
113763 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
113764
113765@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
113766 debug_check_no_obj_freed(page_address(page),
113767 PAGE_SIZE << order);
113768 }
113769+
113770+#ifdef CONFIG_PAX_MEMORY_SANITIZE
113771+ for (; index; --index)
113772+ sanitize_highpage(page + index - 1);
113773+#endif
113774+
113775 arch_free_page(page, order);
113776 kernel_map_pages(page, 1 << order, 0);
113777
113778@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
113779 local_irq_restore(flags);
113780 }
113781
113782+#ifdef CONFIG_PAX_LATENT_ENTROPY
113783+bool __meminitdata extra_latent_entropy;
113784+
113785+static int __init setup_pax_extra_latent_entropy(char *str)
113786+{
113787+ extra_latent_entropy = true;
113788+ return 0;
113789+}
113790+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
113791+
113792+volatile u64 latent_entropy __latent_entropy;
113793+EXPORT_SYMBOL(latent_entropy);
113794+#endif
113795+
113796 void __init __free_pages_bootmem(struct page *page, unsigned int order)
113797 {
113798 unsigned int nr_pages = 1 << order;
113799@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
113800 __ClearPageReserved(p);
113801 set_page_count(p, 0);
113802
113803+#ifdef CONFIG_PAX_LATENT_ENTROPY
113804+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
113805+ u64 hash = 0;
113806+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
113807+ const u64 *data = lowmem_page_address(page);
113808+
113809+ for (index = 0; index < end; index++)
113810+ hash ^= hash + data[index];
113811+ latent_entropy ^= hash;
113812+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
113813+ }
113814+#endif
113815+
113816 page_zone(page)->managed_pages += nr_pages;
113817 set_page_refcounted(page);
113818 __free_pages(page, order);
113819@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
113820 kernel_map_pages(page, 1 << order, 1);
113821 kasan_alloc_pages(page, order);
113822
113823+#ifndef CONFIG_PAX_MEMORY_SANITIZE
113824 if (gfp_flags & __GFP_ZERO)
113825 prep_zero_page(page, order, gfp_flags);
113826+#endif
113827
113828 if (order && (gfp_flags & __GFP_COMP))
113829 prep_compound_page(page, order);
113830@@ -1649,6 +1689,8 @@ int __isolate_free_page(struct page *page, unsigned int order)
113831 zone->free_area[order].nr_free--;
113832 rmv_page_order(page);
113833
113834+ set_page_owner(page, order, 0);
113835+
113836 /* Set the pageblock if the isolated page is at least a pageblock */
113837 if (order >= pageblock_order - 1) {
113838 struct page *endpage = page + (1 << order) - 1;
113839@@ -1660,7 +1702,7 @@ int __isolate_free_page(struct page *page, unsigned int order)
113840 }
113841 }
113842
113843- set_page_owner(page, order, 0);
113844+
113845 return 1UL << order;
113846 }
113847
113848@@ -1749,7 +1791,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
113849 }
113850
113851 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
113852- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
113853+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
113854 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
113855 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
113856
113857@@ -2068,7 +2110,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
113858 do {
113859 mod_zone_page_state(zone, NR_ALLOC_BATCH,
113860 high_wmark_pages(zone) - low_wmark_pages(zone) -
113861- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
113862+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
113863 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
113864 } while (zone++ != preferred_zone);
113865 }
113866@@ -5781,7 +5823,7 @@ static void __setup_per_zone_wmarks(void)
113867
113868 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
113869 high_wmark_pages(zone) - low_wmark_pages(zone) -
113870- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
113871+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
113872
113873 setup_zone_migrate_reserve(zone);
113874 spin_unlock_irqrestore(&zone->lock, flags);
113875diff --git a/mm/percpu.c b/mm/percpu.c
113876index 2dd7448..9bb6305 100644
113877--- a/mm/percpu.c
113878+++ b/mm/percpu.c
113879@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
113880 static unsigned int pcpu_high_unit_cpu __read_mostly;
113881
113882 /* the address of the first chunk which starts with the kernel static area */
113883-void *pcpu_base_addr __read_mostly;
113884+void *pcpu_base_addr __read_only;
113885 EXPORT_SYMBOL_GPL(pcpu_base_addr);
113886
113887 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
113888diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
113889index e88d071..d80e01a 100644
113890--- a/mm/process_vm_access.c
113891+++ b/mm/process_vm_access.c
113892@@ -13,6 +13,7 @@
113893 #include <linux/uio.h>
113894 #include <linux/sched.h>
113895 #include <linux/highmem.h>
113896+#include <linux/security.h>
113897 #include <linux/ptrace.h>
113898 #include <linux/slab.h>
113899 #include <linux/syscalls.h>
113900@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
113901 ssize_t iov_len;
113902 size_t total_len = iov_iter_count(iter);
113903
113904+ return -ENOSYS; // PaX: until properly audited
113905+
113906 /*
113907 * Work out how many pages of struct pages we're going to need
113908 * when eventually calling get_user_pages
113909 */
113910 for (i = 0; i < riovcnt; i++) {
113911 iov_len = rvec[i].iov_len;
113912- if (iov_len > 0) {
113913- nr_pages_iov = ((unsigned long)rvec[i].iov_base
113914- + iov_len)
113915- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
113916- / PAGE_SIZE + 1;
113917- nr_pages = max(nr_pages, nr_pages_iov);
113918- }
113919+ if (iov_len <= 0)
113920+ continue;
113921+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
113922+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
113923+ nr_pages = max(nr_pages, nr_pages_iov);
113924 }
113925
113926 if (nr_pages == 0)
113927@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
113928 goto free_proc_pages;
113929 }
113930
113931+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
113932+ rc = -EPERM;
113933+ goto put_task_struct;
113934+ }
113935+
113936 mm = mm_access(task, PTRACE_MODE_ATTACH);
113937 if (!mm || IS_ERR(mm)) {
113938 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
113939diff --git a/mm/rmap.c b/mm/rmap.c
113940index 24dd3f9..4eb43f4 100644
113941--- a/mm/rmap.c
113942+++ b/mm/rmap.c
113943@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
113944 struct anon_vma *anon_vma = vma->anon_vma;
113945 struct anon_vma_chain *avc;
113946
113947+#ifdef CONFIG_PAX_SEGMEXEC
113948+ struct anon_vma_chain *avc_m = NULL;
113949+#endif
113950+
113951 might_sleep();
113952 if (unlikely(!anon_vma)) {
113953 struct mm_struct *mm = vma->vm_mm;
113954@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
113955 if (!avc)
113956 goto out_enomem;
113957
113958+#ifdef CONFIG_PAX_SEGMEXEC
113959+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
113960+ if (!avc_m)
113961+ goto out_enomem_free_avc;
113962+#endif
113963+
113964 anon_vma = find_mergeable_anon_vma(vma);
113965 allocated = NULL;
113966 if (!anon_vma) {
113967@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
113968 /* page_table_lock to protect against threads */
113969 spin_lock(&mm->page_table_lock);
113970 if (likely(!vma->anon_vma)) {
113971+
113972+#ifdef CONFIG_PAX_SEGMEXEC
113973+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
113974+
113975+ if (vma_m) {
113976+ BUG_ON(vma_m->anon_vma);
113977+ vma_m->anon_vma = anon_vma;
113978+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
113979+ anon_vma->degree++;
113980+ avc_m = NULL;
113981+ }
113982+#endif
113983+
113984 vma->anon_vma = anon_vma;
113985 anon_vma_chain_link(vma, avc, anon_vma);
113986 /* vma reference or self-parent link for new root */
113987@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
113988
113989 if (unlikely(allocated))
113990 put_anon_vma(allocated);
113991+
113992+#ifdef CONFIG_PAX_SEGMEXEC
113993+ if (unlikely(avc_m))
113994+ anon_vma_chain_free(avc_m);
113995+#endif
113996+
113997 if (unlikely(avc))
113998 anon_vma_chain_free(avc);
113999 }
114000 return 0;
114001
114002 out_enomem_free_avc:
114003+
114004+#ifdef CONFIG_PAX_SEGMEXEC
114005+ if (avc_m)
114006+ anon_vma_chain_free(avc_m);
114007+#endif
114008+
114009 anon_vma_chain_free(avc);
114010 out_enomem:
114011 return -ENOMEM;
114012@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
114013 * good chance of avoiding scanning the whole hierarchy when it searches where
114014 * page is mapped.
114015 */
114016-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114017+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
114018 {
114019 struct anon_vma_chain *avc, *pavc;
114020 struct anon_vma *root = NULL;
114021@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114022 * the corresponding VMA in the parent process is attached to.
114023 * Returns 0 on success, non-zero on failure.
114024 */
114025-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
114026+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
114027 {
114028 struct anon_vma_chain *avc;
114029 struct anon_vma *anon_vma;
114030@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
114031 void __init anon_vma_init(void)
114032 {
114033 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
114034- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
114035- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
114036+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
114037+ anon_vma_ctor);
114038+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
114039+ SLAB_PANIC|SLAB_NO_SANITIZE);
114040 }
114041
114042 /*
114043diff --git a/mm/shmem.c b/mm/shmem.c
114044index 47d536e..8321b4e 100644
114045--- a/mm/shmem.c
114046+++ b/mm/shmem.c
114047@@ -33,7 +33,7 @@
114048 #include <linux/swap.h>
114049 #include <linux/uio.h>
114050
114051-static struct vfsmount *shm_mnt;
114052+struct vfsmount *shm_mnt;
114053
114054 #ifdef CONFIG_SHMEM
114055 /*
114056@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
114057 #define BOGO_DIRENT_SIZE 20
114058
114059 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
114060-#define SHORT_SYMLINK_LEN 128
114061+#define SHORT_SYMLINK_LEN 64
114062
114063 /*
114064 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
114065@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
114066 static int shmem_xattr_validate(const char *name)
114067 {
114068 struct { const char *prefix; size_t len; } arr[] = {
114069+
114070+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114071+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
114072+#endif
114073+
114074 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
114075 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
114076 };
114077@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
114078 if (err)
114079 return err;
114080
114081+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114082+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
114083+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
114084+ return -EOPNOTSUPP;
114085+ if (size > 8)
114086+ return -EINVAL;
114087+ }
114088+#endif
114089+
114090 return simple_xattr_set(&info->xattrs, name, value, size, flags);
114091 }
114092
114093@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
114094 int err = -ENOMEM;
114095
114096 /* Round up to L1_CACHE_BYTES to resist false sharing */
114097- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
114098- L1_CACHE_BYTES), GFP_KERNEL);
114099+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
114100 if (!sbinfo)
114101 return -ENOMEM;
114102
114103diff --git a/mm/slab.c b/mm/slab.c
114104index 7eb38dd..5dee2c4 100644
114105--- a/mm/slab.c
114106+++ b/mm/slab.c
114107@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114108 if ((x)->max_freeable < i) \
114109 (x)->max_freeable = i; \
114110 } while (0)
114111-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
114112-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
114113-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
114114-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
114115+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
114116+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
114117+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
114118+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
114119+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
114120+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
114121 #else
114122 #define STATS_INC_ACTIVE(x) do { } while (0)
114123 #define STATS_DEC_ACTIVE(x) do { } while (0)
114124@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114125 #define STATS_INC_ALLOCMISS(x) do { } while (0)
114126 #define STATS_INC_FREEHIT(x) do { } while (0)
114127 #define STATS_INC_FREEMISS(x) do { } while (0)
114128+#define STATS_INC_SANITIZED(x) do { } while (0)
114129+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
114130 #endif
114131
114132 #if DEBUG
114133@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
114134 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
114135 */
114136 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
114137- const struct page *page, void *obj)
114138+ const struct page *page, const void *obj)
114139 {
114140 u32 offset = (obj - page->s_mem);
114141 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
114142@@ -1452,7 +1456,7 @@ void __init kmem_cache_init(void)
114143 * structures first. Without this, further allocations will bug.
114144 */
114145 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
114146- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
114147+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
114148 slab_state = PARTIAL_NODE;
114149
114150 slab_early_init = 0;
114151@@ -2073,7 +2077,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
114152
114153 cachep = find_mergeable(size, align, flags, name, ctor);
114154 if (cachep) {
114155- cachep->refcount++;
114156+ atomic_inc(&cachep->refcount);
114157
114158 /*
114159 * Adjust the object sizes so that we clear
114160@@ -3371,6 +3375,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
114161 struct array_cache *ac = cpu_cache_get(cachep);
114162
114163 check_irq_off();
114164+
114165+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114166+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
114167+ STATS_INC_NOT_SANITIZED(cachep);
114168+ else {
114169+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
114170+
114171+ if (cachep->ctor)
114172+ cachep->ctor(objp);
114173+
114174+ STATS_INC_SANITIZED(cachep);
114175+ }
114176+#endif
114177+
114178 kmemleak_free_recursive(objp, cachep->flags);
114179 objp = cache_free_debugcheck(cachep, objp, caller);
114180
114181@@ -3483,7 +3501,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
114182 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
114183 }
114184
114185-void *__kmalloc_node(size_t size, gfp_t flags, int node)
114186+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
114187 {
114188 return __do_kmalloc_node(size, flags, node, _RET_IP_);
114189 }
114190@@ -3503,7 +3521,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
114191 * @flags: the type of memory to allocate (see kmalloc).
114192 * @caller: function caller for debug tracking of the caller
114193 */
114194-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
114195+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
114196 unsigned long caller)
114197 {
114198 struct kmem_cache *cachep;
114199@@ -3576,6 +3594,7 @@ void kfree(const void *objp)
114200
114201 if (unlikely(ZERO_OR_NULL_PTR(objp)))
114202 return;
114203+ VM_BUG_ON(!virt_addr_valid(objp));
114204 local_irq_save(flags);
114205 kfree_debugcheck(objp);
114206 c = virt_to_cache(objp);
114207@@ -3995,14 +4014,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
114208 }
114209 /* cpu stats */
114210 {
114211- unsigned long allochit = atomic_read(&cachep->allochit);
114212- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
114213- unsigned long freehit = atomic_read(&cachep->freehit);
114214- unsigned long freemiss = atomic_read(&cachep->freemiss);
114215+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
114216+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
114217+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
114218+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
114219
114220 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
114221 allochit, allocmiss, freehit, freemiss);
114222 }
114223+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114224+ {
114225+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
114226+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
114227+
114228+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
114229+ }
114230+#endif
114231 #endif
114232 }
114233
114234@@ -4210,13 +4237,80 @@ static const struct file_operations proc_slabstats_operations = {
114235 static int __init slab_proc_init(void)
114236 {
114237 #ifdef CONFIG_DEBUG_SLAB_LEAK
114238- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
114239+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
114240 #endif
114241 return 0;
114242 }
114243 module_init(slab_proc_init);
114244 #endif
114245
114246+bool is_usercopy_object(const void *ptr)
114247+{
114248+ struct page *page;
114249+ struct kmem_cache *cachep;
114250+
114251+ if (ZERO_OR_NULL_PTR(ptr))
114252+ return false;
114253+
114254+ if (!slab_is_available())
114255+ return false;
114256+
114257+ if (is_vmalloc_addr(ptr)
114258+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
114259+ && !object_starts_on_stack(ptr)
114260+#endif
114261+ ) {
114262+ struct vm_struct *vm = find_vm_area(ptr);
114263+ if (vm && (vm->flags & VM_USERCOPY))
114264+ return true;
114265+ return false;
114266+ }
114267+
114268+ if (!virt_addr_valid(ptr))
114269+ return false;
114270+
114271+ page = virt_to_head_page(ptr);
114272+
114273+ if (!PageSlab(page))
114274+ return false;
114275+
114276+ cachep = page->slab_cache;
114277+ return cachep->flags & SLAB_USERCOPY;
114278+}
114279+
114280+#ifdef CONFIG_PAX_USERCOPY
114281+const char *check_heap_object(const void *ptr, unsigned long n)
114282+{
114283+ struct page *page;
114284+ struct kmem_cache *cachep;
114285+ unsigned int objnr;
114286+ unsigned long offset;
114287+
114288+ if (ZERO_OR_NULL_PTR(ptr))
114289+ return "<null>";
114290+
114291+ if (!virt_addr_valid(ptr))
114292+ return NULL;
114293+
114294+ page = virt_to_head_page(ptr);
114295+
114296+ if (!PageSlab(page))
114297+ return NULL;
114298+
114299+ cachep = page->slab_cache;
114300+ if (!(cachep->flags & SLAB_USERCOPY))
114301+ return cachep->name;
114302+
114303+ objnr = obj_to_index(cachep, page, ptr);
114304+ BUG_ON(objnr >= cachep->num);
114305+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
114306+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
114307+ return NULL;
114308+
114309+ return cachep->name;
114310+}
114311+#endif
114312+
114313 /**
114314 * ksize - get the actual amount of memory allocated for a given object
114315 * @objp: Pointer to the object
114316diff --git a/mm/slab.h b/mm/slab.h
114317index 4c3ac12..7b2e470 100644
114318--- a/mm/slab.h
114319+++ b/mm/slab.h
114320@@ -22,7 +22,7 @@ struct kmem_cache {
114321 unsigned int align; /* Alignment as calculated */
114322 unsigned long flags; /* Active flags on the slab */
114323 const char *name; /* Slab name for sysfs */
114324- int refcount; /* Use counter */
114325+ atomic_t refcount; /* Use counter */
114326 void (*ctor)(void *); /* Called on object slot creation */
114327 struct list_head list; /* List of all slab caches on the system */
114328 };
114329@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
114330 /* The slab cache that manages slab cache information */
114331 extern struct kmem_cache *kmem_cache;
114332
114333+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114334+#ifdef CONFIG_X86_64
114335+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
114336+#else
114337+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
114338+#endif
114339+enum pax_sanitize_mode {
114340+ PAX_SANITIZE_SLAB_OFF = 0,
114341+ PAX_SANITIZE_SLAB_FAST,
114342+ PAX_SANITIZE_SLAB_FULL,
114343+};
114344+extern enum pax_sanitize_mode pax_sanitize_slab;
114345+#endif
114346+
114347 unsigned long calculate_alignment(unsigned long flags,
114348 unsigned long align, unsigned long size);
114349
114350@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
114351
114352 /* Legal flag mask for kmem_cache_create(), for various configurations */
114353 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
114354- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
114355+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
114356+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
114357
114358 #if defined(CONFIG_DEBUG_SLAB)
114359 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
114360@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
114361 return s;
114362
114363 page = virt_to_head_page(x);
114364+
114365+ BUG_ON(!PageSlab(page));
114366+
114367 cachep = page->slab_cache;
114368 if (slab_equal_or_root(cachep, s))
114369 return cachep;
114370diff --git a/mm/slab_common.c b/mm/slab_common.c
114371index 999bb34..9843aea 100644
114372--- a/mm/slab_common.c
114373+++ b/mm/slab_common.c
114374@@ -25,11 +25,35 @@
114375
114376 #include "slab.h"
114377
114378-enum slab_state slab_state;
114379+enum slab_state slab_state __read_only;
114380 LIST_HEAD(slab_caches);
114381 DEFINE_MUTEX(slab_mutex);
114382 struct kmem_cache *kmem_cache;
114383
114384+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114385+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
114386+static int __init pax_sanitize_slab_setup(char *str)
114387+{
114388+ if (!str)
114389+ return 0;
114390+
114391+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
114392+ pr_info("PaX slab sanitization: %s\n", "disabled");
114393+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
114394+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
114395+ pr_info("PaX slab sanitization: %s\n", "fast");
114396+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
114397+ } else if (!strcmp(str, "full")) {
114398+ pr_info("PaX slab sanitization: %s\n", "full");
114399+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
114400+ } else
114401+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
114402+
114403+ return 0;
114404+}
114405+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
114406+#endif
114407+
114408 /*
114409 * Set of flags that will prevent slab merging
114410 */
114411@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
114412 * Merge control. If this is set then no merging of slab caches will occur.
114413 * (Could be removed. This was introduced to pacify the merge skeptics.)
114414 */
114415-static int slab_nomerge;
114416+static int slab_nomerge = 1;
114417
114418 static int __init setup_slab_nomerge(char *str)
114419 {
114420@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
114421 /*
114422 * We may have set a slab to be unmergeable during bootstrap.
114423 */
114424- if (s->refcount < 0)
114425+ if (atomic_read(&s->refcount) < 0)
114426 return 1;
114427
114428 return 0;
114429@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
114430 if (err)
114431 goto out_free_cache;
114432
114433- s->refcount = 1;
114434+ atomic_set(&s->refcount, 1);
114435 list_add(&s->list, &slab_caches);
114436 out:
114437 if (err)
114438@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
114439 */
114440 flags &= CACHE_CREATE_MASK;
114441
114442+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114443+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
114444+ flags |= SLAB_NO_SANITIZE;
114445+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
114446+ flags &= ~SLAB_NO_SANITIZE;
114447+#endif
114448+
114449 s = __kmem_cache_alias(name, size, align, flags, ctor);
114450 if (s)
114451 goto out_unlock;
114452@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
114453 rcu_barrier();
114454
114455 list_for_each_entry_safe(s, s2, release, list) {
114456-#ifdef SLAB_SUPPORTS_SYSFS
114457+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
114458 sysfs_slab_remove(s);
114459 #else
114460 slab_kmem_cache_release(s);
114461@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
114462
114463 mutex_lock(&slab_mutex);
114464
114465- s->refcount--;
114466- if (s->refcount)
114467+ if (!atomic_dec_and_test(&s->refcount))
114468 goto out_unlock;
114469
114470 for_each_memcg_cache_safe(c, c2, s) {
114471@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
114472 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
114473 name, size, err);
114474
114475- s->refcount = -1; /* Exempt from merging for now */
114476+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
114477 }
114478
114479 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114480@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114481
114482 create_boot_cache(s, name, size, flags);
114483 list_add(&s->list, &slab_caches);
114484- s->refcount = 1;
114485+ atomic_set(&s->refcount, 1);
114486 return s;
114487 }
114488
114489@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
114490 EXPORT_SYMBOL(kmalloc_dma_caches);
114491 #endif
114492
114493+#ifdef CONFIG_PAX_USERCOPY_SLABS
114494+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
114495+EXPORT_SYMBOL(kmalloc_usercopy_caches);
114496+#endif
114497+
114498 /*
114499 * Conversion table for small slabs sizes / 8 to the index in the
114500 * kmalloc array. This is necessary for slabs < 192 since we have non power
114501@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
114502 return kmalloc_dma_caches[index];
114503
114504 #endif
114505+
114506+#ifdef CONFIG_PAX_USERCOPY_SLABS
114507+ if (unlikely((flags & GFP_USERCOPY)))
114508+ return kmalloc_usercopy_caches[index];
114509+
114510+#endif
114511+
114512 return kmalloc_caches[index];
114513 }
114514
114515@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
114516 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
114517 if (!kmalloc_caches[i]) {
114518 kmalloc_caches[i] = create_kmalloc_cache(NULL,
114519- 1 << i, flags);
114520+ 1 << i, SLAB_USERCOPY | flags);
114521 }
114522
114523 /*
114524@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
114525 * earlier power of two caches
114526 */
114527 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
114528- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
114529+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
114530
114531 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
114532- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
114533+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
114534 }
114535
114536 /* Kmalloc array is now usable */
114537@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
114538 }
114539 }
114540 #endif
114541+
114542+#ifdef CONFIG_PAX_USERCOPY_SLABS
114543+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
114544+ struct kmem_cache *s = kmalloc_caches[i];
114545+
114546+ if (s) {
114547+ int size = kmalloc_size(i);
114548+ char *n = kasprintf(GFP_NOWAIT,
114549+ "usercopy-kmalloc-%d", size);
114550+
114551+ BUG_ON(!n);
114552+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
114553+ size, SLAB_USERCOPY | flags);
114554+ }
114555+ }
114556+#endif
114557+
114558 }
114559 #endif /* !CONFIG_SLOB */
114560
114561@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
114562 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
114563 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
114564 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
114565+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114566+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
114567+#endif
114568 #endif
114569 seq_putc(m, '\n');
114570 }
114571@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
114572 module_init(slab_proc_init);
114573 #endif /* CONFIG_SLABINFO */
114574
114575-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
114576+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
114577 gfp_t flags)
114578 {
114579 void *ret;
114580diff --git a/mm/slob.c b/mm/slob.c
114581index 4765f65..f17284d 100644
114582--- a/mm/slob.c
114583+++ b/mm/slob.c
114584@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
114585 /*
114586 * Return the size of a slob block.
114587 */
114588-static slobidx_t slob_units(slob_t *s)
114589+static slobidx_t slob_units(const slob_t *s)
114590 {
114591 if (s->units > 0)
114592 return s->units;
114593@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
114594 /*
114595 * Return the next free slob block pointer after this one.
114596 */
114597-static slob_t *slob_next(slob_t *s)
114598+static slob_t *slob_next(const slob_t *s)
114599 {
114600 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
114601 slobidx_t next;
114602@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
114603 /*
114604 * Returns true if s is the last free block in its page.
114605 */
114606-static int slob_last(slob_t *s)
114607+static int slob_last(const slob_t *s)
114608 {
114609 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
114610 }
114611
114612-static void *slob_new_pages(gfp_t gfp, int order, int node)
114613+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
114614 {
114615- void *page;
114616+ struct page *page;
114617
114618 #ifdef CONFIG_NUMA
114619 if (node != NUMA_NO_NODE)
114620@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
114621 if (!page)
114622 return NULL;
114623
114624- return page_address(page);
114625+ __SetPageSlab(page);
114626+ return page;
114627 }
114628
114629-static void slob_free_pages(void *b, int order)
114630+static void slob_free_pages(struct page *sp, int order)
114631 {
114632 if (current->reclaim_state)
114633 current->reclaim_state->reclaimed_slab += 1 << order;
114634- free_pages((unsigned long)b, order);
114635+ __ClearPageSlab(sp);
114636+ page_mapcount_reset(sp);
114637+ sp->private = 0;
114638+ __free_pages(sp, order);
114639 }
114640
114641 /*
114642@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114643
114644 /* Not enough space: must allocate a new page */
114645 if (!b) {
114646- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114647- if (!b)
114648+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114649+ if (!sp)
114650 return NULL;
114651- sp = virt_to_page(b);
114652- __SetPageSlab(sp);
114653+ b = page_address(sp);
114654
114655 spin_lock_irqsave(&slob_lock, flags);
114656 sp->units = SLOB_UNITS(PAGE_SIZE);
114657 sp->freelist = b;
114658+ sp->private = 0;
114659 INIT_LIST_HEAD(&sp->lru);
114660 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
114661 set_slob_page_free(sp, slob_list);
114662@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114663 /*
114664 * slob_free: entry point into the slob allocator.
114665 */
114666-static void slob_free(void *block, int size)
114667+static void slob_free(struct kmem_cache *c, void *block, int size)
114668 {
114669 struct page *sp;
114670 slob_t *prev, *next, *b = (slob_t *)block;
114671@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
114672 if (slob_page_free(sp))
114673 clear_slob_page_free(sp);
114674 spin_unlock_irqrestore(&slob_lock, flags);
114675- __ClearPageSlab(sp);
114676- page_mapcount_reset(sp);
114677- slob_free_pages(b, 0);
114678+ slob_free_pages(sp, 0);
114679 return;
114680 }
114681
114682+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114683+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
114684+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
114685+#endif
114686+
114687 if (!slob_page_free(sp)) {
114688 /* This slob page is about to become partially free. Easy! */
114689 sp->units = units;
114690@@ -424,11 +431,10 @@ out:
114691 */
114692
114693 static __always_inline void *
114694-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114695+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
114696 {
114697- unsigned int *m;
114698- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114699- void *ret;
114700+ slob_t *m;
114701+ void *ret = NULL;
114702
114703 gfp &= gfp_allowed_mask;
114704
114705@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114706
114707 if (!m)
114708 return NULL;
114709- *m = size;
114710+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
114711+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
114712+ m[0].units = size;
114713+ m[1].units = align;
114714 ret = (void *)m + align;
114715
114716 trace_kmalloc_node(caller, ret,
114717 size, size + align, gfp, node);
114718 } else {
114719 unsigned int order = get_order(size);
114720+ struct page *page;
114721
114722 if (likely(order))
114723 gfp |= __GFP_COMP;
114724- ret = slob_new_pages(gfp, order, node);
114725+ page = slob_new_pages(gfp, order, node);
114726+ if (page) {
114727+ ret = page_address(page);
114728+ page->private = size;
114729+ }
114730
114731 trace_kmalloc_node(caller, ret,
114732 size, PAGE_SIZE << order, gfp, node);
114733 }
114734
114735- kmemleak_alloc(ret, size, 1, gfp);
114736 return ret;
114737 }
114738
114739-void *__kmalloc(size_t size, gfp_t gfp)
114740+static __always_inline void *
114741+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114742+{
114743+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114744+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
114745+
114746+ if (!ZERO_OR_NULL_PTR(ret))
114747+ kmemleak_alloc(ret, size, 1, gfp);
114748+ return ret;
114749+}
114750+
114751+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
114752 {
114753 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
114754 }
114755@@ -491,34 +515,123 @@ void kfree(const void *block)
114756 return;
114757 kmemleak_free(block);
114758
114759+ VM_BUG_ON(!virt_addr_valid(block));
114760 sp = virt_to_page(block);
114761- if (PageSlab(sp)) {
114762+ VM_BUG_ON(!PageSlab(sp));
114763+ if (!sp->private) {
114764 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114765- unsigned int *m = (unsigned int *)(block - align);
114766- slob_free(m, *m + align);
114767- } else
114768+ slob_t *m = (slob_t *)(block - align);
114769+ slob_free(NULL, m, m[0].units + align);
114770+ } else {
114771+ __ClearPageSlab(sp);
114772+ page_mapcount_reset(sp);
114773+ sp->private = 0;
114774 __free_pages(sp, compound_order(sp));
114775+ }
114776 }
114777 EXPORT_SYMBOL(kfree);
114778
114779+bool is_usercopy_object(const void *ptr)
114780+{
114781+ if (!slab_is_available())
114782+ return false;
114783+
114784+ if (is_vmalloc_addr(ptr)
114785+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
114786+ && !object_starts_on_stack(ptr)
114787+#endif
114788+ ) {
114789+ struct vm_struct *vm = find_vm_area(ptr);
114790+ if (vm && (vm->flags & VM_USERCOPY))
114791+ return true;
114792+ return false;
114793+ }
114794+
114795+ // PAX: TODO
114796+
114797+ return false;
114798+}
114799+
114800+#ifdef CONFIG_PAX_USERCOPY
114801+const char *check_heap_object(const void *ptr, unsigned long n)
114802+{
114803+ struct page *page;
114804+ const slob_t *free;
114805+ const void *base;
114806+ unsigned long flags;
114807+
114808+ if (ZERO_OR_NULL_PTR(ptr))
114809+ return "<null>";
114810+
114811+ if (!virt_addr_valid(ptr))
114812+ return NULL;
114813+
114814+ page = virt_to_head_page(ptr);
114815+ if (!PageSlab(page))
114816+ return NULL;
114817+
114818+ if (page->private) {
114819+ base = page;
114820+ if (base <= ptr && n <= page->private - (ptr - base))
114821+ return NULL;
114822+ return "<slob>";
114823+ }
114824+
114825+ /* some tricky double walking to find the chunk */
114826+ spin_lock_irqsave(&slob_lock, flags);
114827+ base = (void *)((unsigned long)ptr & PAGE_MASK);
114828+ free = page->freelist;
114829+
114830+ while (!slob_last(free) && (void *)free <= ptr) {
114831+ base = free + slob_units(free);
114832+ free = slob_next(free);
114833+ }
114834+
114835+ while (base < (void *)free) {
114836+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
114837+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
114838+ int offset;
114839+
114840+ if (ptr < base + align)
114841+ break;
114842+
114843+ offset = ptr - base - align;
114844+ if (offset >= m) {
114845+ base += size;
114846+ continue;
114847+ }
114848+
114849+ if (n > m - offset)
114850+ break;
114851+
114852+ spin_unlock_irqrestore(&slob_lock, flags);
114853+ return NULL;
114854+ }
114855+
114856+ spin_unlock_irqrestore(&slob_lock, flags);
114857+ return "<slob>";
114858+}
114859+#endif
114860+
114861 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
114862 size_t ksize(const void *block)
114863 {
114864 struct page *sp;
114865 int align;
114866- unsigned int *m;
114867+ slob_t *m;
114868
114869 BUG_ON(!block);
114870 if (unlikely(block == ZERO_SIZE_PTR))
114871 return 0;
114872
114873 sp = virt_to_page(block);
114874- if (unlikely(!PageSlab(sp)))
114875- return PAGE_SIZE << compound_order(sp);
114876+ VM_BUG_ON(!PageSlab(sp));
114877+ if (sp->private)
114878+ return sp->private;
114879
114880 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114881- m = (unsigned int *)(block - align);
114882- return SLOB_UNITS(*m) * SLOB_UNIT;
114883+ m = (slob_t *)(block - align);
114884+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
114885 }
114886 EXPORT_SYMBOL(ksize);
114887
114888@@ -534,23 +647,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
114889
114890 static void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
114891 {
114892- void *b;
114893+ void *b = NULL;
114894
114895 flags &= gfp_allowed_mask;
114896
114897 lockdep_trace_alloc(flags);
114898
114899+#ifdef CONFIG_PAX_USERCOPY_SLABS
114900+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
114901+#else
114902 if (c->size < PAGE_SIZE) {
114903 b = slob_alloc(c->size, flags, c->align, node);
114904 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
114905 SLOB_UNITS(c->size) * SLOB_UNIT,
114906 flags, node);
114907 } else {
114908- b = slob_new_pages(flags, get_order(c->size), node);
114909+ struct page *sp;
114910+
114911+ sp = slob_new_pages(flags, get_order(c->size), node);
114912+ if (sp) {
114913+ b = page_address(sp);
114914+ sp->private = c->size;
114915+ }
114916 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
114917 PAGE_SIZE << get_order(c->size),
114918 flags, node);
114919 }
114920+#endif
114921
114922 if (b && c->ctor)
114923 c->ctor(b);
114924@@ -566,7 +689,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
114925 EXPORT_SYMBOL(kmem_cache_alloc);
114926
114927 #ifdef CONFIG_NUMA
114928-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
114929+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
114930 {
114931 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
114932 }
114933@@ -579,12 +702,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
114934 EXPORT_SYMBOL(kmem_cache_alloc_node);
114935 #endif
114936
114937-static void __kmem_cache_free(void *b, int size)
114938+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
114939 {
114940- if (size < PAGE_SIZE)
114941- slob_free(b, size);
114942+ struct page *sp;
114943+
114944+ sp = virt_to_page(b);
114945+ BUG_ON(!PageSlab(sp));
114946+ if (!sp->private)
114947+ slob_free(c, b, size);
114948 else
114949- slob_free_pages(b, get_order(size));
114950+ slob_free_pages(sp, get_order(size));
114951 }
114952
114953 static void kmem_rcu_free(struct rcu_head *head)
114954@@ -592,22 +719,36 @@ static void kmem_rcu_free(struct rcu_head *head)
114955 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
114956 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
114957
114958- __kmem_cache_free(b, slob_rcu->size);
114959+ __kmem_cache_free(NULL, b, slob_rcu->size);
114960 }
114961
114962 void kmem_cache_free(struct kmem_cache *c, void *b)
114963 {
114964+ int size = c->size;
114965+
114966+#ifdef CONFIG_PAX_USERCOPY_SLABS
114967+ if (size + c->align < PAGE_SIZE) {
114968+ size += c->align;
114969+ b -= c->align;
114970+ }
114971+#endif
114972+
114973 kmemleak_free_recursive(b, c->flags);
114974 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
114975 struct slob_rcu *slob_rcu;
114976- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
114977- slob_rcu->size = c->size;
114978+ slob_rcu = b + (size - sizeof(struct slob_rcu));
114979+ slob_rcu->size = size;
114980 call_rcu(&slob_rcu->head, kmem_rcu_free);
114981 } else {
114982- __kmem_cache_free(b, c->size);
114983+ __kmem_cache_free(c, b, size);
114984 }
114985
114986+#ifdef CONFIG_PAX_USERCOPY_SLABS
114987+ trace_kfree(_RET_IP_, b);
114988+#else
114989 trace_kmem_cache_free(_RET_IP_, b);
114990+#endif
114991+
114992 }
114993 EXPORT_SYMBOL(kmem_cache_free);
114994
114995diff --git a/mm/slub.c b/mm/slub.c
114996index 54c0876..9fb1661 100644
114997--- a/mm/slub.c
114998+++ b/mm/slub.c
114999@@ -198,7 +198,7 @@ struct track {
115000
115001 enum track_item { TRACK_ALLOC, TRACK_FREE };
115002
115003-#ifdef CONFIG_SYSFS
115004+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115005 static int sysfs_slab_add(struct kmem_cache *);
115006 static int sysfs_slab_alias(struct kmem_cache *, const char *);
115007 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
115008@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
115009 if (!t->addr)
115010 return;
115011
115012- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
115013+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
115014 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
115015 #ifdef CONFIG_STACKTRACE
115016 {
115017@@ -2707,6 +2707,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
115018
115019 slab_free_hook(s, x);
115020
115021+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115022+ if (!(s->flags & SLAB_NO_SANITIZE)) {
115023+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
115024+ if (s->ctor)
115025+ s->ctor(x);
115026+ }
115027+#endif
115028+
115029 redo:
115030 /*
115031 * Determine the currently cpus per cpu slab.
115032@@ -3048,6 +3056,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
115033 s->inuse = size;
115034
115035 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
115036+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115037+ (!(flags & SLAB_NO_SANITIZE)) ||
115038+#endif
115039 s->ctor)) {
115040 /*
115041 * Relocate free pointer after the object if it is not
115042@@ -3302,7 +3313,7 @@ static int __init setup_slub_min_objects(char *str)
115043
115044 __setup("slub_min_objects=", setup_slub_min_objects);
115045
115046-void *__kmalloc(size_t size, gfp_t flags)
115047+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
115048 {
115049 struct kmem_cache *s;
115050 void *ret;
115051@@ -3340,7 +3351,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
115052 return ptr;
115053 }
115054
115055-void *__kmalloc_node(size_t size, gfp_t flags, int node)
115056+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
115057 {
115058 struct kmem_cache *s;
115059 void *ret;
115060@@ -3388,6 +3399,70 @@ static size_t __ksize(const void *object)
115061 return slab_ksize(page->slab_cache);
115062 }
115063
115064+bool is_usercopy_object(const void *ptr)
115065+{
115066+ struct page *page;
115067+ struct kmem_cache *s;
115068+
115069+ if (ZERO_OR_NULL_PTR(ptr))
115070+ return false;
115071+
115072+ if (!slab_is_available())
115073+ return false;
115074+
115075+ if (is_vmalloc_addr(ptr)
115076+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115077+ && !object_starts_on_stack(ptr)
115078+#endif
115079+ ) {
115080+ struct vm_struct *vm = find_vm_area(ptr);
115081+ if (vm && (vm->flags & VM_USERCOPY))
115082+ return true;
115083+ return false;
115084+ }
115085+
115086+ if (!virt_addr_valid(ptr))
115087+ return false;
115088+
115089+ page = virt_to_head_page(ptr);
115090+
115091+ if (!PageSlab(page))
115092+ return false;
115093+
115094+ s = page->slab_cache;
115095+ return s->flags & SLAB_USERCOPY;
115096+}
115097+
115098+#ifdef CONFIG_PAX_USERCOPY
115099+const char *check_heap_object(const void *ptr, unsigned long n)
115100+{
115101+ struct page *page;
115102+ struct kmem_cache *s;
115103+ unsigned long offset;
115104+
115105+ if (ZERO_OR_NULL_PTR(ptr))
115106+ return "<null>";
115107+
115108+ if (!virt_addr_valid(ptr))
115109+ return NULL;
115110+
115111+ page = virt_to_head_page(ptr);
115112+
115113+ if (!PageSlab(page))
115114+ return NULL;
115115+
115116+ s = page->slab_cache;
115117+ if (!(s->flags & SLAB_USERCOPY))
115118+ return s->name;
115119+
115120+ offset = (ptr - page_address(page)) % s->size;
115121+ if (offset <= s->object_size && n <= s->object_size - offset)
115122+ return NULL;
115123+
115124+ return s->name;
115125+}
115126+#endif
115127+
115128 size_t ksize(const void *object)
115129 {
115130 size_t size = __ksize(object);
115131@@ -3408,6 +3483,7 @@ void kfree(const void *x)
115132 if (unlikely(ZERO_OR_NULL_PTR(x)))
115133 return;
115134
115135+ VM_BUG_ON(!virt_addr_valid(x));
115136 page = virt_to_head_page(x);
115137 if (unlikely(!PageSlab(page))) {
115138 BUG_ON(!PageCompound(page));
115139@@ -3724,7 +3800,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115140
115141 s = find_mergeable(size, align, flags, name, ctor);
115142 if (s) {
115143- s->refcount++;
115144+ atomic_inc(&s->refcount);
115145
115146 /*
115147 * Adjust the object sizes so that we clear
115148@@ -3740,7 +3816,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115149 }
115150
115151 if (sysfs_slab_alias(s, name)) {
115152- s->refcount--;
115153+ atomic_dec(&s->refcount);
115154 s = NULL;
115155 }
115156 }
115157@@ -3857,7 +3933,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
115158 }
115159 #endif
115160
115161-#ifdef CONFIG_SYSFS
115162+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115163 static int count_inuse(struct page *page)
115164 {
115165 return page->inuse;
115166@@ -4138,7 +4214,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
115167 len += sprintf(buf + len, "%7ld ", l->count);
115168
115169 if (l->addr)
115170+#ifdef CONFIG_GRKERNSEC_HIDESYM
115171+ len += sprintf(buf + len, "%pS", NULL);
115172+#else
115173 len += sprintf(buf + len, "%pS", (void *)l->addr);
115174+#endif
115175 else
115176 len += sprintf(buf + len, "<not-available>");
115177
115178@@ -4236,12 +4316,12 @@ static void __init resiliency_test(void)
115179 validate_slab_cache(kmalloc_caches[9]);
115180 }
115181 #else
115182-#ifdef CONFIG_SYSFS
115183+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115184 static void resiliency_test(void) {};
115185 #endif
115186 #endif
115187
115188-#ifdef CONFIG_SYSFS
115189+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115190 enum slab_stat_type {
115191 SL_ALL, /* All slabs */
115192 SL_PARTIAL, /* Only partially allocated slabs */
115193@@ -4478,13 +4558,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
115194 {
115195 if (!s->ctor)
115196 return 0;
115197+#ifdef CONFIG_GRKERNSEC_HIDESYM
115198+ return sprintf(buf, "%pS\n", NULL);
115199+#else
115200 return sprintf(buf, "%pS\n", s->ctor);
115201+#endif
115202 }
115203 SLAB_ATTR_RO(ctor);
115204
115205 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
115206 {
115207- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
115208+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
115209 }
115210 SLAB_ATTR_RO(aliases);
115211
115212@@ -4572,6 +4656,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
115213 SLAB_ATTR_RO(cache_dma);
115214 #endif
115215
115216+#ifdef CONFIG_PAX_USERCOPY_SLABS
115217+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
115218+{
115219+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
115220+}
115221+SLAB_ATTR_RO(usercopy);
115222+#endif
115223+
115224+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115225+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
115226+{
115227+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
115228+}
115229+SLAB_ATTR_RO(sanitize);
115230+#endif
115231+
115232 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
115233 {
115234 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
115235@@ -4627,7 +4727,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
115236 * as well as cause other issues like converting a mergeable
115237 * cache into an umergeable one.
115238 */
115239- if (s->refcount > 1)
115240+ if (atomic_read(&s->refcount) > 1)
115241 return -EINVAL;
115242
115243 s->flags &= ~SLAB_TRACE;
115244@@ -4747,7 +4847,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
115245 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
115246 size_t length)
115247 {
115248- if (s->refcount > 1)
115249+ if (atomic_read(&s->refcount) > 1)
115250 return -EINVAL;
115251
115252 s->flags &= ~SLAB_FAILSLAB;
115253@@ -4914,6 +5014,12 @@ static struct attribute *slab_attrs[] = {
115254 #ifdef CONFIG_ZONE_DMA
115255 &cache_dma_attr.attr,
115256 #endif
115257+#ifdef CONFIG_PAX_USERCOPY_SLABS
115258+ &usercopy_attr.attr,
115259+#endif
115260+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115261+ &sanitize_attr.attr,
115262+#endif
115263 #ifdef CONFIG_NUMA
115264 &remote_node_defrag_ratio_attr.attr,
115265 #endif
115266@@ -5155,6 +5261,7 @@ static char *create_unique_id(struct kmem_cache *s)
115267 return name;
115268 }
115269
115270+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115271 static int sysfs_slab_add(struct kmem_cache *s)
115272 {
115273 int err;
115274@@ -5228,6 +5335,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
115275 kobject_del(&s->kobj);
115276 kobject_put(&s->kobj);
115277 }
115278+#endif
115279
115280 /*
115281 * Need to buffer aliases during bootup until sysfs becomes
115282@@ -5241,6 +5349,7 @@ struct saved_alias {
115283
115284 static struct saved_alias *alias_list;
115285
115286+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115287 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115288 {
115289 struct saved_alias *al;
115290@@ -5263,6 +5372,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115291 alias_list = al;
115292 return 0;
115293 }
115294+#endif
115295
115296 static int __init slab_sysfs_init(void)
115297 {
115298diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
115299index 4cba9c2..b4f9fcc 100644
115300--- a/mm/sparse-vmemmap.c
115301+++ b/mm/sparse-vmemmap.c
115302@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
115303 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115304 if (!p)
115305 return NULL;
115306- pud_populate(&init_mm, pud, p);
115307+ pud_populate_kernel(&init_mm, pud, p);
115308 }
115309 return pud;
115310 }
115311@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
115312 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115313 if (!p)
115314 return NULL;
115315- pgd_populate(&init_mm, pgd, p);
115316+ pgd_populate_kernel(&init_mm, pgd, p);
115317 }
115318 return pgd;
115319 }
115320diff --git a/mm/sparse.c b/mm/sparse.c
115321index d1b48b6..6e8590e 100644
115322--- a/mm/sparse.c
115323+++ b/mm/sparse.c
115324@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
115325
115326 for (i = 0; i < PAGES_PER_SECTION; i++) {
115327 if (PageHWPoison(&memmap[i])) {
115328- atomic_long_sub(1, &num_poisoned_pages);
115329+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
115330 ClearPageHWPoison(&memmap[i]);
115331 }
115332 }
115333diff --git a/mm/swap.c b/mm/swap.c
115334index a7251a8..ac754a9 100644
115335--- a/mm/swap.c
115336+++ b/mm/swap.c
115337@@ -85,6 +85,8 @@ static void __put_compound_page(struct page *page)
115338 if (!PageHuge(page))
115339 __page_cache_release(page);
115340 dtor = get_compound_page_dtor(page);
115341+ if (!PageHuge(page))
115342+ BUG_ON(dtor != free_compound_page);
115343 (*dtor)(page);
115344 }
115345
115346diff --git a/mm/swapfile.c b/mm/swapfile.c
115347index a7e7210..b286e7d 100644
115348--- a/mm/swapfile.c
115349+++ b/mm/swapfile.c
115350@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
115351
115352 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
115353 /* Activity counter to indicate that a swapon or swapoff has occurred */
115354-static atomic_t proc_poll_event = ATOMIC_INIT(0);
115355+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
115356
115357 static inline unsigned char swap_count(unsigned char ent)
115358 {
115359@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
115360 spin_unlock(&swap_lock);
115361
115362 err = 0;
115363- atomic_inc(&proc_poll_event);
115364+ atomic_inc_unchecked(&proc_poll_event);
115365 wake_up_interruptible(&proc_poll_wait);
115366
115367 out_dput:
115368@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
115369
115370 poll_wait(file, &proc_poll_wait, wait);
115371
115372- if (seq->poll_event != atomic_read(&proc_poll_event)) {
115373- seq->poll_event = atomic_read(&proc_poll_event);
115374+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
115375+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115376 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
115377 }
115378
115379@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
115380 return ret;
115381
115382 seq = file->private_data;
115383- seq->poll_event = atomic_read(&proc_poll_event);
115384+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115385 return 0;
115386 }
115387
115388@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
115389 (frontswap_map) ? "FS" : "");
115390
115391 mutex_unlock(&swapon_mutex);
115392- atomic_inc(&proc_poll_event);
115393+ atomic_inc_unchecked(&proc_poll_event);
115394 wake_up_interruptible(&proc_poll_wait);
115395
115396 if (S_ISREG(inode->i_mode))
115397diff --git a/mm/util.c b/mm/util.c
115398index 68ff8a5..40c7a70 100644
115399--- a/mm/util.c
115400+++ b/mm/util.c
115401@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
115402 void arch_pick_mmap_layout(struct mm_struct *mm)
115403 {
115404 mm->mmap_base = TASK_UNMAPPED_BASE;
115405+
115406+#ifdef CONFIG_PAX_RANDMMAP
115407+ if (mm->pax_flags & MF_PAX_RANDMMAP)
115408+ mm->mmap_base += mm->delta_mmap;
115409+#endif
115410+
115411 mm->get_unmapped_area = arch_get_unmapped_area;
115412 }
115413 #endif
115414@@ -434,6 +440,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
115415 if (!mm->arg_end)
115416 goto out_mm; /* Shh! No looking before we're done */
115417
115418+ if (gr_acl_handle_procpidmem(task))
115419+ goto out_mm;
115420+
115421 len = mm->arg_end - mm->arg_start;
115422
115423 if (len > buflen)
115424diff --git a/mm/vmalloc.c b/mm/vmalloc.c
115425index 2faaa29..37314a8 100644
115426--- a/mm/vmalloc.c
115427+++ b/mm/vmalloc.c
115428@@ -40,20 +40,65 @@ struct vfree_deferred {
115429 struct work_struct wq;
115430 };
115431 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
115432+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
115433+
115434+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115435+struct stack_deferred_llist {
115436+ struct llist_head list;
115437+ void *stack;
115438+ void *lowmem_stack;
115439+};
115440+
115441+struct stack_deferred {
115442+ struct stack_deferred_llist list;
115443+ struct work_struct wq;
115444+};
115445+
115446+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
115447+#endif
115448
115449 static void __vunmap(const void *, int);
115450
115451-static void free_work(struct work_struct *w)
115452+static void vfree_work(struct work_struct *w)
115453 {
115454 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115455 struct llist_node *llnode = llist_del_all(&p->list);
115456 while (llnode) {
115457- void *p = llnode;
115458+ void *x = llnode;
115459 llnode = llist_next(llnode);
115460- __vunmap(p, 1);
115461+ __vunmap(x, 1);
115462 }
115463 }
115464
115465+static void vunmap_work(struct work_struct *w)
115466+{
115467+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115468+ struct llist_node *llnode = llist_del_all(&p->list);
115469+ while (llnode) {
115470+ void *x = llnode;
115471+ llnode = llist_next(llnode);
115472+ __vunmap(x, 0);
115473+ }
115474+}
115475+
115476+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115477+static void unmap_work(struct work_struct *w)
115478+{
115479+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
115480+ struct llist_node *llnode = llist_del_all(&p->list.list);
115481+ while (llnode) {
115482+ struct stack_deferred_llist *x =
115483+ llist_entry((struct llist_head *)llnode,
115484+ struct stack_deferred_llist, list);
115485+ void *stack = ACCESS_ONCE(x->stack);
115486+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
115487+ llnode = llist_next(llnode);
115488+ __vunmap(stack, 0);
115489+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
115490+ }
115491+}
115492+#endif
115493+
115494 /*** Page table manipulation functions ***/
115495
115496 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115497@@ -62,8 +107,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115498
115499 pte = pte_offset_kernel(pmd, addr);
115500 do {
115501- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115502- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115503+
115504+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115505+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
115506+ BUG_ON(!pte_exec(*pte));
115507+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
115508+ continue;
115509+ }
115510+#endif
115511+
115512+ {
115513+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115514+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115515+ }
115516 } while (pte++, addr += PAGE_SIZE, addr != end);
115517 }
115518
115519@@ -127,16 +183,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
115520 pte = pte_alloc_kernel(pmd, addr);
115521 if (!pte)
115522 return -ENOMEM;
115523+
115524+ pax_open_kernel();
115525 do {
115526 struct page *page = pages[*nr];
115527
115528- if (WARN_ON(!pte_none(*pte)))
115529+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115530+ if (pgprot_val(prot) & _PAGE_NX)
115531+#endif
115532+
115533+ if (!pte_none(*pte)) {
115534+ pax_close_kernel();
115535+ WARN_ON(1);
115536 return -EBUSY;
115537- if (WARN_ON(!page))
115538+ }
115539+ if (!page) {
115540+ pax_close_kernel();
115541+ WARN_ON(1);
115542 return -ENOMEM;
115543+ }
115544 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
115545 (*nr)++;
115546 } while (pte++, addr += PAGE_SIZE, addr != end);
115547+ pax_close_kernel();
115548 return 0;
115549 }
115550
115551@@ -146,7 +215,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
115552 pmd_t *pmd;
115553 unsigned long next;
115554
115555- pmd = pmd_alloc(&init_mm, pud, addr);
115556+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
115557 if (!pmd)
115558 return -ENOMEM;
115559 do {
115560@@ -163,7 +232,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
115561 pud_t *pud;
115562 unsigned long next;
115563
115564- pud = pud_alloc(&init_mm, pgd, addr);
115565+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
115566 if (!pud)
115567 return -ENOMEM;
115568 do {
115569@@ -223,6 +292,12 @@ int is_vmalloc_or_module_addr(const void *x)
115570 if (addr >= MODULES_VADDR && addr < MODULES_END)
115571 return 1;
115572 #endif
115573+
115574+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115575+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
115576+ return 1;
115577+#endif
115578+
115579 return is_vmalloc_addr(x);
115580 }
115581
115582@@ -243,8 +318,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
115583
115584 if (!pgd_none(*pgd)) {
115585 pud_t *pud = pud_offset(pgd, addr);
115586+#ifdef CONFIG_X86
115587+ if (!pud_large(*pud))
115588+#endif
115589 if (!pud_none(*pud)) {
115590 pmd_t *pmd = pmd_offset(pud, addr);
115591+#ifdef CONFIG_X86
115592+ if (!pmd_large(*pmd))
115593+#endif
115594 if (!pmd_none(*pmd)) {
115595 pte_t *ptep, pte;
115596
115597@@ -346,7 +427,7 @@ static void purge_vmap_area_lazy(void);
115598 * Allocate a region of KVA of the specified size and alignment, within the
115599 * vstart and vend.
115600 */
115601-static struct vmap_area *alloc_vmap_area(unsigned long size,
115602+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
115603 unsigned long align,
115604 unsigned long vstart, unsigned long vend,
115605 int node, gfp_t gfp_mask)
115606@@ -1202,13 +1283,27 @@ void __init vmalloc_init(void)
115607 for_each_possible_cpu(i) {
115608 struct vmap_block_queue *vbq;
115609 struct vfree_deferred *p;
115610+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115611+ struct stack_deferred *p2;
115612+#endif
115613
115614 vbq = &per_cpu(vmap_block_queue, i);
115615 spin_lock_init(&vbq->lock);
115616 INIT_LIST_HEAD(&vbq->free);
115617+
115618 p = &per_cpu(vfree_deferred, i);
115619 init_llist_head(&p->list);
115620- INIT_WORK(&p->wq, free_work);
115621+ INIT_WORK(&p->wq, vfree_work);
115622+
115623+ p = &per_cpu(vunmap_deferred, i);
115624+ init_llist_head(&p->list);
115625+ INIT_WORK(&p->wq, vunmap_work);
115626+
115627+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115628+ p2 = &per_cpu(stack_deferred, i);
115629+ init_llist_head(&p2->list.list);
115630+ INIT_WORK(&p2->wq, unmap_work);
115631+#endif
115632 }
115633
115634 /* Import existing vmlist entries. */
115635@@ -1333,6 +1428,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
115636 struct vm_struct *area;
115637
115638 BUG_ON(in_interrupt());
115639+
115640+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115641+ if (flags & VM_KERNEXEC) {
115642+ if (start != VMALLOC_START || end != VMALLOC_END)
115643+ return NULL;
115644+ start = (unsigned long)MODULES_EXEC_VADDR;
115645+ end = (unsigned long)MODULES_EXEC_END;
115646+ }
115647+#endif
115648+
115649 if (flags & VM_IOREMAP)
115650 align = 1ul << clamp_t(int, fls_long(size),
115651 PAGE_SHIFT, IOREMAP_MAX_ORDER);
115652@@ -1531,13 +1636,36 @@ EXPORT_SYMBOL(vfree);
115653 */
115654 void vunmap(const void *addr)
115655 {
115656- BUG_ON(in_interrupt());
115657- might_sleep();
115658- if (addr)
115659+ if (!addr)
115660+ return;
115661+ if (unlikely(in_interrupt())) {
115662+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
115663+ if (llist_add((struct llist_node *)addr, &p->list))
115664+ schedule_work(&p->wq);
115665+ } else {
115666+ might_sleep();
115667 __vunmap(addr, 0);
115668+ }
115669 }
115670 EXPORT_SYMBOL(vunmap);
115671
115672+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115673+void unmap_process_stacks(struct task_struct *task)
115674+{
115675+ if (unlikely(in_interrupt())) {
115676+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
115677+ struct stack_deferred_llist *list = task->stack;
115678+ list->stack = task->stack;
115679+ list->lowmem_stack = task->lowmem_stack;
115680+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
115681+ schedule_work(&p->wq);
115682+ } else {
115683+ __vunmap(task->stack, 0);
115684+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
115685+ }
115686+}
115687+#endif
115688+
115689 /**
115690 * vmap - map an array of pages into virtually contiguous space
115691 * @pages: array of page pointers
115692@@ -1558,6 +1686,11 @@ void *vmap(struct page **pages, unsigned int count,
115693 if (count > totalram_pages)
115694 return NULL;
115695
115696+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115697+ if (!(pgprot_val(prot) & _PAGE_NX))
115698+ flags |= VM_KERNEXEC;
115699+#endif
115700+
115701 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
115702 __builtin_return_address(0));
115703 if (!area)
115704@@ -1662,6 +1795,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
115705 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
115706 goto fail;
115707
115708+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115709+ if (!(pgprot_val(prot) & _PAGE_NX)) {
115710+ vm_flags |= VM_KERNEXEC;
115711+ start = VMALLOC_START;
115712+ end = VMALLOC_END;
115713+ }
115714+#endif
115715+
115716 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
115717 vm_flags, start, end, node, gfp_mask, caller);
115718 if (!area)
115719@@ -1715,6 +1856,14 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
115720 gfp_mask, prot, 0, node, caller);
115721 }
115722
115723+void *vmalloc_usercopy(unsigned long size)
115724+{
115725+ return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END,
115726+ GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
115727+ VM_USERCOPY, NUMA_NO_NODE,
115728+ __builtin_return_address(0));
115729+}
115730+
115731 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
115732 {
115733 return __vmalloc_node(size, 1, gfp_mask, prot, NUMA_NO_NODE,
115734@@ -1838,10 +1987,9 @@ EXPORT_SYMBOL(vzalloc_node);
115735 * For tight control over page level allocator and protection flags
115736 * use __vmalloc() instead.
115737 */
115738-
115739 void *vmalloc_exec(unsigned long size)
115740 {
115741- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
115742+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
115743 NUMA_NO_NODE, __builtin_return_address(0));
115744 }
115745
115746@@ -2148,6 +2296,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
115747 {
115748 struct vm_struct *area;
115749
115750+ BUG_ON(vma->vm_mirror);
115751+
115752 size = PAGE_ALIGN(size);
115753
115754 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
115755@@ -2630,7 +2780,11 @@ static int s_show(struct seq_file *m, void *p)
115756 v->addr, v->addr + v->size, v->size);
115757
115758 if (v->caller)
115759+#ifdef CONFIG_GRKERNSEC_HIDESYM
115760+ seq_printf(m, " %pK", v->caller);
115761+#else
115762 seq_printf(m, " %pS", v->caller);
115763+#endif
115764
115765 if (v->nr_pages)
115766 seq_printf(m, " pages=%d", v->nr_pages);
115767diff --git a/mm/vmstat.c b/mm/vmstat.c
115768index 4f5cd97..9fb715a 100644
115769--- a/mm/vmstat.c
115770+++ b/mm/vmstat.c
115771@@ -27,6 +27,7 @@
115772 #include <linux/mm_inline.h>
115773 #include <linux/page_ext.h>
115774 #include <linux/page_owner.h>
115775+#include <linux/grsecurity.h>
115776
115777 #include "internal.h"
115778
115779@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
115780 *
115781 * vm_stat contains the global counters
115782 */
115783-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
115784+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
115785 EXPORT_SYMBOL(vm_stat);
115786
115787 #ifdef CONFIG_SMP
115788@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
115789
115790 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
115791 if (diff[i]) {
115792- atomic_long_add(diff[i], &vm_stat[i]);
115793+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
115794 changes++;
115795 }
115796 return changes;
115797@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
115798 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
115799 if (v) {
115800
115801- atomic_long_add(v, &zone->vm_stat[i]);
115802+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
115803 global_diff[i] += v;
115804 #ifdef CONFIG_NUMA
115805 /* 3 seconds idle till flush */
115806@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
115807
115808 v = p->vm_stat_diff[i];
115809 p->vm_stat_diff[i] = 0;
115810- atomic_long_add(v, &zone->vm_stat[i]);
115811+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
115812 global_diff[i] += v;
115813 }
115814 }
115815@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
115816 if (pset->vm_stat_diff[i]) {
115817 int v = pset->vm_stat_diff[i];
115818 pset->vm_stat_diff[i] = 0;
115819- atomic_long_add(v, &zone->vm_stat[i]);
115820- atomic_long_add(v, &vm_stat[i]);
115821+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
115822+ atomic_long_add_unchecked(v, &vm_stat[i]);
115823 }
115824 }
115825 #endif
115826@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
115827 stat_items_size += sizeof(struct vm_event_state);
115828 #endif
115829
115830- v = kmalloc(stat_items_size, GFP_KERNEL);
115831+ v = kzalloc(stat_items_size, GFP_KERNEL);
115832 m->private = v;
115833 if (!v)
115834 return ERR_PTR(-ENOMEM);
115835+
115836+#ifdef CONFIG_GRKERNSEC_PROC_ADD
115837+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
115838+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
115839+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
115840+ && !in_group_p(grsec_proc_gid)
115841+#endif
115842+ )
115843+ return (unsigned long *)m->private + *pos;
115844+#endif
115845+#endif
115846+
115847 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
115848 v[i] = global_page_state(i);
115849 v += NR_VM_ZONE_STAT_ITEMS;
115850@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
115851 cpu_notifier_register_done();
115852 #endif
115853 #ifdef CONFIG_PROC_FS
115854- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
115855- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
115856- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
115857- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
115858+ {
115859+ mode_t gr_mode = S_IRUGO;
115860+#ifdef CONFIG_GRKERNSEC_PROC_ADD
115861+ gr_mode = S_IRUSR;
115862+#endif
115863+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
115864+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
115865+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
115866+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
115867+ }
115868 #endif
115869 return 0;
115870 }
115871diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
115872index 59555f0..fd7ade9 100644
115873--- a/net/8021q/vlan.c
115874+++ b/net/8021q/vlan.c
115875@@ -491,7 +491,7 @@ out:
115876 return NOTIFY_DONE;
115877 }
115878
115879-static struct notifier_block vlan_notifier_block __read_mostly = {
115880+static struct notifier_block vlan_notifier_block = {
115881 .notifier_call = vlan_device_event,
115882 };
115883
115884@@ -566,8 +566,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
115885 err = -EPERM;
115886 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
115887 break;
115888- if ((args.u.name_type >= 0) &&
115889- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
115890+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
115891 struct vlan_net *vn;
115892
115893 vn = net_generic(net, vlan_net_id);
115894diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
115895index c92b52f..006c052 100644
115896--- a/net/8021q/vlan_netlink.c
115897+++ b/net/8021q/vlan_netlink.c
115898@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
115899 return dev_net(real_dev);
115900 }
115901
115902-struct rtnl_link_ops vlan_link_ops __read_mostly = {
115903+struct rtnl_link_ops vlan_link_ops = {
115904 .kind = "vlan",
115905 .maxtype = IFLA_VLAN_MAX,
115906 .policy = vlan_policy,
115907diff --git a/net/9p/mod.c b/net/9p/mod.c
115908index 6ab36ae..6f1841b 100644
115909--- a/net/9p/mod.c
115910+++ b/net/9p/mod.c
115911@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
115912 void v9fs_register_trans(struct p9_trans_module *m)
115913 {
115914 spin_lock(&v9fs_trans_lock);
115915- list_add_tail(&m->list, &v9fs_trans_list);
115916+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
115917 spin_unlock(&v9fs_trans_lock);
115918 }
115919 EXPORT_SYMBOL(v9fs_register_trans);
115920@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
115921 void v9fs_unregister_trans(struct p9_trans_module *m)
115922 {
115923 spin_lock(&v9fs_trans_lock);
115924- list_del_init(&m->list);
115925+ pax_list_del_init((struct list_head *)&m->list);
115926 spin_unlock(&v9fs_trans_lock);
115927 }
115928 EXPORT_SYMBOL(v9fs_unregister_trans);
115929diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
115930index bced8c0..ef253b7 100644
115931--- a/net/9p/trans_fd.c
115932+++ b/net/9p/trans_fd.c
115933@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
115934 oldfs = get_fs();
115935 set_fs(get_ds());
115936 /* The cast to a user pointer is valid due to the set_fs() */
115937- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
115938+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
115939 set_fs(oldfs);
115940
115941 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
115942diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
115943index af46bc4..f9adfcd 100644
115944--- a/net/appletalk/atalk_proc.c
115945+++ b/net/appletalk/atalk_proc.c
115946@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
115947 struct proc_dir_entry *p;
115948 int rc = -ENOMEM;
115949
115950- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
115951+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
115952 if (!atalk_proc_dir)
115953 goto out;
115954
115955diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
115956index 876fbe8..8bbea9f 100644
115957--- a/net/atm/atm_misc.c
115958+++ b/net/atm/atm_misc.c
115959@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
115960 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
115961 return 1;
115962 atm_return(vcc, truesize);
115963- atomic_inc(&vcc->stats->rx_drop);
115964+ atomic_inc_unchecked(&vcc->stats->rx_drop);
115965 return 0;
115966 }
115967 EXPORT_SYMBOL(atm_charge);
115968@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
115969 }
115970 }
115971 atm_return(vcc, guess);
115972- atomic_inc(&vcc->stats->rx_drop);
115973+ atomic_inc_unchecked(&vcc->stats->rx_drop);
115974 return NULL;
115975 }
115976 EXPORT_SYMBOL(atm_alloc_charge);
115977@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
115978
115979 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
115980 {
115981-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
115982+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
115983 __SONET_ITEMS
115984 #undef __HANDLE_ITEM
115985 }
115986@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
115987
115988 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
115989 {
115990-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
115991+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
115992 __SONET_ITEMS
115993 #undef __HANDLE_ITEM
115994 }
115995diff --git a/net/atm/lec.c b/net/atm/lec.c
115996index cd3b379..977a3c9 100644
115997--- a/net/atm/lec.c
115998+++ b/net/atm/lec.c
115999@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
116000 }
116001
116002 static struct lane2_ops lane2_ops = {
116003- lane2_resolve, /* resolve, spec 3.1.3 */
116004- lane2_associate_req, /* associate_req, spec 3.1.4 */
116005- NULL /* associate indicator, spec 3.1.5 */
116006+ .resolve = lane2_resolve,
116007+ .associate_req = lane2_associate_req,
116008+ .associate_indicator = NULL
116009 };
116010
116011 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
116012diff --git a/net/atm/lec.h b/net/atm/lec.h
116013index 4149db1..f2ab682 100644
116014--- a/net/atm/lec.h
116015+++ b/net/atm/lec.h
116016@@ -48,7 +48,7 @@ struct lane2_ops {
116017 const u8 *tlvs, u32 sizeoftlvs);
116018 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
116019 const u8 *tlvs, u32 sizeoftlvs);
116020-};
116021+} __no_const;
116022
116023 /*
116024 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
116025diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
116026index d1b2d9a..d549f7f 100644
116027--- a/net/atm/mpoa_caches.c
116028+++ b/net/atm/mpoa_caches.c
116029@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
116030
116031
116032 static struct in_cache_ops ingress_ops = {
116033- in_cache_add_entry, /* add_entry */
116034- in_cache_get, /* get */
116035- in_cache_get_with_mask, /* get_with_mask */
116036- in_cache_get_by_vcc, /* get_by_vcc */
116037- in_cache_put, /* put */
116038- in_cache_remove_entry, /* remove_entry */
116039- cache_hit, /* cache_hit */
116040- clear_count_and_expired, /* clear_count */
116041- check_resolving_entries, /* check_resolving */
116042- refresh_entries, /* refresh */
116043- in_destroy_cache /* destroy_cache */
116044+ .add_entry = in_cache_add_entry,
116045+ .get = in_cache_get,
116046+ .get_with_mask = in_cache_get_with_mask,
116047+ .get_by_vcc = in_cache_get_by_vcc,
116048+ .put = in_cache_put,
116049+ .remove_entry = in_cache_remove_entry,
116050+ .cache_hit = cache_hit,
116051+ .clear_count = clear_count_and_expired,
116052+ .check_resolving = check_resolving_entries,
116053+ .refresh = refresh_entries,
116054+ .destroy_cache = in_destroy_cache
116055 };
116056
116057 static struct eg_cache_ops egress_ops = {
116058- eg_cache_add_entry, /* add_entry */
116059- eg_cache_get_by_cache_id, /* get_by_cache_id */
116060- eg_cache_get_by_tag, /* get_by_tag */
116061- eg_cache_get_by_vcc, /* get_by_vcc */
116062- eg_cache_get_by_src_ip, /* get_by_src_ip */
116063- eg_cache_put, /* put */
116064- eg_cache_remove_entry, /* remove_entry */
116065- update_eg_cache_entry, /* update */
116066- clear_expired, /* clear_expired */
116067- eg_destroy_cache /* destroy_cache */
116068+ .add_entry = eg_cache_add_entry,
116069+ .get_by_cache_id = eg_cache_get_by_cache_id,
116070+ .get_by_tag = eg_cache_get_by_tag,
116071+ .get_by_vcc = eg_cache_get_by_vcc,
116072+ .get_by_src_ip = eg_cache_get_by_src_ip,
116073+ .put = eg_cache_put,
116074+ .remove_entry = eg_cache_remove_entry,
116075+ .update = update_eg_cache_entry,
116076+ .clear_expired = clear_expired,
116077+ .destroy_cache = eg_destroy_cache
116078 };
116079
116080
116081diff --git a/net/atm/proc.c b/net/atm/proc.c
116082index bbb6461..cf04016 100644
116083--- a/net/atm/proc.c
116084+++ b/net/atm/proc.c
116085@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
116086 const struct k_atm_aal_stats *stats)
116087 {
116088 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
116089- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
116090- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
116091- atomic_read(&stats->rx_drop));
116092+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
116093+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
116094+ atomic_read_unchecked(&stats->rx_drop));
116095 }
116096
116097 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
116098diff --git a/net/atm/resources.c b/net/atm/resources.c
116099index 0447d5d..3cf4728 100644
116100--- a/net/atm/resources.c
116101+++ b/net/atm/resources.c
116102@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
116103 static void copy_aal_stats(struct k_atm_aal_stats *from,
116104 struct atm_aal_stats *to)
116105 {
116106-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
116107+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
116108 __AAL_STAT_ITEMS
116109 #undef __HANDLE_ITEM
116110 }
116111@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
116112 static void subtract_aal_stats(struct k_atm_aal_stats *from,
116113 struct atm_aal_stats *to)
116114 {
116115-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
116116+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
116117 __AAL_STAT_ITEMS
116118 #undef __HANDLE_ITEM
116119 }
116120diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
116121index 1997538..3b78e84 100644
116122--- a/net/ax25/ax25_subr.c
116123+++ b/net/ax25/ax25_subr.c
116124@@ -264,6 +264,7 @@ void ax25_disconnect(ax25_cb *ax25, int reason)
116125 {
116126 ax25_clear_queues(ax25);
116127
116128+ ax25_stop_heartbeat(ax25);
116129 ax25_stop_t1timer(ax25);
116130 ax25_stop_t2timer(ax25);
116131 ax25_stop_t3timer(ax25);
116132diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
116133index 919a5ce..cc6b444 100644
116134--- a/net/ax25/sysctl_net_ax25.c
116135+++ b/net/ax25/sysctl_net_ax25.c
116136@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
116137 {
116138 char path[sizeof("net/ax25/") + IFNAMSIZ];
116139 int k;
116140- struct ctl_table *table;
116141+ ctl_table_no_const *table;
116142
116143 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
116144 if (!table)
116145diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
116146index 00e00e0..710fcd2 100644
116147--- a/net/batman-adv/bat_iv_ogm.c
116148+++ b/net/batman-adv/bat_iv_ogm.c
116149@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
116150
116151 /* randomize initial seqno to avoid collision */
116152 get_random_bytes(&random_seqno, sizeof(random_seqno));
116153- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116154+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116155
116156 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
116157 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
116158@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
116159 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
116160
116161 /* change sequence number to network order */
116162- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
116163+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
116164 batadv_ogm_packet->seqno = htonl(seqno);
116165- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
116166+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
116167
116168 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
116169
116170@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
116171 return;
116172
116173 /* could be changed by schedule_own_packet() */
116174- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
116175+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
116176
116177 if (ogm_packet->flags & BATADV_DIRECTLINK)
116178 has_directlink_flag = true;
116179diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
116180index 3d1dcaa..4699f4e 100644
116181--- a/net/batman-adv/fragmentation.c
116182+++ b/net/batman-adv/fragmentation.c
116183@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
116184 frag_header.packet_type = BATADV_UNICAST_FRAG;
116185 frag_header.version = BATADV_COMPAT_VERSION;
116186 frag_header.ttl = BATADV_TTL;
116187- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
116188+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
116189 frag_header.reserved = 0;
116190 frag_header.no = 0;
116191 frag_header.total_size = htons(skb->len);
116192diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
116193index 5ec31d7..e371631 100644
116194--- a/net/batman-adv/soft-interface.c
116195+++ b/net/batman-adv/soft-interface.c
116196@@ -295,7 +295,7 @@ send:
116197 primary_if->net_dev->dev_addr);
116198
116199 /* set broadcast sequence number */
116200- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
116201+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
116202 bcast_packet->seqno = htonl(seqno);
116203
116204 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
116205@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116206 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
116207
116208 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
116209- atomic_set(&bat_priv->bcast_seqno, 1);
116210+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
116211 atomic_set(&bat_priv->tt.vn, 0);
116212 atomic_set(&bat_priv->tt.local_changes, 0);
116213 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
116214@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116215
116216 /* randomize initial seqno to avoid collision */
116217 get_random_bytes(&random_seqno, sizeof(random_seqno));
116218- atomic_set(&bat_priv->frag_seqno, random_seqno);
116219+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
116220
116221 bat_priv->primary_if = NULL;
116222 bat_priv->num_ifaces = 0;
116223@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
116224 return 0;
116225 }
116226
116227-struct rtnl_link_ops batadv_link_ops __read_mostly = {
116228+struct rtnl_link_ops batadv_link_ops = {
116229 .kind = "batadv",
116230 .priv_size = sizeof(struct batadv_priv),
116231 .setup = batadv_softif_init_early,
116232diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
116233index 9398c3f..0e79657 100644
116234--- a/net/batman-adv/types.h
116235+++ b/net/batman-adv/types.h
116236@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
116237 struct batadv_hard_iface_bat_iv {
116238 unsigned char *ogm_buff;
116239 int ogm_buff_len;
116240- atomic_t ogm_seqno;
116241+ atomic_unchecked_t ogm_seqno;
116242 };
116243
116244 /**
116245@@ -766,7 +766,7 @@ struct batadv_priv {
116246 atomic_t bonding;
116247 atomic_t fragmentation;
116248 atomic_t packet_size_max;
116249- atomic_t frag_seqno;
116250+ atomic_unchecked_t frag_seqno;
116251 #ifdef CONFIG_BATMAN_ADV_BLA
116252 atomic_t bridge_loop_avoidance;
116253 #endif
116254@@ -785,7 +785,7 @@ struct batadv_priv {
116255 #endif
116256 uint32_t isolation_mark;
116257 uint32_t isolation_mark_mask;
116258- atomic_t bcast_seqno;
116259+ atomic_unchecked_t bcast_seqno;
116260 atomic_t bcast_queue_left;
116261 atomic_t batman_queue_left;
116262 char num_ifaces;
116263diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
116264index e11a5cf..02864cd 100644
116265--- a/net/bluetooth/hci_sock.c
116266+++ b/net/bluetooth/hci_sock.c
116267@@ -1253,7 +1253,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
116268 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
116269 }
116270
116271- len = min_t(unsigned int, len, sizeof(uf));
116272+ len = min((size_t)len, sizeof(uf));
116273 if (copy_from_user(&uf, optval, len)) {
116274 err = -EFAULT;
116275 break;
116276diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
116277index dad4197..253bbdf 100644
116278--- a/net/bluetooth/l2cap_core.c
116279+++ b/net/bluetooth/l2cap_core.c
116280@@ -3541,8 +3541,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
116281 break;
116282
116283 case L2CAP_CONF_RFC:
116284- if (olen == sizeof(rfc))
116285- memcpy(&rfc, (void *)val, olen);
116286+ if (olen != sizeof(rfc))
116287+ break;
116288+
116289+ memcpy(&rfc, (void *)val, olen);
116290
116291 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
116292 rfc.mode != chan->mode)
116293diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
116294index a7278f0..3443626 100644
116295--- a/net/bluetooth/l2cap_sock.c
116296+++ b/net/bluetooth/l2cap_sock.c
116297@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116298 struct sock *sk = sock->sk;
116299 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
116300 struct l2cap_options opts;
116301- int len, err = 0;
116302+ int err = 0;
116303+ size_t len = optlen;
116304 u32 opt;
116305
116306 BT_DBG("sk %p", sk);
116307@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116308 opts.max_tx = chan->max_tx;
116309 opts.txwin_size = chan->tx_win;
116310
116311- len = min_t(unsigned int, sizeof(opts), optlen);
116312+ len = min(sizeof(opts), len);
116313 if (copy_from_user((char *) &opts, optval, len)) {
116314 err = -EFAULT;
116315 break;
116316@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116317 struct bt_security sec;
116318 struct bt_power pwr;
116319 struct l2cap_conn *conn;
116320- int len, err = 0;
116321+ int err = 0;
116322+ size_t len = optlen;
116323 u32 opt;
116324
116325 BT_DBG("sk %p", sk);
116326@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116327
116328 sec.level = BT_SECURITY_LOW;
116329
116330- len = min_t(unsigned int, sizeof(sec), optlen);
116331+ len = min(sizeof(sec), len);
116332 if (copy_from_user((char *) &sec, optval, len)) {
116333 err = -EFAULT;
116334 break;
116335@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116336
116337 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
116338
116339- len = min_t(unsigned int, sizeof(pwr), optlen);
116340+ len = min(sizeof(pwr), len);
116341 if (copy_from_user((char *) &pwr, optval, len)) {
116342 err = -EFAULT;
116343 break;
116344diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
116345index 825e8fb..efc24a4 100644
116346--- a/net/bluetooth/rfcomm/sock.c
116347+++ b/net/bluetooth/rfcomm/sock.c
116348@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116349 struct sock *sk = sock->sk;
116350 struct bt_security sec;
116351 int err = 0;
116352- size_t len;
116353+ size_t len = optlen;
116354 u32 opt;
116355
116356 BT_DBG("sk %p", sk);
116357@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116358
116359 sec.level = BT_SECURITY_LOW;
116360
116361- len = min_t(unsigned int, sizeof(sec), optlen);
116362+ len = min(sizeof(sec), len);
116363 if (copy_from_user((char *) &sec, optval, len)) {
116364 err = -EFAULT;
116365 break;
116366diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
116367index 8e385a0..a5bdd8e 100644
116368--- a/net/bluetooth/rfcomm/tty.c
116369+++ b/net/bluetooth/rfcomm/tty.c
116370@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
116371 BT_DBG("tty %p id %d", tty, tty->index);
116372
116373 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
116374- dev->channel, dev->port.count);
116375+ dev->channel, atomic_read(&dev->port.count));
116376
116377 err = tty_port_open(&dev->port, tty, filp);
116378 if (err)
116379@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
116380 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
116381
116382 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
116383- dev->port.count);
116384+ atomic_read(&dev->port.count));
116385
116386 tty_port_close(&dev->port, tty, filp);
116387 }
116388diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
116389index e29ad70b..cc00066 100644
116390--- a/net/bridge/br_mdb.c
116391+++ b/net/bridge/br_mdb.c
116392@@ -371,6 +371,7 @@ static int __br_mdb_add(struct net *net, struct net_bridge *br,
116393 if (!p || p->br != br || p->state == BR_STATE_DISABLED)
116394 return -EINVAL;
116395
116396+ memset(&ip, 0, sizeof(ip));
116397 ip.proto = entry->addr.proto;
116398 if (ip.proto == htons(ETH_P_IP))
116399 ip.u.ip4 = entry->addr.u.ip4;
116400@@ -417,6 +418,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry)
116401 if (!netif_running(br->dev) || br->multicast_disabled)
116402 return -EINVAL;
116403
116404+ memset(&ip, 0, sizeof(ip));
116405 ip.proto = entry->addr.proto;
116406 if (ip.proto == htons(ETH_P_IP)) {
116407 if (timer_pending(&br->ip4_other_query.timer))
116408diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
116409index 4b5c236..f303683 100644
116410--- a/net/bridge/br_netlink.c
116411+++ b/net/bridge/br_netlink.c
116412@@ -112,6 +112,8 @@ static inline size_t br_port_info_size(void)
116413 + nla_total_size(1) /* IFLA_BRPORT_FAST_LEAVE */
116414 + nla_total_size(1) /* IFLA_BRPORT_LEARNING */
116415 + nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */
116416+ + nla_total_size(1) /* IFLA_BRPORT_PROXYARP */
116417+ + nla_total_size(1) /* IFLA_BRPORT_PROXYARP_WIFI */
116418 + 0;
116419 }
116420
116421@@ -504,6 +506,8 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {
116422 [IFLA_BRPORT_FAST_LEAVE]= { .type = NLA_U8 },
116423 [IFLA_BRPORT_LEARNING] = { .type = NLA_U8 },
116424 [IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 },
116425+ [IFLA_BRPORT_PROXYARP] = { .type = NLA_U8 },
116426+ [IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },
116427 };
116428
116429 /* Change the state of the port and notify spanning tree */
116430@@ -841,7 +845,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
116431 .get_link_af_size = br_get_link_af_size,
116432 };
116433
116434-struct rtnl_link_ops br_link_ops __read_mostly = {
116435+struct rtnl_link_ops br_link_ops = {
116436 .kind = "bridge",
116437 .priv_size = sizeof(struct net_bridge),
116438 .setup = br_dev_setup,
116439diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
116440index 91180a7..1301daa 100644
116441--- a/net/bridge/netfilter/ebtables.c
116442+++ b/net/bridge/netfilter/ebtables.c
116443@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
116444 tmp.valid_hooks = t->table->valid_hooks;
116445 }
116446 mutex_unlock(&ebt_mutex);
116447- if (copy_to_user(user, &tmp, *len) != 0) {
116448+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116449 BUGPRINT("c2u Didn't work\n");
116450 ret = -EFAULT;
116451 break;
116452@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116453 goto out;
116454 tmp.valid_hooks = t->valid_hooks;
116455
116456- if (copy_to_user(user, &tmp, *len) != 0) {
116457+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116458 ret = -EFAULT;
116459 break;
116460 }
116461@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116462 tmp.entries_size = t->table->entries_size;
116463 tmp.valid_hooks = t->table->valid_hooks;
116464
116465- if (copy_to_user(user, &tmp, *len) != 0) {
116466+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116467 ret = -EFAULT;
116468 break;
116469 }
116470diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
116471index f5afda1..dcf770a 100644
116472--- a/net/caif/cfctrl.c
116473+++ b/net/caif/cfctrl.c
116474@@ -10,6 +10,7 @@
116475 #include <linux/spinlock.h>
116476 #include <linux/slab.h>
116477 #include <linux/pkt_sched.h>
116478+#include <linux/sched.h>
116479 #include <net/caif/caif_layer.h>
116480 #include <net/caif/cfpkt.h>
116481 #include <net/caif/cfctrl.h>
116482@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
116483 memset(&dev_info, 0, sizeof(dev_info));
116484 dev_info.id = 0xff;
116485 cfsrvl_init(&this->serv, 0, &dev_info, false);
116486- atomic_set(&this->req_seq_no, 1);
116487- atomic_set(&this->rsp_seq_no, 1);
116488+ atomic_set_unchecked(&this->req_seq_no, 1);
116489+ atomic_set_unchecked(&this->rsp_seq_no, 1);
116490 this->serv.layer.receive = cfctrl_recv;
116491 sprintf(this->serv.layer.name, "ctrl");
116492 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
116493@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
116494 struct cfctrl_request_info *req)
116495 {
116496 spin_lock_bh(&ctrl->info_list_lock);
116497- atomic_inc(&ctrl->req_seq_no);
116498- req->sequence_no = atomic_read(&ctrl->req_seq_no);
116499+ atomic_inc_unchecked(&ctrl->req_seq_no);
116500+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
116501 list_add_tail(&req->list, &ctrl->list);
116502 spin_unlock_bh(&ctrl->info_list_lock);
116503 }
116504@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
116505 if (p != first)
116506 pr_warn("Requests are not received in order\n");
116507
116508- atomic_set(&ctrl->rsp_seq_no,
116509+ atomic_set_unchecked(&ctrl->rsp_seq_no,
116510 p->sequence_no);
116511 list_del(&p->list);
116512 goto out;
116513diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
116514index 67a4a36..8d28068 100644
116515--- a/net/caif/chnl_net.c
116516+++ b/net/caif/chnl_net.c
116517@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
116518 };
116519
116520
116521-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
116522+static struct rtnl_link_ops ipcaif_link_ops = {
116523 .kind = "caif",
116524 .priv_size = sizeof(struct chnl_net),
116525 .setup = ipcaif_net_setup,
116526diff --git a/net/can/af_can.c b/net/can/af_can.c
116527index 62c635f..0b59618 100644
116528--- a/net/can/af_can.c
116529+++ b/net/can/af_can.c
116530@@ -890,7 +890,7 @@ static const struct net_proto_family can_family_ops = {
116531 };
116532
116533 /* notifier block for netdevice event */
116534-static struct notifier_block can_netdev_notifier __read_mostly = {
116535+static struct notifier_block can_netdev_notifier = {
116536 .notifier_call = can_notifier,
116537 };
116538
116539diff --git a/net/can/bcm.c b/net/can/bcm.c
116540index a1ba687..aafaec5 100644
116541--- a/net/can/bcm.c
116542+++ b/net/can/bcm.c
116543@@ -1620,7 +1620,7 @@ static int __init bcm_module_init(void)
116544 }
116545
116546 /* create /proc/net/can-bcm directory */
116547- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
116548+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
116549 return 0;
116550 }
116551
116552diff --git a/net/can/gw.c b/net/can/gw.c
116553index a6f448e..5902171 100644
116554--- a/net/can/gw.c
116555+++ b/net/can/gw.c
116556@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
116557 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
116558
116559 static HLIST_HEAD(cgw_list);
116560-static struct notifier_block notifier;
116561
116562 static struct kmem_cache *cgw_cache __read_mostly;
116563
116564@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
116565 return err;
116566 }
116567
116568+static struct notifier_block notifier = {
116569+ .notifier_call = cgw_notifier
116570+};
116571+
116572 static __init int cgw_module_init(void)
116573 {
116574 /* sanitize given module parameter */
116575@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
116576 return -ENOMEM;
116577
116578 /* set notifier */
116579- notifier.notifier_call = cgw_notifier;
116580 register_netdevice_notifier(&notifier);
116581
116582 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
116583diff --git a/net/can/proc.c b/net/can/proc.c
116584index 1a19b98..df2b4ec 100644
116585--- a/net/can/proc.c
116586+++ b/net/can/proc.c
116587@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
116588 void can_init_proc(void)
116589 {
116590 /* create /proc/net/can directory */
116591- can_dir = proc_mkdir("can", init_net.proc_net);
116592+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
116593
116594 if (!can_dir) {
116595 printk(KERN_INFO "can: failed to create /proc/net/can . "
116596diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
116597index 967080a..5e75f04 100644
116598--- a/net/ceph/messenger.c
116599+++ b/net/ceph/messenger.c
116600@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
116601 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
116602
116603 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
116604-static atomic_t addr_str_seq = ATOMIC_INIT(0);
116605+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
116606
116607 static struct page *zero_page; /* used in certain error cases */
116608
116609@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
116610 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
116611 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
116612
116613- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116614+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116615 s = addr_str[i];
116616
116617 switch (ss->ss_family) {
116618diff --git a/net/compat.c b/net/compat.c
116619index 5cfd26a..7e43828 100644
116620--- a/net/compat.c
116621+++ b/net/compat.c
116622@@ -98,20 +98,20 @@ int get_compat_msghdr(struct msghdr *kmsg,
116623
116624 #define CMSG_COMPAT_FIRSTHDR(msg) \
116625 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
116626- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
116627+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
116628 (struct compat_cmsghdr __user *)NULL)
116629
116630 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
116631 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
116632 (ucmlen) <= (unsigned long) \
116633 ((mhdr)->msg_controllen - \
116634- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
116635+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
116636
116637 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
116638 struct compat_cmsghdr __user *cmsg, int cmsg_len)
116639 {
116640 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
116641- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
116642+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
116643 msg->msg_controllen)
116644 return NULL;
116645 return (struct compat_cmsghdr __user *)ptr;
116646@@ -201,7 +201,7 @@ Efault:
116647
116648 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
116649 {
116650- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116651+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116652 struct compat_cmsghdr cmhdr;
116653 struct compat_timeval ctv;
116654 struct compat_timespec cts[3];
116655@@ -257,7 +257,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
116656
116657 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
116658 {
116659- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116660+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116661 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
116662 int fdnum = scm->fp->count;
116663 struct file **fp = scm->fp->fp;
116664@@ -345,7 +345,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
116665 return -EFAULT;
116666 old_fs = get_fs();
116667 set_fs(KERNEL_DS);
116668- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
116669+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
116670 set_fs(old_fs);
116671
116672 return err;
116673@@ -406,7 +406,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
116674 len = sizeof(ktime);
116675 old_fs = get_fs();
116676 set_fs(KERNEL_DS);
116677- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
116678+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
116679 set_fs(old_fs);
116680
116681 if (!err) {
116682@@ -549,7 +549,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116683 case MCAST_JOIN_GROUP:
116684 case MCAST_LEAVE_GROUP:
116685 {
116686- struct compat_group_req __user *gr32 = (void *)optval;
116687+ struct compat_group_req __user *gr32 = (void __user *)optval;
116688 struct group_req __user *kgr =
116689 compat_alloc_user_space(sizeof(struct group_req));
116690 u32 interface;
116691@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116692 case MCAST_BLOCK_SOURCE:
116693 case MCAST_UNBLOCK_SOURCE:
116694 {
116695- struct compat_group_source_req __user *gsr32 = (void *)optval;
116696+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
116697 struct group_source_req __user *kgsr = compat_alloc_user_space(
116698 sizeof(struct group_source_req));
116699 u32 interface;
116700@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116701 }
116702 case MCAST_MSFILTER:
116703 {
116704- struct compat_group_filter __user *gf32 = (void *)optval;
116705+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116706 struct group_filter __user *kgf;
116707 u32 interface, fmode, numsrc;
116708
116709@@ -629,7 +629,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
116710 char __user *optval, int __user *optlen,
116711 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
116712 {
116713- struct compat_group_filter __user *gf32 = (void *)optval;
116714+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116715 struct group_filter __user *kgf;
116716 int __user *koptlen;
116717 u32 interface, fmode, numsrc;
116718@@ -773,7 +773,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
116719
116720 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
116721 return -EINVAL;
116722- if (copy_from_user(a, args, nas[call]))
116723+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
116724 return -EFAULT;
116725 a0 = a[0];
116726 a1 = a[1];
116727diff --git a/net/core/datagram.c b/net/core/datagram.c
116728index b80fb91..0364f4f 100644
116729--- a/net/core/datagram.c
116730+++ b/net/core/datagram.c
116731@@ -131,6 +131,35 @@ out_noerr:
116732 goto out;
116733 }
116734
116735+static struct sk_buff *skb_set_peeked(struct sk_buff *skb)
116736+{
116737+ struct sk_buff *nskb;
116738+
116739+ if (skb->peeked)
116740+ return skb;
116741+
116742+ /* We have to unshare an skb before modifying it. */
116743+ if (!skb_shared(skb))
116744+ goto done;
116745+
116746+ nskb = skb_clone(skb, GFP_ATOMIC);
116747+ if (!nskb)
116748+ return ERR_PTR(-ENOMEM);
116749+
116750+ skb->prev->next = nskb;
116751+ skb->next->prev = nskb;
116752+ nskb->prev = skb->prev;
116753+ nskb->next = skb->next;
116754+
116755+ consume_skb(skb);
116756+ skb = nskb;
116757+
116758+done:
116759+ skb->peeked = 1;
116760+
116761+ return skb;
116762+}
116763+
116764 /**
116765 * __skb_recv_datagram - Receive a datagram skbuff
116766 * @sk: socket
116767@@ -165,7 +194,9 @@ out_noerr:
116768 struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116769 int *peeked, int *off, int *err)
116770 {
116771+ struct sk_buff_head *queue = &sk->sk_receive_queue;
116772 struct sk_buff *skb, *last;
116773+ unsigned long cpu_flags;
116774 long timeo;
116775 /*
116776 * Caller is allowed not to check sk->sk_err before skb_recv_datagram()
116777@@ -184,8 +215,6 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116778 * Look at current nfs client by the way...
116779 * However, this function was correct in any case. 8)
116780 */
116781- unsigned long cpu_flags;
116782- struct sk_buff_head *queue = &sk->sk_receive_queue;
116783 int _off = *off;
116784
116785 last = (struct sk_buff *)queue;
116786@@ -199,7 +228,12 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116787 _off -= skb->len;
116788 continue;
116789 }
116790- skb->peeked = 1;
116791+
116792+ skb = skb_set_peeked(skb);
116793+ error = PTR_ERR(skb);
116794+ if (IS_ERR(skb))
116795+ goto unlock_err;
116796+
116797 atomic_inc(&skb->users);
116798 } else
116799 __skb_unlink(skb, queue);
116800@@ -223,6 +257,8 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116801
116802 return NULL;
116803
116804+unlock_err:
116805+ spin_unlock_irqrestore(&queue->lock, cpu_flags);
116806 no_packet:
116807 *err = error;
116808 return NULL;
116809@@ -302,7 +338,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
116810 }
116811
116812 kfree_skb(skb);
116813- atomic_inc(&sk->sk_drops);
116814+ atomic_inc_unchecked(&sk->sk_drops);
116815 sk_mem_reclaim_partial(sk);
116816
116817 return err;
116818@@ -622,7 +658,8 @@ __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)
116819 !skb->csum_complete_sw)
116820 netdev_rx_csum_fault(skb->dev);
116821 }
116822- skb->csum_valid = !sum;
116823+ if (!skb_shared(skb))
116824+ skb->csum_valid = !sum;
116825 return sum;
116826 }
116827 EXPORT_SYMBOL(__skb_checksum_complete_head);
116828@@ -642,11 +679,13 @@ __sum16 __skb_checksum_complete(struct sk_buff *skb)
116829 netdev_rx_csum_fault(skb->dev);
116830 }
116831
116832- /* Save full packet checksum */
116833- skb->csum = csum;
116834- skb->ip_summed = CHECKSUM_COMPLETE;
116835- skb->csum_complete_sw = 1;
116836- skb->csum_valid = !sum;
116837+ if (!skb_shared(skb)) {
116838+ /* Save full packet checksum */
116839+ skb->csum = csum;
116840+ skb->ip_summed = CHECKSUM_COMPLETE;
116841+ skb->csum_complete_sw = 1;
116842+ skb->csum_valid = !sum;
116843+ }
116844
116845 return sum;
116846 }
116847diff --git a/net/core/dev.c b/net/core/dev.c
116848index aa82f9a..f28b00e 100644
116849--- a/net/core/dev.c
116850+++ b/net/core/dev.c
116851@@ -1720,7 +1720,7 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
116852 {
116853 if (skb_orphan_frags(skb, GFP_ATOMIC) ||
116854 unlikely(!is_skb_forwardable(dev, skb))) {
116855- atomic_long_inc(&dev->rx_dropped);
116856+ atomic_long_inc_unchecked(&dev->rx_dropped);
116857 kfree_skb(skb);
116858 return NET_RX_DROP;
116859 }
116860@@ -3018,7 +3018,7 @@ recursion_alert:
116861 drop:
116862 rcu_read_unlock_bh();
116863
116864- atomic_long_inc(&dev->tx_dropped);
116865+ atomic_long_inc_unchecked(&dev->tx_dropped);
116866 kfree_skb_list(skb);
116867 return rc;
116868 out:
116869@@ -3367,7 +3367,7 @@ enqueue:
116870
116871 local_irq_restore(flags);
116872
116873- atomic_long_inc(&skb->dev->rx_dropped);
116874+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
116875 kfree_skb(skb);
116876 return NET_RX_DROP;
116877 }
116878@@ -3444,7 +3444,7 @@ int netif_rx_ni(struct sk_buff *skb)
116879 }
116880 EXPORT_SYMBOL(netif_rx_ni);
116881
116882-static void net_tx_action(struct softirq_action *h)
116883+static __latent_entropy void net_tx_action(void)
116884 {
116885 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
116886
116887@@ -3783,7 +3783,7 @@ ncls:
116888 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
116889 } else {
116890 drop:
116891- atomic_long_inc(&skb->dev->rx_dropped);
116892+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
116893 kfree_skb(skb);
116894 /* Jamal, now you will not able to escape explaining
116895 * me how you were going to use this. :-)
116896@@ -4672,7 +4672,7 @@ out_unlock:
116897 return work;
116898 }
116899
116900-static void net_rx_action(struct softirq_action *h)
116901+static __latent_entropy void net_rx_action(void)
116902 {
116903 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
116904 unsigned long time_limit = jiffies + 2;
116905@@ -6721,8 +6721,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
116906 } else {
116907 netdev_stats_to_stats64(storage, &dev->stats);
116908 }
116909- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
116910- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
116911+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
116912+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
116913 return storage;
116914 }
116915 EXPORT_SYMBOL(dev_get_stats);
116916diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
116917index b94b1d2..da3ed7c 100644
116918--- a/net/core/dev_ioctl.c
116919+++ b/net/core/dev_ioctl.c
116920@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
116921 no_module = !dev;
116922 if (no_module && capable(CAP_NET_ADMIN))
116923 no_module = request_module("netdev-%s", name);
116924- if (no_module && capable(CAP_SYS_MODULE))
116925+ if (no_module && capable(CAP_SYS_MODULE)) {
116926+#ifdef CONFIG_GRKERNSEC_MODHARDEN
116927+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
116928+#else
116929 request_module("%s", name);
116930+#endif
116931+ }
116932 }
116933 EXPORT_SYMBOL(dev_load);
116934
116935diff --git a/net/core/dst.c b/net/core/dst.c
116936index e956ce6..002144be 100644
116937--- a/net/core/dst.c
116938+++ b/net/core/dst.c
116939@@ -284,7 +284,9 @@ void dst_release(struct dst_entry *dst)
116940 int newrefcnt;
116941
116942 newrefcnt = atomic_dec_return(&dst->__refcnt);
116943- WARN_ON(newrefcnt < 0);
116944+ if (unlikely(newrefcnt < 0))
116945+ net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
116946+ __func__, dst, newrefcnt);
116947 if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt)
116948 call_rcu(&dst->rcu_head, dst_destroy_rcu);
116949 }
116950diff --git a/net/core/filter.c b/net/core/filter.c
116951index bf831a8..8d2c4c2 100644
116952--- a/net/core/filter.c
116953+++ b/net/core/filter.c
116954@@ -579,7 +579,11 @@ do_pass:
116955
116956 /* Unknown instruction. */
116957 default:
116958- goto err;
116959+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
116960+ fp->code, fp->jt, fp->jf, fp->k);
116961+ kfree(addrs);
116962+ BUG();
116963+ return -EINVAL;
116964 }
116965
116966 insn++;
116967@@ -623,7 +627,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
116968 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
116969 int pc, ret = 0;
116970
116971- BUILD_BUG_ON(BPF_MEMWORDS > 16);
116972+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
116973
116974 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
116975 if (!masks)
116976@@ -1038,7 +1042,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
116977 if (!fp)
116978 return -ENOMEM;
116979
116980- memcpy(fp->insns, fprog->filter, fsize);
116981+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
116982
116983 fp->len = fprog->len;
116984 /* Since unattached filters are not copied back to user
116985diff --git a/net/core/flow.c b/net/core/flow.c
116986index 1033725..340f65d 100644
116987--- a/net/core/flow.c
116988+++ b/net/core/flow.c
116989@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
116990 static int flow_entry_valid(struct flow_cache_entry *fle,
116991 struct netns_xfrm *xfrm)
116992 {
116993- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
116994+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
116995 return 0;
116996 if (fle->object && !fle->object->ops->check(fle->object))
116997 return 0;
116998@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
116999 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
117000 fcp->hash_count++;
117001 }
117002- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
117003+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
117004 flo = fle->object;
117005 if (!flo)
117006 goto ret_object;
117007@@ -263,7 +263,7 @@ nocache:
117008 }
117009 flo = resolver(net, key, family, dir, flo, ctx);
117010 if (fle) {
117011- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
117012+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
117013 if (!IS_ERR(flo))
117014 fle->object = flo;
117015 else
117016diff --git a/net/core/neighbour.c b/net/core/neighbour.c
117017index 2237c1b..c0c80ab 100644
117018--- a/net/core/neighbour.c
117019+++ b/net/core/neighbour.c
117020@@ -2818,7 +2818,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
117021 void __user *buffer, size_t *lenp, loff_t *ppos)
117022 {
117023 int size, ret;
117024- struct ctl_table tmp = *ctl;
117025+ ctl_table_no_const tmp = *ctl;
117026
117027 tmp.extra1 = &zero;
117028 tmp.extra2 = &unres_qlen_max;
117029@@ -2880,7 +2880,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
117030 void __user *buffer,
117031 size_t *lenp, loff_t *ppos)
117032 {
117033- struct ctl_table tmp = *ctl;
117034+ ctl_table_no_const tmp = *ctl;
117035 int ret;
117036
117037 tmp.extra1 = &zero;
117038diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
117039index 2bf8329..2eb1423 100644
117040--- a/net/core/net-procfs.c
117041+++ b/net/core/net-procfs.c
117042@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
117043 struct rtnl_link_stats64 temp;
117044 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
117045
117046- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117047+ if (gr_proc_is_restricted())
117048+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117049+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117050+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
117051+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
117052+ else
117053+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117054 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117055 dev->name, stats->rx_bytes, stats->rx_packets,
117056 stats->rx_errors,
117057@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
117058 return 0;
117059 }
117060
117061-static const struct seq_operations dev_seq_ops = {
117062+const struct seq_operations dev_seq_ops = {
117063 .start = dev_seq_start,
117064 .next = dev_seq_next,
117065 .stop = dev_seq_stop,
117066@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
117067
117068 static int softnet_seq_open(struct inode *inode, struct file *file)
117069 {
117070- return seq_open(file, &softnet_seq_ops);
117071+ return seq_open_restrict(file, &softnet_seq_ops);
117072 }
117073
117074 static const struct file_operations softnet_seq_fops = {
117075@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
117076 else
117077 seq_printf(seq, "%04x", ntohs(pt->type));
117078
117079+#ifdef CONFIG_GRKERNSEC_HIDESYM
117080+ seq_printf(seq, " %-8s %pf\n",
117081+ pt->dev ? pt->dev->name : "", NULL);
117082+#else
117083 seq_printf(seq, " %-8s %pf\n",
117084 pt->dev ? pt->dev->name : "", pt->func);
117085+#endif
117086 }
117087
117088 return 0;
117089diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
117090index 4238d6d..e6b605c 100644
117091--- a/net/core/net-sysfs.c
117092+++ b/net/core/net-sysfs.c
117093@@ -288,7 +288,7 @@ static ssize_t carrier_changes_show(struct device *dev,
117094 {
117095 struct net_device *netdev = to_net_dev(dev);
117096 return sprintf(buf, fmt_dec,
117097- atomic_read(&netdev->carrier_changes));
117098+ atomic_read_unchecked(&netdev->carrier_changes));
117099 }
117100 static DEVICE_ATTR_RO(carrier_changes);
117101
117102diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
117103index 572af00..5acf072 100644
117104--- a/net/core/net_namespace.c
117105+++ b/net/core/net_namespace.c
117106@@ -734,7 +734,7 @@ static int __register_pernet_operations(struct list_head *list,
117107 int error;
117108 LIST_HEAD(net_exit_list);
117109
117110- list_add_tail(&ops->list, list);
117111+ pax_list_add_tail((struct list_head *)&ops->list, list);
117112 if (ops->init || (ops->id && ops->size)) {
117113 for_each_net(net) {
117114 error = ops_init(ops, net);
117115@@ -747,7 +747,7 @@ static int __register_pernet_operations(struct list_head *list,
117116
117117 out_undo:
117118 /* If I have an error cleanup all namespaces I initialized */
117119- list_del(&ops->list);
117120+ pax_list_del((struct list_head *)&ops->list);
117121 ops_exit_list(ops, &net_exit_list);
117122 ops_free_list(ops, &net_exit_list);
117123 return error;
117124@@ -758,7 +758,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
117125 struct net *net;
117126 LIST_HEAD(net_exit_list);
117127
117128- list_del(&ops->list);
117129+ pax_list_del((struct list_head *)&ops->list);
117130 for_each_net(net)
117131 list_add_tail(&net->exit_list, &net_exit_list);
117132 ops_exit_list(ops, &net_exit_list);
117133@@ -892,7 +892,7 @@ int register_pernet_device(struct pernet_operations *ops)
117134 mutex_lock(&net_mutex);
117135 error = register_pernet_operations(&pernet_list, ops);
117136 if (!error && (first_device == &pernet_list))
117137- first_device = &ops->list;
117138+ first_device = (struct list_head *)&ops->list;
117139 mutex_unlock(&net_mutex);
117140 return error;
117141 }
117142diff --git a/net/core/netpoll.c b/net/core/netpoll.c
117143index c126a87..10ad89d 100644
117144--- a/net/core/netpoll.c
117145+++ b/net/core/netpoll.c
117146@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117147 struct udphdr *udph;
117148 struct iphdr *iph;
117149 struct ethhdr *eth;
117150- static atomic_t ip_ident;
117151+ static atomic_unchecked_t ip_ident;
117152 struct ipv6hdr *ip6h;
117153
117154 udp_len = len + sizeof(*udph);
117155@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117156 put_unaligned(0x45, (unsigned char *)iph);
117157 iph->tos = 0;
117158 put_unaligned(htons(ip_len), &(iph->tot_len));
117159- iph->id = htons(atomic_inc_return(&ip_ident));
117160+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
117161 iph->frag_off = 0;
117162 iph->ttl = 64;
117163 iph->protocol = IPPROTO_UDP;
117164diff --git a/net/core/pktgen.c b/net/core/pktgen.c
117165index 508155b..fad080f 100644
117166--- a/net/core/pktgen.c
117167+++ b/net/core/pktgen.c
117168@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
117169 pn->net = net;
117170 INIT_LIST_HEAD(&pn->pktgen_threads);
117171 pn->pktgen_exiting = false;
117172- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
117173+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
117174 if (!pn->proc_dir) {
117175 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
117176 return -ENODEV;
117177diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
117178index 8de3682..fcb8a5e 100644
117179--- a/net/core/rtnetlink.c
117180+++ b/net/core/rtnetlink.c
117181@@ -61,7 +61,7 @@ struct rtnl_link {
117182 rtnl_doit_func doit;
117183 rtnl_dumpit_func dumpit;
117184 rtnl_calcit_func calcit;
117185-};
117186+} __no_const;
117187
117188 static DEFINE_MUTEX(rtnl_mutex);
117189
117190@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
117191 * to use the ops for creating device. So do not
117192 * fill up dellink as well. That disables rtnl_dellink.
117193 */
117194- if (ops->setup && !ops->dellink)
117195- ops->dellink = unregister_netdevice_queue;
117196+ if (ops->setup && !ops->dellink) {
117197+ pax_open_kernel();
117198+ *(void **)&ops->dellink = unregister_netdevice_queue;
117199+ pax_close_kernel();
117200+ }
117201
117202- list_add_tail(&ops->list, &link_ops);
117203+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
117204 return 0;
117205 }
117206 EXPORT_SYMBOL_GPL(__rtnl_link_register);
117207@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
117208 for_each_net(net) {
117209 __rtnl_kill_links(net, ops);
117210 }
117211- list_del(&ops->list);
117212+ pax_list_del((struct list_head *)&ops->list);
117213 }
117214 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
117215
117216@@ -1066,7 +1069,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
117217 (dev->ifalias &&
117218 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
117219 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
117220- atomic_read(&dev->carrier_changes)))
117221+ atomic_read_unchecked(&dev->carrier_changes)))
117222 goto nla_put_failure;
117223
117224 if (1) {
117225@@ -1748,10 +1751,13 @@ static int do_setlink(const struct sk_buff *skb,
117226 goto errout;
117227
117228 nla_for_each_nested(attr, tb[IFLA_VF_PORTS], rem) {
117229- if (nla_type(attr) != IFLA_VF_PORT)
117230- continue;
117231- err = nla_parse_nested(port, IFLA_PORT_MAX,
117232- attr, ifla_port_policy);
117233+ if (nla_type(attr) != IFLA_VF_PORT ||
117234+ nla_len(attr) < NLA_HDRLEN) {
117235+ err = -EINVAL;
117236+ goto errout;
117237+ }
117238+ err = nla_parse_nested(port, IFLA_PORT_MAX, attr,
117239+ ifla_port_policy);
117240 if (err < 0)
117241 goto errout;
117242 if (!port[IFLA_PORT_VF]) {
117243diff --git a/net/core/scm.c b/net/core/scm.c
117244index 3b6899b..cf36238 100644
117245--- a/net/core/scm.c
117246+++ b/net/core/scm.c
117247@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
117248 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117249 {
117250 struct cmsghdr __user *cm
117251- = (__force struct cmsghdr __user *)msg->msg_control;
117252+ = (struct cmsghdr __force_user *)msg->msg_control;
117253 struct cmsghdr cmhdr;
117254 int cmlen = CMSG_LEN(len);
117255 int err;
117256@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117257 err = -EFAULT;
117258 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
117259 goto out;
117260- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
117261+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
117262 goto out;
117263 cmlen = CMSG_SPACE(len);
117264 if (msg->msg_controllen < cmlen)
117265@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
117266 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117267 {
117268 struct cmsghdr __user *cm
117269- = (__force struct cmsghdr __user*)msg->msg_control;
117270+ = (struct cmsghdr __force_user *)msg->msg_control;
117271
117272 int fdmax = 0;
117273 int fdnum = scm->fp->count;
117274@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117275 if (fdnum < fdmax)
117276 fdmax = fdnum;
117277
117278- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
117279+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
117280 i++, cmfptr++)
117281 {
117282 struct socket *sock;
117283diff --git a/net/core/skbuff.c b/net/core/skbuff.c
117284index 41ec022..3cc0a1c 100644
117285--- a/net/core/skbuff.c
117286+++ b/net/core/skbuff.c
117287@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
117288 __wsum skb_checksum(const struct sk_buff *skb, int offset,
117289 int len, __wsum csum)
117290 {
117291- const struct skb_checksum_ops ops = {
117292+ static const struct skb_checksum_ops ops = {
117293 .update = csum_partial_ext,
117294 .combine = csum_block_add_ext,
117295 };
117296@@ -3335,12 +3335,14 @@ void __init skb_init(void)
117297 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
117298 sizeof(struct sk_buff),
117299 0,
117300- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117301+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117302+ SLAB_NO_SANITIZE,
117303 NULL);
117304 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
117305 sizeof(struct sk_buff_fclones),
117306 0,
117307- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117308+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117309+ SLAB_NO_SANITIZE,
117310 NULL);
117311 }
117312
117313diff --git a/net/core/sock.c b/net/core/sock.c
117314index dc30dc5..8bb3ef3 100644
117315--- a/net/core/sock.c
117316+++ b/net/core/sock.c
117317@@ -440,7 +440,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117318 struct sk_buff_head *list = &sk->sk_receive_queue;
117319
117320 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
117321- atomic_inc(&sk->sk_drops);
117322+ atomic_inc_unchecked(&sk->sk_drops);
117323 trace_sock_rcvqueue_full(sk, skb);
117324 return -ENOMEM;
117325 }
117326@@ -450,7 +450,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117327 return err;
117328
117329 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
117330- atomic_inc(&sk->sk_drops);
117331+ atomic_inc_unchecked(&sk->sk_drops);
117332 return -ENOBUFS;
117333 }
117334
117335@@ -483,7 +483,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117336 skb->dev = NULL;
117337
117338 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
117339- atomic_inc(&sk->sk_drops);
117340+ atomic_inc_unchecked(&sk->sk_drops);
117341 goto discard_and_relse;
117342 }
117343 if (nested)
117344@@ -501,7 +501,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117345 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
117346 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
117347 bh_unlock_sock(sk);
117348- atomic_inc(&sk->sk_drops);
117349+ atomic_inc_unchecked(&sk->sk_drops);
117350 goto discard_and_relse;
117351 }
117352
117353@@ -907,6 +907,7 @@ set_rcvbuf:
117354 }
117355 break;
117356
117357+#ifndef GRKERNSEC_BPF_HARDEN
117358 case SO_ATTACH_BPF:
117359 ret = -EINVAL;
117360 if (optlen == sizeof(u32)) {
117361@@ -919,7 +920,7 @@ set_rcvbuf:
117362 ret = sk_attach_bpf(ufd, sk);
117363 }
117364 break;
117365-
117366+#endif
117367 case SO_DETACH_FILTER:
117368 ret = sk_detach_filter(sk);
117369 break;
117370@@ -1021,12 +1022,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117371 struct timeval tm;
117372 } v;
117373
117374- int lv = sizeof(int);
117375- int len;
117376+ unsigned int lv = sizeof(int);
117377+ unsigned int len;
117378
117379 if (get_user(len, optlen))
117380 return -EFAULT;
117381- if (len < 0)
117382+ if (len > INT_MAX)
117383 return -EINVAL;
117384
117385 memset(&v, 0, sizeof(v));
117386@@ -1164,11 +1165,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117387
117388 case SO_PEERNAME:
117389 {
117390- char address[128];
117391+ char address[_K_SS_MAXSIZE];
117392
117393 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
117394 return -ENOTCONN;
117395- if (lv < len)
117396+ if (lv < len || sizeof address < len)
117397 return -EINVAL;
117398 if (copy_to_user(optval, address, len))
117399 return -EFAULT;
117400@@ -1256,7 +1257,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117401
117402 if (len > lv)
117403 len = lv;
117404- if (copy_to_user(optval, &v, len))
117405+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
117406 return -EFAULT;
117407 lenout:
117408 if (put_user(len, optlen))
117409@@ -2359,7 +2360,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
117410 */
117411 smp_wmb();
117412 atomic_set(&sk->sk_refcnt, 1);
117413- atomic_set(&sk->sk_drops, 0);
117414+ atomic_set_unchecked(&sk->sk_drops, 0);
117415 }
117416 EXPORT_SYMBOL(sock_init_data);
117417
117418@@ -2487,6 +2488,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
117419 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117420 int level, int type)
117421 {
117422+ struct sock_extended_err ee;
117423 struct sock_exterr_skb *serr;
117424 struct sk_buff *skb;
117425 int copied, err;
117426@@ -2508,7 +2510,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117427 sock_recv_timestamp(msg, sk, skb);
117428
117429 serr = SKB_EXT_ERR(skb);
117430- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
117431+ ee = serr->ee;
117432+ put_cmsg(msg, level, type, sizeof ee, &ee);
117433
117434 msg->msg_flags |= MSG_ERRQUEUE;
117435 err = copied;
117436diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
117437index 74dddf8..7f4e77e 100644
117438--- a/net/core/sock_diag.c
117439+++ b/net/core/sock_diag.c
117440@@ -9,7 +9,7 @@
117441 #include <linux/inet_diag.h>
117442 #include <linux/sock_diag.h>
117443
117444-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
117445+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
117446 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
117447 static DEFINE_MUTEX(sock_diag_table_mutex);
117448
117449@@ -127,8 +127,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
117450 mutex_lock(&sock_diag_table_mutex);
117451 if (sock_diag_handlers[hndl->family])
117452 err = -EBUSY;
117453- else
117454+ else {
117455+ pax_open_kernel();
117456 sock_diag_handlers[hndl->family] = hndl;
117457+ pax_close_kernel();
117458+ }
117459 mutex_unlock(&sock_diag_table_mutex);
117460
117461 return err;
117462@@ -144,7 +147,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
117463
117464 mutex_lock(&sock_diag_table_mutex);
117465 BUG_ON(sock_diag_handlers[family] != hnld);
117466+ pax_open_kernel();
117467 sock_diag_handlers[family] = NULL;
117468+ pax_close_kernel();
117469 mutex_unlock(&sock_diag_table_mutex);
117470 }
117471 EXPORT_SYMBOL_GPL(sock_diag_unregister);
117472diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
117473index 95b6139..3048623 100644
117474--- a/net/core/sysctl_net_core.c
117475+++ b/net/core/sysctl_net_core.c
117476@@ -35,7 +35,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
117477 {
117478 unsigned int orig_size, size;
117479 int ret, i;
117480- struct ctl_table tmp = {
117481+ ctl_table_no_const tmp = {
117482 .data = &size,
117483 .maxlen = sizeof(size),
117484 .mode = table->mode
117485@@ -203,7 +203,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117486 void __user *buffer, size_t *lenp, loff_t *ppos)
117487 {
117488 char id[IFNAMSIZ];
117489- struct ctl_table tbl = {
117490+ ctl_table_no_const tbl = {
117491 .data = id,
117492 .maxlen = IFNAMSIZ,
117493 };
117494@@ -221,7 +221,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117495 static int proc_do_rss_key(struct ctl_table *table, int write,
117496 void __user *buffer, size_t *lenp, loff_t *ppos)
117497 {
117498- struct ctl_table fake_table;
117499+ ctl_table_no_const fake_table;
117500 char buf[NETDEV_RSS_KEY_LEN * 3];
117501
117502 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
117503@@ -285,7 +285,7 @@ static struct ctl_table net_core_table[] = {
117504 .mode = 0444,
117505 .proc_handler = proc_do_rss_key,
117506 },
117507-#ifdef CONFIG_BPF_JIT
117508+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
117509 {
117510 .procname = "bpf_jit_enable",
117511 .data = &bpf_jit_enable,
117512@@ -409,13 +409,12 @@ static struct ctl_table netns_core_table[] = {
117513
117514 static __net_init int sysctl_core_net_init(struct net *net)
117515 {
117516- struct ctl_table *tbl;
117517+ ctl_table_no_const *tbl = NULL;
117518
117519 net->core.sysctl_somaxconn = SOMAXCONN;
117520
117521- tbl = netns_core_table;
117522 if (!net_eq(net, &init_net)) {
117523- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
117524+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
117525 if (tbl == NULL)
117526 goto err_dup;
117527
117528@@ -425,17 +424,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
117529 if (net->user_ns != &init_user_ns) {
117530 tbl[0].procname = NULL;
117531 }
117532- }
117533-
117534- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117535+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117536+ } else
117537+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
117538 if (net->core.sysctl_hdr == NULL)
117539 goto err_reg;
117540
117541 return 0;
117542
117543 err_reg:
117544- if (tbl != netns_core_table)
117545- kfree(tbl);
117546+ kfree(tbl);
117547 err_dup:
117548 return -ENOMEM;
117549 }
117550@@ -450,7 +448,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
117551 kfree(tbl);
117552 }
117553
117554-static __net_initdata struct pernet_operations sysctl_core_ops = {
117555+static __net_initconst struct pernet_operations sysctl_core_ops = {
117556 .init = sysctl_core_net_init,
117557 .exit = sysctl_core_net_exit,
117558 };
117559diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
117560index 754484b..4f4b894 100644
117561--- a/net/decnet/af_decnet.c
117562+++ b/net/decnet/af_decnet.c
117563@@ -466,6 +466,7 @@ static struct proto dn_proto = {
117564 .sysctl_rmem = sysctl_decnet_rmem,
117565 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
117566 .obj_size = sizeof(struct dn_sock),
117567+ .slab_flags = SLAB_USERCOPY,
117568 };
117569
117570 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
117571diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
117572index b2c26b0..41f803e 100644
117573--- a/net/decnet/dn_dev.c
117574+++ b/net/decnet/dn_dev.c
117575@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
117576 .extra1 = &min_t3,
117577 .extra2 = &max_t3
117578 },
117579- {0}
117580+ { }
117581 },
117582 };
117583
117584diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
117585index 5325b54..a0d4d69 100644
117586--- a/net/decnet/sysctl_net_decnet.c
117587+++ b/net/decnet/sysctl_net_decnet.c
117588@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
117589
117590 if (len > *lenp) len = *lenp;
117591
117592- if (copy_to_user(buffer, addr, len))
117593+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
117594 return -EFAULT;
117595
117596 *lenp = len;
117597@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
117598
117599 if (len > *lenp) len = *lenp;
117600
117601- if (copy_to_user(buffer, devname, len))
117602+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
117603 return -EFAULT;
117604
117605 *lenp = len;
117606diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
117607index 392e29a..da953a2 100644
117608--- a/net/dsa/dsa.c
117609+++ b/net/dsa/dsa.c
117610@@ -851,7 +851,7 @@ static struct packet_type dsa_pack_type __read_mostly = {
117611 .func = dsa_switch_rcv,
117612 };
117613
117614-static struct notifier_block dsa_netdevice_nb __read_mostly = {
117615+static struct notifier_block dsa_netdevice_nb = {
117616 .notifier_call = dsa_slave_netdevice_event,
117617 };
117618
117619diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
117620index a2c7e4c..3dc9f67 100644
117621--- a/net/hsr/hsr_netlink.c
117622+++ b/net/hsr/hsr_netlink.c
117623@@ -102,7 +102,7 @@ nla_put_failure:
117624 return -EMSGSIZE;
117625 }
117626
117627-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
117628+static struct rtnl_link_ops hsr_link_ops = {
117629 .kind = "hsr",
117630 .maxtype = IFLA_HSR_MAX,
117631 .policy = hsr_policy,
117632diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
117633index 0ae5822..3fe3627 100644
117634--- a/net/ieee802154/6lowpan/core.c
117635+++ b/net/ieee802154/6lowpan/core.c
117636@@ -219,7 +219,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
117637 dev_put(real_dev);
117638 }
117639
117640-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
117641+static struct rtnl_link_ops lowpan_link_ops = {
117642 .kind = "lowpan",
117643 .priv_size = sizeof(struct lowpan_dev_info),
117644 .setup = lowpan_setup,
117645diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
117646index f46e4d1..dcb7f86 100644
117647--- a/net/ieee802154/6lowpan/reassembly.c
117648+++ b/net/ieee802154/6lowpan/reassembly.c
117649@@ -207,7 +207,7 @@ found:
117650 } else {
117651 fq->q.meat += skb->len;
117652 }
117653- add_frag_mem_limit(&fq->q, skb->truesize);
117654+ add_frag_mem_limit(fq->q.net, skb->truesize);
117655
117656 if (fq->q.flags == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) &&
117657 fq->q.meat == fq->q.len) {
117658@@ -287,7 +287,7 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *prev,
117659 clone->data_len = clone->len;
117660 head->data_len -= clone->len;
117661 head->len -= clone->len;
117662- add_frag_mem_limit(&fq->q, clone->truesize);
117663+ add_frag_mem_limit(fq->q.net, clone->truesize);
117664 }
117665
117666 WARN_ON(head == NULL);
117667@@ -310,7 +310,7 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *prev,
117668 }
117669 fp = next;
117670 }
117671- sub_frag_mem_limit(&fq->q, sum_truesize);
117672+ sub_frag_mem_limit(fq->q.net, sum_truesize);
117673
117674 head->next = NULL;
117675 head->dev = dev;
117676@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
117677
117678 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117679 {
117680- struct ctl_table *table;
117681+ ctl_table_no_const *table = NULL;
117682 struct ctl_table_header *hdr;
117683 struct netns_ieee802154_lowpan *ieee802154_lowpan =
117684 net_ieee802154_lowpan(net);
117685
117686- table = lowpan_frags_ns_ctl_table;
117687 if (!net_eq(net, &init_net)) {
117688- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
117689+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
117690 GFP_KERNEL);
117691 if (table == NULL)
117692 goto err_alloc;
117693@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117694 /* Don't export sysctls to unprivileged users */
117695 if (net->user_ns != &init_user_ns)
117696 table[0].procname = NULL;
117697- }
117698-
117699- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117700+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117701+ } else
117702+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
117703 if (hdr == NULL)
117704 goto err_reg;
117705
117706@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117707 return 0;
117708
117709 err_reg:
117710- if (!net_eq(net, &init_net))
117711- kfree(table);
117712+ kfree(table);
117713 err_alloc:
117714 return -ENOMEM;
117715 }
117716diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
117717index a5aa54e..3bd5f9f 100644
117718--- a/net/ipv4/af_inet.c
117719+++ b/net/ipv4/af_inet.c
117720@@ -1391,7 +1391,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
117721 return ip_recv_error(sk, msg, len, addr_len);
117722 #if IS_ENABLED(CONFIG_IPV6)
117723 if (sk->sk_family == AF_INET6)
117724- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
117725+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
117726 #endif
117727 return -EINVAL;
117728 }
117729diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
117730index 419d23c..2084616 100644
117731--- a/net/ipv4/devinet.c
117732+++ b/net/ipv4/devinet.c
117733@@ -69,7 +69,8 @@
117734
117735 static struct ipv4_devconf ipv4_devconf = {
117736 .data = {
117737- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
117738+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
117739+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
117740 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
117741 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
117742 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
117743@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
117744
117745 static struct ipv4_devconf ipv4_devconf_dflt = {
117746 .data = {
117747- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
117748+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
117749+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
117750 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
117751 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
117752 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
117753@@ -1580,7 +1582,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
117754 idx = 0;
117755 head = &net->dev_index_head[h];
117756 rcu_read_lock();
117757- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
117758+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
117759 net->dev_base_seq;
117760 hlist_for_each_entry_rcu(dev, head, index_hlist) {
117761 if (idx < s_idx)
117762@@ -1899,7 +1901,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
117763 idx = 0;
117764 head = &net->dev_index_head[h];
117765 rcu_read_lock();
117766- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
117767+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
117768 net->dev_base_seq;
117769 hlist_for_each_entry_rcu(dev, head, index_hlist) {
117770 if (idx < s_idx)
117771@@ -2134,7 +2136,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
117772 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
117773 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
117774
117775-static struct devinet_sysctl_table {
117776+static const struct devinet_sysctl_table {
117777 struct ctl_table_header *sysctl_header;
117778 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
117779 } devinet_sysctl = {
117780@@ -2266,7 +2268,7 @@ static __net_init int devinet_init_net(struct net *net)
117781 int err;
117782 struct ipv4_devconf *all, *dflt;
117783 #ifdef CONFIG_SYSCTL
117784- struct ctl_table *tbl = ctl_forward_entry;
117785+ ctl_table_no_const *tbl = NULL;
117786 struct ctl_table_header *forw_hdr;
117787 #endif
117788
117789@@ -2284,7 +2286,7 @@ static __net_init int devinet_init_net(struct net *net)
117790 goto err_alloc_dflt;
117791
117792 #ifdef CONFIG_SYSCTL
117793- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
117794+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
117795 if (!tbl)
117796 goto err_alloc_ctl;
117797
117798@@ -2304,7 +2306,10 @@ static __net_init int devinet_init_net(struct net *net)
117799 goto err_reg_dflt;
117800
117801 err = -ENOMEM;
117802- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
117803+ if (!net_eq(net, &init_net))
117804+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
117805+ else
117806+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
117807 if (!forw_hdr)
117808 goto err_reg_ctl;
117809 net->ipv4.forw_hdr = forw_hdr;
117810@@ -2320,8 +2325,7 @@ err_reg_ctl:
117811 err_reg_dflt:
117812 __devinet_sysctl_unregister(all);
117813 err_reg_all:
117814- if (tbl != ctl_forward_entry)
117815- kfree(tbl);
117816+ kfree(tbl);
117817 err_alloc_ctl:
117818 #endif
117819 if (dflt != &ipv4_devconf_dflt)
117820diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
117821index 872494e..8e0b4d1 100644
117822--- a/net/ipv4/fib_frontend.c
117823+++ b/net/ipv4/fib_frontend.c
117824@@ -1083,12 +1083,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
117825 #ifdef CONFIG_IP_ROUTE_MULTIPATH
117826 fib_sync_up(dev);
117827 #endif
117828- atomic_inc(&net->ipv4.dev_addr_genid);
117829+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
117830 rt_cache_flush(dev_net(dev));
117831 break;
117832 case NETDEV_DOWN:
117833 fib_del_ifaddr(ifa, NULL);
117834- atomic_inc(&net->ipv4.dev_addr_genid);
117835+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
117836 if (!ifa->ifa_dev->ifa_list) {
117837 /* Last address was deleted from this interface.
117838 * Disable IP.
117839@@ -1126,7 +1126,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
117840 #ifdef CONFIG_IP_ROUTE_MULTIPATH
117841 fib_sync_up(dev);
117842 #endif
117843- atomic_inc(&net->ipv4.dev_addr_genid);
117844+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
117845 rt_cache_flush(net);
117846 break;
117847 case NETDEV_DOWN:
117848diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
117849index 8d695b6..752d427a 100644
117850--- a/net/ipv4/fib_semantics.c
117851+++ b/net/ipv4/fib_semantics.c
117852@@ -752,7 +752,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
117853 nh->nh_saddr = inet_select_addr(nh->nh_dev,
117854 nh->nh_gw,
117855 nh->nh_parent->fib_scope);
117856- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
117857+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
117858
117859 return nh->nh_saddr;
117860 }
117861diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
117862index 09b62e1..2871350 100644
117863--- a/net/ipv4/fib_trie.c
117864+++ b/net/ipv4/fib_trie.c
117865@@ -2457,7 +2457,7 @@ static struct key_vector *fib_route_get_idx(struct fib_route_iter *iter,
117866 key = l->key + 1;
117867 iter->pos++;
117868
117869- if (pos-- <= 0)
117870+ if (--pos <= 0)
117871 break;
117872
117873 l = NULL;
117874diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
117875index 5e346a0..d0a7c03 100644
117876--- a/net/ipv4/inet_fragment.c
117877+++ b/net/ipv4/inet_fragment.c
117878@@ -131,34 +131,22 @@ inet_evict_bucket(struct inet_frags *f, struct inet_frag_bucket *hb)
117879 unsigned int evicted = 0;
117880 HLIST_HEAD(expired);
117881
117882-evict_again:
117883 spin_lock(&hb->chain_lock);
117884
117885 hlist_for_each_entry_safe(fq, n, &hb->chain, list) {
117886 if (!inet_fragq_should_evict(fq))
117887 continue;
117888
117889- if (!del_timer(&fq->timer)) {
117890- /* q expiring right now thus increment its refcount so
117891- * it won't be freed under us and wait until the timer
117892- * has finished executing then destroy it
117893- */
117894- atomic_inc(&fq->refcnt);
117895- spin_unlock(&hb->chain_lock);
117896- del_timer_sync(&fq->timer);
117897- inet_frag_put(fq, f);
117898- goto evict_again;
117899- }
117900+ if (!del_timer(&fq->timer))
117901+ continue;
117902
117903- fq->flags |= INET_FRAG_EVICTED;
117904- hlist_del(&fq->list);
117905- hlist_add_head(&fq->list, &expired);
117906+ hlist_add_head(&fq->list_evictor, &expired);
117907 ++evicted;
117908 }
117909
117910 spin_unlock(&hb->chain_lock);
117911
117912- hlist_for_each_entry_safe(fq, n, &expired, list)
117913+ hlist_for_each_entry_safe(fq, n, &expired, list_evictor)
117914 f->frag_expire((unsigned long) fq);
117915
117916 return evicted;
117917@@ -240,19 +228,21 @@ void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f)
117918 int i;
117919
117920 nf->low_thresh = 0;
117921- local_bh_disable();
117922
117923 evict_again:
117924+ local_bh_disable();
117925 seq = read_seqbegin(&f->rnd_seqlock);
117926
117927 for (i = 0; i < INETFRAGS_HASHSZ ; i++)
117928 inet_evict_bucket(f, &f->hash[i]);
117929
117930- if (read_seqretry(&f->rnd_seqlock, seq))
117931+ local_bh_enable();
117932+ cond_resched();
117933+
117934+ if (read_seqretry(&f->rnd_seqlock, seq) ||
117935+ percpu_counter_sum(&nf->mem))
117936 goto evict_again;
117937
117938- local_bh_enable();
117939-
117940 percpu_counter_destroy(&nf->mem);
117941 }
117942 EXPORT_SYMBOL(inet_frags_exit_net);
117943@@ -284,8 +274,8 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f)
117944 struct inet_frag_bucket *hb;
117945
117946 hb = get_frag_bucket_locked(fq, f);
117947- if (!(fq->flags & INET_FRAG_EVICTED))
117948- hlist_del(&fq->list);
117949+ hlist_del(&fq->list);
117950+ fq->flags |= INET_FRAG_COMPLETE;
117951 spin_unlock(&hb->chain_lock);
117952 }
117953
117954@@ -297,7 +287,6 @@ void inet_frag_kill(struct inet_frag_queue *fq, struct inet_frags *f)
117955 if (!(fq->flags & INET_FRAG_COMPLETE)) {
117956 fq_unlink(fq, f);
117957 atomic_dec(&fq->refcnt);
117958- fq->flags |= INET_FRAG_COMPLETE;
117959 }
117960 }
117961 EXPORT_SYMBOL(inet_frag_kill);
117962@@ -330,11 +319,12 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f)
117963 fp = xp;
117964 }
117965 sum = sum_truesize + f->qsize;
117966- sub_frag_mem_limit(q, sum);
117967
117968 if (f->destructor)
117969 f->destructor(q);
117970 kmem_cache_free(f->frags_cachep, q);
117971+
117972+ sub_frag_mem_limit(nf, sum);
117973 }
117974 EXPORT_SYMBOL(inet_frag_destroy);
117975
117976@@ -390,7 +380,7 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf,
117977
117978 q->net = nf;
117979 f->constructor(q, arg);
117980- add_frag_mem_limit(q, f->qsize);
117981+ add_frag_mem_limit(nf, f->qsize);
117982
117983 setup_timer(&q->timer, f->frag_expire, (unsigned long)q);
117984 spin_lock_init(&q->lock);
117985diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
117986index c6fb80b..8705495 100644
117987--- a/net/ipv4/inet_hashtables.c
117988+++ b/net/ipv4/inet_hashtables.c
117989@@ -18,6 +18,7 @@
117990 #include <linux/sched.h>
117991 #include <linux/slab.h>
117992 #include <linux/wait.h>
117993+#include <linux/security.h>
117994
117995 #include <net/inet_connection_sock.h>
117996 #include <net/inet_hashtables.h>
117997@@ -53,6 +54,8 @@ u32 sk_ehashfn(const struct sock *sk)
117998 sk->sk_daddr, sk->sk_dport);
117999 }
118000
118001+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
118002+
118003 /*
118004 * Allocate and initialize a new local port bind bucket.
118005 * The bindhash mutex for snum's hash chain must be held here.
118006@@ -564,6 +567,8 @@ ok:
118007 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
118008 spin_unlock(&head->lock);
118009
118010+ gr_update_task_in_ip_table(inet_sk(sk));
118011+
118012 if (tw) {
118013 inet_twsk_deschedule(tw);
118014 while (twrefcnt) {
118015diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
118016index 241afd7..31b95d5 100644
118017--- a/net/ipv4/inetpeer.c
118018+++ b/net/ipv4/inetpeer.c
118019@@ -461,7 +461,7 @@ relookup:
118020 if (p) {
118021 p->daddr = *daddr;
118022 atomic_set(&p->refcnt, 1);
118023- atomic_set(&p->rid, 0);
118024+ atomic_set_unchecked(&p->rid, 0);
118025 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
118026 p->rate_tokens = 0;
118027 /* 60*HZ is arbitrary, but chosen enough high so that the first
118028diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
118029index cc1da6d..593fc73 100644
118030--- a/net/ipv4/ip_fragment.c
118031+++ b/net/ipv4/ip_fragment.c
118032@@ -192,7 +192,7 @@ static void ip_expire(unsigned long arg)
118033 ipq_kill(qp);
118034 IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS);
118035
118036- if (!(qp->q.flags & INET_FRAG_EVICTED)) {
118037+ if (!inet_frag_evicting(&qp->q)) {
118038 struct sk_buff *head = qp->q.fragments;
118039 const struct iphdr *iph;
118040 int err;
118041@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
118042 return 0;
118043
118044 start = qp->rid;
118045- end = atomic_inc_return(&peer->rid);
118046+ end = atomic_inc_return_unchecked(&peer->rid);
118047 qp->rid = end;
118048
118049 rc = qp->q.fragments && (end - start) > max;
118050@@ -301,7 +301,7 @@ static int ip_frag_reinit(struct ipq *qp)
118051 kfree_skb(fp);
118052 fp = xp;
118053 } while (fp);
118054- sub_frag_mem_limit(&qp->q, sum_truesize);
118055+ sub_frag_mem_limit(qp->q.net, sum_truesize);
118056
118057 qp->q.flags = 0;
118058 qp->q.len = 0;
118059@@ -446,7 +446,7 @@ found:
118060 qp->q.fragments = next;
118061
118062 qp->q.meat -= free_it->len;
118063- sub_frag_mem_limit(&qp->q, free_it->truesize);
118064+ sub_frag_mem_limit(qp->q.net, free_it->truesize);
118065 kfree_skb(free_it);
118066 }
118067 }
118068@@ -470,7 +470,7 @@ found:
118069 qp->q.stamp = skb->tstamp;
118070 qp->q.meat += skb->len;
118071 qp->ecn |= ecn;
118072- add_frag_mem_limit(&qp->q, skb->truesize);
118073+ add_frag_mem_limit(qp->q.net, skb->truesize);
118074 if (offset == 0)
118075 qp->q.flags |= INET_FRAG_FIRST_IN;
118076
118077@@ -573,7 +573,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
118078 head->len -= clone->len;
118079 clone->csum = 0;
118080 clone->ip_summed = head->ip_summed;
118081- add_frag_mem_limit(&qp->q, clone->truesize);
118082+ add_frag_mem_limit(qp->q.net, clone->truesize);
118083 }
118084
118085 skb_push(head, head->data - skb_network_header(head));
118086@@ -601,7 +601,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
118087 }
118088 fp = next;
118089 }
118090- sub_frag_mem_limit(&qp->q, sum_truesize);
118091+ sub_frag_mem_limit(qp->q.net, sum_truesize);
118092
118093 head->next = NULL;
118094 head->dev = dev;
118095@@ -750,12 +750,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
118096
118097 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118098 {
118099- struct ctl_table *table;
118100+ ctl_table_no_const *table = NULL;
118101 struct ctl_table_header *hdr;
118102
118103- table = ip4_frags_ns_ctl_table;
118104 if (!net_eq(net, &init_net)) {
118105- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
118106+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
118107 if (!table)
118108 goto err_alloc;
118109
118110@@ -769,9 +768,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118111 /* Don't export sysctls to unprivileged users */
118112 if (net->user_ns != &init_user_ns)
118113 table[0].procname = NULL;
118114- }
118115+ hdr = register_net_sysctl(net, "net/ipv4", table);
118116+ } else
118117+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
118118
118119- hdr = register_net_sysctl(net, "net/ipv4", table);
118120 if (!hdr)
118121 goto err_reg;
118122
118123@@ -779,8 +779,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118124 return 0;
118125
118126 err_reg:
118127- if (!net_eq(net, &init_net))
118128- kfree(table);
118129+ kfree(table);
118130 err_alloc:
118131 return -ENOMEM;
118132 }
118133diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
118134index 5fd7064..d13d75f 100644
118135--- a/net/ipv4/ip_gre.c
118136+++ b/net/ipv4/ip_gre.c
118137@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
118138 module_param(log_ecn_error, bool, 0644);
118139 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118140
118141-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
118142+static struct rtnl_link_ops ipgre_link_ops;
118143 static int ipgre_tunnel_init(struct net_device *dev);
118144
118145 static int ipgre_net_id __read_mostly;
118146@@ -819,7 +819,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
118147 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
118148 };
118149
118150-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118151+static struct rtnl_link_ops ipgre_link_ops = {
118152 .kind = "gre",
118153 .maxtype = IFLA_GRE_MAX,
118154 .policy = ipgre_policy,
118155@@ -834,7 +834,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118156 .get_link_net = ip_tunnel_get_link_net,
118157 };
118158
118159-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
118160+static struct rtnl_link_ops ipgre_tap_ops = {
118161 .kind = "gretap",
118162 .maxtype = IFLA_GRE_MAX,
118163 .policy = ipgre_policy,
118164diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
118165index 2db4c87..4db9282 100644
118166--- a/net/ipv4/ip_input.c
118167+++ b/net/ipv4/ip_input.c
118168@@ -147,6 +147,10 @@
118169 #include <linux/mroute.h>
118170 #include <linux/netlink.h>
118171
118172+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118173+extern int grsec_enable_blackhole;
118174+#endif
118175+
118176 /*
118177 * Process Router Attention IP option (RFC 2113)
118178 */
118179@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sock *sk, struct sk_buff *skb)
118180 if (!raw) {
118181 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
118182 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
118183+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118184+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
118185+#endif
118186 icmp_send(skb, ICMP_DEST_UNREACH,
118187 ICMP_PROT_UNREACH, 0);
118188 }
118189diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
118190index 6ddde89..653e224 100644
118191--- a/net/ipv4/ip_sockglue.c
118192+++ b/net/ipv4/ip_sockglue.c
118193@@ -1291,7 +1291,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118194 len = min_t(unsigned int, len, opt->optlen);
118195 if (put_user(len, optlen))
118196 return -EFAULT;
118197- if (copy_to_user(optval, opt->__data, len))
118198+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
118199+ copy_to_user(optval, opt->__data, len))
118200 return -EFAULT;
118201 return 0;
118202 }
118203@@ -1425,7 +1426,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118204 if (sk->sk_type != SOCK_STREAM)
118205 return -ENOPROTOOPT;
118206
118207- msg.msg_control = (__force void *) optval;
118208+ msg.msg_control = (__force_kernel void *) optval;
118209 msg.msg_controllen = len;
118210 msg.msg_flags = flags;
118211
118212diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
118213index 0c15208..a3a76c5 100644
118214--- a/net/ipv4/ip_vti.c
118215+++ b/net/ipv4/ip_vti.c
118216@@ -45,7 +45,7 @@
118217 #include <net/net_namespace.h>
118218 #include <net/netns/generic.h>
118219
118220-static struct rtnl_link_ops vti_link_ops __read_mostly;
118221+static struct rtnl_link_ops vti_link_ops;
118222
118223 static int vti_net_id __read_mostly;
118224 static int vti_tunnel_init(struct net_device *dev);
118225@@ -525,7 +525,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
118226 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
118227 };
118228
118229-static struct rtnl_link_ops vti_link_ops __read_mostly = {
118230+static struct rtnl_link_ops vti_link_ops = {
118231 .kind = "vti",
118232 .maxtype = IFLA_VTI_MAX,
118233 .policy = vti_policy,
118234diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
118235index 8e7328c..9bd7ed3 100644
118236--- a/net/ipv4/ipconfig.c
118237+++ b/net/ipv4/ipconfig.c
118238@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
118239
118240 mm_segment_t oldfs = get_fs();
118241 set_fs(get_ds());
118242- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118243+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118244 set_fs(oldfs);
118245 return res;
118246 }
118247@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
118248
118249 mm_segment_t oldfs = get_fs();
118250 set_fs(get_ds());
118251- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118252+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118253 set_fs(oldfs);
118254 return res;
118255 }
118256@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
118257
118258 mm_segment_t oldfs = get_fs();
118259 set_fs(get_ds());
118260- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
118261+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
118262 set_fs(oldfs);
118263 return res;
118264 }
118265diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
118266index ff96396..2e928ba 100644
118267--- a/net/ipv4/ipip.c
118268+++ b/net/ipv4/ipip.c
118269@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118270 static int ipip_net_id __read_mostly;
118271
118272 static int ipip_tunnel_init(struct net_device *dev);
118273-static struct rtnl_link_ops ipip_link_ops __read_mostly;
118274+static struct rtnl_link_ops ipip_link_ops;
118275
118276 static int ipip_err(struct sk_buff *skb, u32 info)
118277 {
118278@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
118279 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
118280 };
118281
118282-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
118283+static struct rtnl_link_ops ipip_link_ops = {
118284 .kind = "ipip",
118285 .maxtype = IFLA_IPTUN_MAX,
118286 .policy = ipip_policy,
118287diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
118288index a612007..99ac4bc5 100644
118289--- a/net/ipv4/netfilter/arp_tables.c
118290+++ b/net/ipv4/netfilter/arp_tables.c
118291@@ -884,14 +884,14 @@ static int compat_table_info(const struct xt_table_info *info,
118292 #endif
118293
118294 static int get_info(struct net *net, void __user *user,
118295- const int *len, int compat)
118296+ int len, int compat)
118297 {
118298 char name[XT_TABLE_MAXNAMELEN];
118299 struct xt_table *t;
118300 int ret;
118301
118302- if (*len != sizeof(struct arpt_getinfo)) {
118303- duprintf("length %u != %Zu\n", *len,
118304+ if (len != sizeof(struct arpt_getinfo)) {
118305+ duprintf("length %u != %Zu\n", len,
118306 sizeof(struct arpt_getinfo));
118307 return -EINVAL;
118308 }
118309@@ -928,7 +928,7 @@ static int get_info(struct net *net, void __user *user,
118310 info.size = private->size;
118311 strcpy(info.name, name);
118312
118313- if (copy_to_user(user, &info, *len) != 0)
118314+ if (copy_to_user(user, &info, len) != 0)
118315 ret = -EFAULT;
118316 else
118317 ret = 0;
118318@@ -1695,7 +1695,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
118319
118320 switch (cmd) {
118321 case ARPT_SO_GET_INFO:
118322- ret = get_info(sock_net(sk), user, len, 1);
118323+ ret = get_info(sock_net(sk), user, *len, 1);
118324 break;
118325 case ARPT_SO_GET_ENTRIES:
118326 ret = compat_get_entries(sock_net(sk), user, len);
118327@@ -1740,7 +1740,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
118328
118329 switch (cmd) {
118330 case ARPT_SO_GET_INFO:
118331- ret = get_info(sock_net(sk), user, len, 0);
118332+ ret = get_info(sock_net(sk), user, *len, 0);
118333 break;
118334
118335 case ARPT_SO_GET_ENTRIES:
118336diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
118337index 2d0e265..67e5b8d 100644
118338--- a/net/ipv4/netfilter/ip_tables.c
118339+++ b/net/ipv4/netfilter/ip_tables.c
118340@@ -1072,14 +1072,14 @@ static int compat_table_info(const struct xt_table_info *info,
118341 #endif
118342
118343 static int get_info(struct net *net, void __user *user,
118344- const int *len, int compat)
118345+ int len, int compat)
118346 {
118347 char name[XT_TABLE_MAXNAMELEN];
118348 struct xt_table *t;
118349 int ret;
118350
118351- if (*len != sizeof(struct ipt_getinfo)) {
118352- duprintf("length %u != %zu\n", *len,
118353+ if (len != sizeof(struct ipt_getinfo)) {
118354+ duprintf("length %u != %zu\n", len,
118355 sizeof(struct ipt_getinfo));
118356 return -EINVAL;
118357 }
118358@@ -1116,7 +1116,7 @@ static int get_info(struct net *net, void __user *user,
118359 info.size = private->size;
118360 strcpy(info.name, name);
118361
118362- if (copy_to_user(user, &info, *len) != 0)
118363+ if (copy_to_user(user, &info, len) != 0)
118364 ret = -EFAULT;
118365 else
118366 ret = 0;
118367@@ -1978,7 +1978,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118368
118369 switch (cmd) {
118370 case IPT_SO_GET_INFO:
118371- ret = get_info(sock_net(sk), user, len, 1);
118372+ ret = get_info(sock_net(sk), user, *len, 1);
118373 break;
118374 case IPT_SO_GET_ENTRIES:
118375 ret = compat_get_entries(sock_net(sk), user, len);
118376@@ -2025,7 +2025,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118377
118378 switch (cmd) {
118379 case IPT_SO_GET_INFO:
118380- ret = get_info(sock_net(sk), user, len, 0);
118381+ ret = get_info(sock_net(sk), user, *len, 0);
118382 break;
118383
118384 case IPT_SO_GET_ENTRIES:
118385diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118386index 771ab3d..5b99b18 100644
118387--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
118388+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118389@@ -725,7 +725,7 @@ static int clusterip_net_init(struct net *net)
118390 spin_lock_init(&cn->lock);
118391
118392 #ifdef CONFIG_PROC_FS
118393- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
118394+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
118395 if (!cn->procdir) {
118396 pr_err("Unable to proc dir entry\n");
118397 return -ENOMEM;
118398diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
118399index 05ff44b..da00000 100644
118400--- a/net/ipv4/ping.c
118401+++ b/net/ipv4/ping.c
118402@@ -59,7 +59,7 @@ struct ping_table {
118403 };
118404
118405 static struct ping_table ping_table;
118406-struct pingv6_ops pingv6_ops;
118407+struct pingv6_ops *pingv6_ops;
118408 EXPORT_SYMBOL_GPL(pingv6_ops);
118409
118410 static u16 ping_port_rover;
118411@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
118412 return -ENODEV;
118413 }
118414 }
118415- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
118416+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
118417 scoped);
118418 rcu_read_unlock();
118419
118420@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118421 }
118422 #if IS_ENABLED(CONFIG_IPV6)
118423 } else if (skb->protocol == htons(ETH_P_IPV6)) {
118424- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
118425+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
118426 #endif
118427 }
118428
118429@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118430 info, (u8 *)icmph);
118431 #if IS_ENABLED(CONFIG_IPV6)
118432 } else if (family == AF_INET6) {
118433- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
118434+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
118435 info, (u8 *)icmph);
118436 #endif
118437 }
118438@@ -918,10 +918,10 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
118439 }
118440
118441 if (inet6_sk(sk)->rxopt.all)
118442- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
118443+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
118444 if (skb->protocol == htons(ETH_P_IPV6) &&
118445 inet6_sk(sk)->rxopt.all)
118446- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
118447+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
118448 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
118449 ip_cmsg_recv(msg, skb);
118450 #endif
118451@@ -1116,7 +1116,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
118452 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
118453 0, sock_i_ino(sp),
118454 atomic_read(&sp->sk_refcnt), sp,
118455- atomic_read(&sp->sk_drops));
118456+ atomic_read_unchecked(&sp->sk_drops));
118457 }
118458
118459 static int ping_v4_seq_show(struct seq_file *seq, void *v)
118460diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
118461index 561cd4b..a32a155 100644
118462--- a/net/ipv4/raw.c
118463+++ b/net/ipv4/raw.c
118464@@ -323,7 +323,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
118465 int raw_rcv(struct sock *sk, struct sk_buff *skb)
118466 {
118467 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
118468- atomic_inc(&sk->sk_drops);
118469+ atomic_inc_unchecked(&sk->sk_drops);
118470 kfree_skb(skb);
118471 return NET_RX_DROP;
118472 }
118473@@ -771,16 +771,20 @@ static int raw_init(struct sock *sk)
118474
118475 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
118476 {
118477+ struct icmp_filter filter;
118478+
118479 if (optlen > sizeof(struct icmp_filter))
118480 optlen = sizeof(struct icmp_filter);
118481- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
118482+ if (copy_from_user(&filter, optval, optlen))
118483 return -EFAULT;
118484+ raw_sk(sk)->filter = filter;
118485 return 0;
118486 }
118487
118488 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
118489 {
118490 int len, ret = -EFAULT;
118491+ struct icmp_filter filter;
118492
118493 if (get_user(len, optlen))
118494 goto out;
118495@@ -790,8 +794,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
118496 if (len > sizeof(struct icmp_filter))
118497 len = sizeof(struct icmp_filter);
118498 ret = -EFAULT;
118499- if (put_user(len, optlen) ||
118500- copy_to_user(optval, &raw_sk(sk)->filter, len))
118501+ filter = raw_sk(sk)->filter;
118502+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
118503 goto out;
118504 ret = 0;
118505 out: return ret;
118506@@ -1020,7 +1024,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
118507 0, 0L, 0,
118508 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
118509 0, sock_i_ino(sp),
118510- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
118511+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
118512 }
118513
118514 static int raw_seq_show(struct seq_file *seq, void *v)
118515diff --git a/net/ipv4/route.c b/net/ipv4/route.c
118516index f45f2a1..e7d47a3 100644
118517--- a/net/ipv4/route.c
118518+++ b/net/ipv4/route.c
118519@@ -227,7 +227,7 @@ static const struct seq_operations rt_cache_seq_ops = {
118520
118521 static int rt_cache_seq_open(struct inode *inode, struct file *file)
118522 {
118523- return seq_open(file, &rt_cache_seq_ops);
118524+ return seq_open_restrict(file, &rt_cache_seq_ops);
118525 }
118526
118527 static const struct file_operations rt_cache_seq_fops = {
118528@@ -318,7 +318,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
118529
118530 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
118531 {
118532- return seq_open(file, &rt_cpu_seq_ops);
118533+ return seq_open_restrict(file, &rt_cpu_seq_ops);
118534 }
118535
118536 static const struct file_operations rt_cpu_seq_fops = {
118537@@ -356,7 +356,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
118538
118539 static int rt_acct_proc_open(struct inode *inode, struct file *file)
118540 {
118541- return single_open(file, rt_acct_proc_show, NULL);
118542+ return single_open_restrict(file, rt_acct_proc_show, NULL);
118543 }
118544
118545 static const struct file_operations rt_acct_proc_fops = {
118546@@ -458,11 +458,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
118547
118548 #define IP_IDENTS_SZ 2048u
118549 struct ip_ident_bucket {
118550- atomic_t id;
118551+ atomic_unchecked_t id;
118552 u32 stamp32;
118553 };
118554
118555-static struct ip_ident_bucket *ip_idents __read_mostly;
118556+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
118557
118558 /* In order to protect privacy, we add a perturbation to identifiers
118559 * if one generator is seldom used. This makes hard for an attacker
118560@@ -478,7 +478,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
118561 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
118562 delta = prandom_u32_max(now - old);
118563
118564- return atomic_add_return(segs + delta, &bucket->id) - segs;
118565+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
118566 }
118567 EXPORT_SYMBOL(ip_idents_reserve);
118568
118569@@ -2641,34 +2641,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
118570 .maxlen = sizeof(int),
118571 .mode = 0200,
118572 .proc_handler = ipv4_sysctl_rtcache_flush,
118573+ .extra1 = &init_net,
118574 },
118575 { },
118576 };
118577
118578 static __net_init int sysctl_route_net_init(struct net *net)
118579 {
118580- struct ctl_table *tbl;
118581+ ctl_table_no_const *tbl = NULL;
118582
118583- tbl = ipv4_route_flush_table;
118584 if (!net_eq(net, &init_net)) {
118585- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118586+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118587 if (!tbl)
118588 goto err_dup;
118589
118590 /* Don't export sysctls to unprivileged users */
118591 if (net->user_ns != &init_user_ns)
118592 tbl[0].procname = NULL;
118593- }
118594- tbl[0].extra1 = net;
118595+ tbl[0].extra1 = net;
118596+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118597+ } else
118598+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
118599
118600- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118601 if (!net->ipv4.route_hdr)
118602 goto err_reg;
118603 return 0;
118604
118605 err_reg:
118606- if (tbl != ipv4_route_flush_table)
118607- kfree(tbl);
118608+ kfree(tbl);
118609 err_dup:
118610 return -ENOMEM;
118611 }
118612@@ -2691,8 +2691,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
118613
118614 static __net_init int rt_genid_init(struct net *net)
118615 {
118616- atomic_set(&net->ipv4.rt_genid, 0);
118617- atomic_set(&net->fnhe_genid, 0);
118618+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
118619+ atomic_set_unchecked(&net->fnhe_genid, 0);
118620 get_random_bytes(&net->ipv4.dev_addr_genid,
118621 sizeof(net->ipv4.dev_addr_genid));
118622 return 0;
118623@@ -2736,11 +2736,7 @@ int __init ip_rt_init(void)
118624 int rc = 0;
118625 int cpu;
118626
118627- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
118628- if (!ip_idents)
118629- panic("IP: failed to allocate ip_idents\n");
118630-
118631- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
118632+ prandom_bytes(ip_idents, sizeof(ip_idents));
118633
118634 for_each_possible_cpu(cpu) {
118635 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
118636diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
118637index c3852a7..7bdbde7 100644
118638--- a/net/ipv4/sysctl_net_ipv4.c
118639+++ b/net/ipv4/sysctl_net_ipv4.c
118640@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
118641 container_of(table->data, struct net, ipv4.ip_local_ports.range);
118642 int ret;
118643 int range[2];
118644- struct ctl_table tmp = {
118645+ ctl_table_no_const tmp = {
118646 .data = &range,
118647 .maxlen = sizeof(range),
118648 .mode = table->mode,
118649@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
118650 int ret;
118651 gid_t urange[2];
118652 kgid_t low, high;
118653- struct ctl_table tmp = {
118654+ ctl_table_no_const tmp = {
118655 .data = &urange,
118656 .maxlen = sizeof(urange),
118657 .mode = table->mode,
118658@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
118659 void __user *buffer, size_t *lenp, loff_t *ppos)
118660 {
118661 char val[TCP_CA_NAME_MAX];
118662- struct ctl_table tbl = {
118663+ ctl_table_no_const tbl = {
118664 .data = val,
118665 .maxlen = TCP_CA_NAME_MAX,
118666 };
118667@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
118668 void __user *buffer, size_t *lenp,
118669 loff_t *ppos)
118670 {
118671- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
118672+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
118673 int ret;
118674
118675 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118676@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
118677 void __user *buffer, size_t *lenp,
118678 loff_t *ppos)
118679 {
118680- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
118681+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
118682 int ret;
118683
118684 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118685@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
118686 void __user *buffer, size_t *lenp,
118687 loff_t *ppos)
118688 {
118689- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118690+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118691 struct tcp_fastopen_context *ctxt;
118692 int ret;
118693 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
118694@@ -902,13 +902,12 @@ static struct ctl_table ipv4_net_table[] = {
118695
118696 static __net_init int ipv4_sysctl_init_net(struct net *net)
118697 {
118698- struct ctl_table *table;
118699+ ctl_table_no_const *table = NULL;
118700
118701- table = ipv4_net_table;
118702 if (!net_eq(net, &init_net)) {
118703 int i;
118704
118705- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
118706+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
118707 if (!table)
118708 goto err_alloc;
118709
118710@@ -917,7 +916,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
118711 table[i].data += (void *)net - (void *)&init_net;
118712 }
118713
118714- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118715+ if (!net_eq(net, &init_net))
118716+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118717+ else
118718+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
118719 if (!net->ipv4.ipv4_hdr)
118720 goto err_reg;
118721
118722diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
118723index c9ab964..607d9f7 100644
118724--- a/net/ipv4/tcp_input.c
118725+++ b/net/ipv4/tcp_input.c
118726@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
118727 * without any lock. We want to make sure compiler wont store
118728 * intermediate values in this location.
118729 */
118730- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
118731+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
118732 sk->sk_max_pacing_rate);
118733 }
118734
118735@@ -4610,7 +4610,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
118736 * simplifies code)
118737 */
118738 static void
118739-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
118740+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
118741 struct sk_buff *head, struct sk_buff *tail,
118742 u32 start, u32 end)
118743 {
118744@@ -5605,6 +5605,7 @@ discard:
118745 tcp_paws_reject(&tp->rx_opt, 0))
118746 goto discard_and_undo;
118747
118748+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
118749 if (th->syn) {
118750 /* We see SYN without ACK. It is attempt of
118751 * simultaneous connect with crossed SYNs.
118752@@ -5655,6 +5656,7 @@ discard:
118753 goto discard;
118754 #endif
118755 }
118756+#endif
118757 /* "fifth, if neither of the SYN or RST bits is set then
118758 * drop the segment and return."
118759 */
118760@@ -5701,7 +5703,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
118761 goto discard;
118762
118763 if (th->syn) {
118764- if (th->fin)
118765+ if (th->fin || th->urg || th->psh)
118766 goto discard;
118767 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
118768 return 1;
118769diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
118770index fc1c658..4de4e33 100644
118771--- a/net/ipv4/tcp_ipv4.c
118772+++ b/net/ipv4/tcp_ipv4.c
118773@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
118774 int sysctl_tcp_low_latency __read_mostly;
118775 EXPORT_SYMBOL(sysctl_tcp_low_latency);
118776
118777+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118778+extern int grsec_enable_blackhole;
118779+#endif
118780+
118781 #ifdef CONFIG_TCP_MD5SIG
118782 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
118783 __be32 daddr, __be32 saddr, const struct tcphdr *th);
118784@@ -1348,7 +1352,7 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
118785 req = inet_csk_search_req(sk, th->source, iph->saddr, iph->daddr);
118786 if (req) {
118787 nsk = tcp_check_req(sk, skb, req, false);
118788- if (!nsk)
118789+ if (!nsk || nsk == sk)
118790 reqsk_put(req);
118791 return nsk;
118792 }
118793@@ -1427,6 +1431,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
118794 return 0;
118795
118796 reset:
118797+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118798+ if (!grsec_enable_blackhole)
118799+#endif
118800 tcp_v4_send_reset(rsk, skb);
118801 discard:
118802 kfree_skb(skb);
118803@@ -1591,12 +1598,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
118804 TCP_SKB_CB(skb)->sacked = 0;
118805
118806 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
118807- if (!sk)
118808+ if (!sk) {
118809+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118810+ ret = 1;
118811+#endif
118812 goto no_tcp_socket;
118813-
118814+ }
118815 process:
118816- if (sk->sk_state == TCP_TIME_WAIT)
118817+ if (sk->sk_state == TCP_TIME_WAIT) {
118818+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118819+ ret = 2;
118820+#endif
118821 goto do_time_wait;
118822+ }
118823
118824 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
118825 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
118826@@ -1652,6 +1666,10 @@ csum_error:
118827 bad_packet:
118828 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
118829 } else {
118830+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118831+ if (!grsec_enable_blackhole || (ret == 1 &&
118832+ (skb->dev->flags & IFF_LOOPBACK)))
118833+#endif
118834 tcp_v4_send_reset(NULL, skb);
118835 }
118836
118837diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
118838index 17e7339..c72ff6c 100644
118839--- a/net/ipv4/tcp_minisocks.c
118840+++ b/net/ipv4/tcp_minisocks.c
118841@@ -27,6 +27,10 @@
118842 #include <net/inet_common.h>
118843 #include <net/xfrm.h>
118844
118845+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118846+extern int grsec_enable_blackhole;
118847+#endif
118848+
118849 int sysctl_tcp_syncookies __read_mostly = 1;
118850 EXPORT_SYMBOL(sysctl_tcp_syncookies);
118851
118852@@ -778,7 +782,10 @@ embryonic_reset:
118853 * avoid becoming vulnerable to outside attack aiming at
118854 * resetting legit local connections.
118855 */
118856- req->rsk_ops->send_reset(sk, skb);
118857+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118858+ if (!grsec_enable_blackhole)
118859+#endif
118860+ req->rsk_ops->send_reset(sk, skb);
118861 } else if (fastopen) { /* received a valid RST pkt */
118862 reqsk_fastopen_remove(sk, req, true);
118863 tcp_reset(sk);
118864diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
118865index ebf5ff5..4d1ff32 100644
118866--- a/net/ipv4/tcp_probe.c
118867+++ b/net/ipv4/tcp_probe.c
118868@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
118869 if (cnt + width >= len)
118870 break;
118871
118872- if (copy_to_user(buf + cnt, tbuf, width))
118873+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
118874 return -EFAULT;
118875 cnt += width;
118876 }
118877diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
118878index 8c65dc1..55fd1ba 100644
118879--- a/net/ipv4/tcp_timer.c
118880+++ b/net/ipv4/tcp_timer.c
118881@@ -22,6 +22,10 @@
118882 #include <linux/gfp.h>
118883 #include <net/tcp.h>
118884
118885+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118886+extern int grsec_lastack_retries;
118887+#endif
118888+
118889 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
118890 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
118891 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
118892@@ -195,6 +199,13 @@ static int tcp_write_timeout(struct sock *sk)
118893 }
118894 }
118895
118896+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118897+ if ((sk->sk_state == TCP_LAST_ACK) &&
118898+ (grsec_lastack_retries > 0) &&
118899+ (grsec_lastack_retries < retry_until))
118900+ retry_until = grsec_lastack_retries;
118901+#endif
118902+
118903 if (retransmits_timed_out(sk, retry_until,
118904 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
118905 /* Has it gone just too far? */
118906diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
118907index 83aa604..dbfddf5 100644
118908--- a/net/ipv4/udp.c
118909+++ b/net/ipv4/udp.c
118910@@ -87,6 +87,7 @@
118911 #include <linux/types.h>
118912 #include <linux/fcntl.h>
118913 #include <linux/module.h>
118914+#include <linux/security.h>
118915 #include <linux/socket.h>
118916 #include <linux/sockios.h>
118917 #include <linux/igmp.h>
118918@@ -115,6 +116,10 @@
118919 #include <net/busy_poll.h>
118920 #include "udp_impl.h"
118921
118922+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118923+extern int grsec_enable_blackhole;
118924+#endif
118925+
118926 struct udp_table udp_table __read_mostly;
118927 EXPORT_SYMBOL(udp_table);
118928
118929@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
118930 return true;
118931 }
118932
118933+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
118934+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
118935+
118936 /*
118937 * This routine is called by the ICMP module when it gets some
118938 * sort of error condition. If err < 0 then the socket should
118939@@ -944,9 +952,18 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
118940 dport = usin->sin_port;
118941 if (dport == 0)
118942 return -EINVAL;
118943+
118944+ err = gr_search_udp_sendmsg(sk, usin);
118945+ if (err)
118946+ return err;
118947 } else {
118948 if (sk->sk_state != TCP_ESTABLISHED)
118949 return -EDESTADDRREQ;
118950+
118951+ err = gr_search_udp_sendmsg(sk, NULL);
118952+ if (err)
118953+ return err;
118954+
118955 daddr = inet->inet_daddr;
118956 dport = inet->inet_dport;
118957 /* Open fast path for connected socket.
118958@@ -1193,7 +1210,7 @@ static unsigned int first_packet_length(struct sock *sk)
118959 IS_UDPLITE(sk));
118960 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
118961 IS_UDPLITE(sk));
118962- atomic_inc(&sk->sk_drops);
118963+ atomic_inc_unchecked(&sk->sk_drops);
118964 __skb_unlink(skb, rcvq);
118965 __skb_queue_tail(&list_kill, skb);
118966 }
118967@@ -1273,6 +1290,10 @@ try_again:
118968 if (!skb)
118969 goto out;
118970
118971+ err = gr_search_udp_recvmsg(sk, skb);
118972+ if (err)
118973+ goto out_free;
118974+
118975 ulen = skb->len - sizeof(struct udphdr);
118976 copied = len;
118977 if (copied > ulen)
118978@@ -1305,7 +1326,7 @@ try_again:
118979 if (unlikely(err)) {
118980 trace_kfree_skb(skb, udp_recvmsg);
118981 if (!peeked) {
118982- atomic_inc(&sk->sk_drops);
118983+ atomic_inc_unchecked(&sk->sk_drops);
118984 UDP_INC_STATS_USER(sock_net(sk),
118985 UDP_MIB_INERRORS, is_udplite);
118986 }
118987@@ -1599,7 +1620,7 @@ csum_error:
118988 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
118989 drop:
118990 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
118991- atomic_inc(&sk->sk_drops);
118992+ atomic_inc_unchecked(&sk->sk_drops);
118993 kfree_skb(skb);
118994 return -1;
118995 }
118996@@ -1617,7 +1638,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
118997 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
118998
118999 if (!skb1) {
119000- atomic_inc(&sk->sk_drops);
119001+ atomic_inc_unchecked(&sk->sk_drops);
119002 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
119003 IS_UDPLITE(sk));
119004 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
119005@@ -1823,6 +1844,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
119006 goto csum_error;
119007
119008 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
119009+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119010+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
119011+#endif
119012 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
119013
119014 /*
119015@@ -2420,7 +2444,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
119016 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
119017 0, sock_i_ino(sp),
119018 atomic_read(&sp->sk_refcnt), sp,
119019- atomic_read(&sp->sk_drops));
119020+ atomic_read_unchecked(&sp->sk_drops));
119021 }
119022
119023 int udp4_seq_show(struct seq_file *seq, void *v)
119024diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
119025index bff6974..c63736c 100644
119026--- a/net/ipv4/xfrm4_policy.c
119027+++ b/net/ipv4/xfrm4_policy.c
119028@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
119029 fl4->flowi4_tos = iph->tos;
119030 }
119031
119032-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
119033+static int xfrm4_garbage_collect(struct dst_ops *ops)
119034 {
119035 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
119036
119037- xfrm4_policy_afinfo.garbage_collect(net);
119038+ xfrm_garbage_collect_deferred(net);
119039 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
119040 }
119041
119042@@ -268,19 +268,18 @@ static struct ctl_table xfrm4_policy_table[] = {
119043
119044 static int __net_init xfrm4_net_init(struct net *net)
119045 {
119046- struct ctl_table *table;
119047+ ctl_table_no_const *table = NULL;
119048 struct ctl_table_header *hdr;
119049
119050- table = xfrm4_policy_table;
119051 if (!net_eq(net, &init_net)) {
119052- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
119053+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
119054 if (!table)
119055 goto err_alloc;
119056
119057 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
119058- }
119059-
119060- hdr = register_net_sysctl(net, "net/ipv4", table);
119061+ hdr = register_net_sysctl(net, "net/ipv4", table);
119062+ } else
119063+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
119064 if (!hdr)
119065 goto err_reg;
119066
119067@@ -288,8 +287,7 @@ static int __net_init xfrm4_net_init(struct net *net)
119068 return 0;
119069
119070 err_reg:
119071- if (!net_eq(net, &init_net))
119072- kfree(table);
119073+ kfree(table);
119074 err_alloc:
119075 return -ENOMEM;
119076 }
119077diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
119078index 37b70e8..1475ab7 100644
119079--- a/net/ipv6/addrconf.c
119080+++ b/net/ipv6/addrconf.c
119081@@ -178,7 +178,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
119082 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
119083 .mtu6 = IPV6_MIN_MTU,
119084 .accept_ra = 1,
119085- .accept_redirects = 1,
119086+ .accept_redirects = 0,
119087 .autoconf = 1,
119088 .force_mld_version = 0,
119089 .mldv1_unsolicited_report_interval = 10 * HZ,
119090@@ -219,7 +219,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
119091 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
119092 .mtu6 = IPV6_MIN_MTU,
119093 .accept_ra = 1,
119094- .accept_redirects = 1,
119095+ .accept_redirects = 0,
119096 .autoconf = 1,
119097 .force_mld_version = 0,
119098 .mldv1_unsolicited_report_interval = 10 * HZ,
119099@@ -620,7 +620,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
119100 idx = 0;
119101 head = &net->dev_index_head[h];
119102 rcu_read_lock();
119103- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
119104+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
119105 net->dev_base_seq;
119106 hlist_for_each_entry_rcu(dev, head, index_hlist) {
119107 if (idx < s_idx)
119108@@ -2506,7 +2506,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
119109 p.iph.ihl = 5;
119110 p.iph.protocol = IPPROTO_IPV6;
119111 p.iph.ttl = 64;
119112- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
119113+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
119114
119115 if (ops->ndo_do_ioctl) {
119116 mm_segment_t oldfs = get_fs();
119117@@ -3772,16 +3772,23 @@ static const struct file_operations if6_fops = {
119118 .release = seq_release_net,
119119 };
119120
119121+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
119122+extern void unregister_ipv6_seq_ops_addr(void);
119123+
119124 static int __net_init if6_proc_net_init(struct net *net)
119125 {
119126- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
119127+ register_ipv6_seq_ops_addr(&if6_seq_ops);
119128+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
119129+ unregister_ipv6_seq_ops_addr();
119130 return -ENOMEM;
119131+ }
119132 return 0;
119133 }
119134
119135 static void __net_exit if6_proc_net_exit(struct net *net)
119136 {
119137 remove_proc_entry("if_inet6", net->proc_net);
119138+ unregister_ipv6_seq_ops_addr();
119139 }
119140
119141 static struct pernet_operations if6_proc_net_ops = {
119142@@ -4400,7 +4407,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
119143 s_ip_idx = ip_idx = cb->args[2];
119144
119145 rcu_read_lock();
119146- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119147+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119148 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
119149 idx = 0;
119150 head = &net->dev_index_head[h];
119151@@ -5057,7 +5064,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119152 rt_genid_bump_ipv6(net);
119153 break;
119154 }
119155- atomic_inc(&net->ipv6.dev_addr_genid);
119156+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
119157 }
119158
119159 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119160@@ -5077,7 +5084,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
119161 int *valp = ctl->data;
119162 int val = *valp;
119163 loff_t pos = *ppos;
119164- struct ctl_table lctl;
119165+ ctl_table_no_const lctl;
119166 int ret;
119167
119168 /*
119169@@ -5102,7 +5109,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
119170 {
119171 struct inet6_dev *idev = ctl->extra1;
119172 int min_mtu = IPV6_MIN_MTU;
119173- struct ctl_table lctl;
119174+ ctl_table_no_const lctl;
119175
119176 lctl = *ctl;
119177 lctl.extra1 = &min_mtu;
119178@@ -5177,7 +5184,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
119179 int *valp = ctl->data;
119180 int val = *valp;
119181 loff_t pos = *ppos;
119182- struct ctl_table lctl;
119183+ ctl_table_no_const lctl;
119184 int ret;
119185
119186 /*
119187@@ -5242,7 +5249,7 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write,
119188 int err;
119189 struct in6_addr addr;
119190 char str[IPV6_MAX_STRLEN];
119191- struct ctl_table lctl = *ctl;
119192+ ctl_table_no_const lctl = *ctl;
119193 struct net *net = ctl->extra2;
119194 struct ipv6_stable_secret *secret = ctl->data;
119195
119196diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
119197index eef63b3..d68f5da 100644
119198--- a/net/ipv6/af_inet6.c
119199+++ b/net/ipv6/af_inet6.c
119200@@ -768,7 +768,7 @@ static int __net_init inet6_net_init(struct net *net)
119201 net->ipv6.sysctl.auto_flowlabels = 0;
119202 net->ipv6.sysctl.idgen_retries = 3;
119203 net->ipv6.sysctl.idgen_delay = 1 * HZ;
119204- atomic_set(&net->ipv6.fib6_sernum, 1);
119205+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
119206
119207 err = ipv6_init_mibs(net);
119208 if (err)
119209diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
119210index 62d908e..bac79a9 100644
119211--- a/net/ipv6/datagram.c
119212+++ b/net/ipv6/datagram.c
119213@@ -967,5 +967,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
119214 0,
119215 sock_i_ino(sp),
119216 atomic_read(&sp->sk_refcnt), sp,
119217- atomic_read(&sp->sk_drops));
119218+ atomic_read_unchecked(&sp->sk_drops));
119219 }
119220diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
119221index 2c2b5d5..cc01abd 100644
119222--- a/net/ipv6/icmp.c
119223+++ b/net/ipv6/icmp.c
119224@@ -1004,7 +1004,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
119225
119226 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
119227 {
119228- struct ctl_table *table;
119229+ ctl_table_no_const *table;
119230
119231 table = kmemdup(ipv6_icmp_table_template,
119232 sizeof(ipv6_icmp_table_template),
119233diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
119234index bde57b1..5b45dbb 100644
119235--- a/net/ipv6/ip6_fib.c
119236+++ b/net/ipv6/ip6_fib.c
119237@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
119238 int new, old;
119239
119240 do {
119241- old = atomic_read(&net->ipv6.fib6_sernum);
119242+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
119243 new = old < INT_MAX ? old + 1 : 1;
119244- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
119245+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
119246 old, new) != old);
119247 return new;
119248 }
119249diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
119250index a38d3ac..d02e37d 100644
119251--- a/net/ipv6/ip6_gre.c
119252+++ b/net/ipv6/ip6_gre.c
119253@@ -71,8 +71,8 @@ struct ip6gre_net {
119254 struct net_device *fb_tunnel_dev;
119255 };
119256
119257-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
119258-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
119259+static struct rtnl_link_ops ip6gre_link_ops;
119260+static struct rtnl_link_ops ip6gre_tap_ops;
119261 static int ip6gre_tunnel_init(struct net_device *dev);
119262 static void ip6gre_tunnel_setup(struct net_device *dev);
119263 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
119264@@ -1280,7 +1280,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
119265 }
119266
119267
119268-static struct inet6_protocol ip6gre_protocol __read_mostly = {
119269+static struct inet6_protocol ip6gre_protocol = {
119270 .handler = ip6gre_rcv,
119271 .err_handler = ip6gre_err,
119272 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
119273@@ -1639,7 +1639,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
119274 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
119275 };
119276
119277-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119278+static struct rtnl_link_ops ip6gre_link_ops = {
119279 .kind = "ip6gre",
119280 .maxtype = IFLA_GRE_MAX,
119281 .policy = ip6gre_policy,
119282@@ -1654,7 +1654,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119283 .get_link_net = ip6_tnl_get_link_net,
119284 };
119285
119286-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
119287+static struct rtnl_link_ops ip6gre_tap_ops = {
119288 .kind = "ip6gretap",
119289 .maxtype = IFLA_GRE_MAX,
119290 .policy = ip6gre_policy,
119291diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
119292index 5cafd92..d5aead4 100644
119293--- a/net/ipv6/ip6_tunnel.c
119294+++ b/net/ipv6/ip6_tunnel.c
119295@@ -80,7 +80,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119296
119297 static int ip6_tnl_dev_init(struct net_device *dev);
119298 static void ip6_tnl_dev_setup(struct net_device *dev);
119299-static struct rtnl_link_ops ip6_link_ops __read_mostly;
119300+static struct rtnl_link_ops ip6_link_ops;
119301
119302 static int ip6_tnl_net_id __read_mostly;
119303 struct ip6_tnl_net {
119304@@ -1776,7 +1776,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
119305 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
119306 };
119307
119308-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
119309+static struct rtnl_link_ops ip6_link_ops = {
119310 .kind = "ip6tnl",
119311 .maxtype = IFLA_IPTUN_MAX,
119312 .policy = ip6_tnl_policy,
119313diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
119314index 0224c03..c5ec3d9 100644
119315--- a/net/ipv6/ip6_vti.c
119316+++ b/net/ipv6/ip6_vti.c
119317@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119318
119319 static int vti6_dev_init(struct net_device *dev);
119320 static void vti6_dev_setup(struct net_device *dev);
119321-static struct rtnl_link_ops vti6_link_ops __read_mostly;
119322+static struct rtnl_link_ops vti6_link_ops;
119323
119324 static int vti6_net_id __read_mostly;
119325 struct vti6_net {
119326@@ -1019,7 +1019,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
119327 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
119328 };
119329
119330-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
119331+static struct rtnl_link_ops vti6_link_ops = {
119332 .kind = "vti6",
119333 .maxtype = IFLA_VTI_MAX,
119334 .policy = vti6_policy,
119335diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
119336index 63e6956..ebbbcf6 100644
119337--- a/net/ipv6/ipv6_sockglue.c
119338+++ b/net/ipv6/ipv6_sockglue.c
119339@@ -1015,7 +1015,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
119340 if (sk->sk_type != SOCK_STREAM)
119341 return -ENOPROTOOPT;
119342
119343- msg.msg_control = optval;
119344+ msg.msg_control = (void __force_kernel *)optval;
119345 msg.msg_controllen = len;
119346 msg.msg_flags = flags;
119347
119348diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
119349index 96f153c..82fcad9 100644
119350--- a/net/ipv6/ndisc.c
119351+++ b/net/ipv6/ndisc.c
119352@@ -1650,6 +1650,7 @@ int ndisc_rcv(struct sk_buff *skb)
119353 static int ndisc_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
119354 {
119355 struct net_device *dev = netdev_notifier_info_to_dev(ptr);
119356+ struct netdev_notifier_change_info *change_info;
119357 struct net *net = dev_net(dev);
119358 struct inet6_dev *idev;
119359
119360@@ -1664,6 +1665,11 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event,
119361 ndisc_send_unsol_na(dev);
119362 in6_dev_put(idev);
119363 break;
119364+ case NETDEV_CHANGE:
119365+ change_info = ptr;
119366+ if (change_info->flags_changed & IFF_NOARP)
119367+ neigh_changeaddr(&nd_tbl, dev);
119368+ break;
119369 case NETDEV_DOWN:
119370 neigh_ifdown(&nd_tbl, dev);
119371 fib6_run_gc(0, net, false);
119372diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
119373index 62f5b0d..331fdb1 100644
119374--- a/net/ipv6/netfilter/ip6_tables.c
119375+++ b/net/ipv6/netfilter/ip6_tables.c
119376@@ -1085,14 +1085,14 @@ static int compat_table_info(const struct xt_table_info *info,
119377 #endif
119378
119379 static int get_info(struct net *net, void __user *user,
119380- const int *len, int compat)
119381+ int len, int compat)
119382 {
119383 char name[XT_TABLE_MAXNAMELEN];
119384 struct xt_table *t;
119385 int ret;
119386
119387- if (*len != sizeof(struct ip6t_getinfo)) {
119388- duprintf("length %u != %zu\n", *len,
119389+ if (len != sizeof(struct ip6t_getinfo)) {
119390+ duprintf("length %u != %zu\n", len,
119391 sizeof(struct ip6t_getinfo));
119392 return -EINVAL;
119393 }
119394@@ -1129,7 +1129,7 @@ static int get_info(struct net *net, void __user *user,
119395 info.size = private->size;
119396 strcpy(info.name, name);
119397
119398- if (copy_to_user(user, &info, *len) != 0)
119399+ if (copy_to_user(user, &info, len) != 0)
119400 ret = -EFAULT;
119401 else
119402 ret = 0;
119403@@ -1991,7 +1991,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119404
119405 switch (cmd) {
119406 case IP6T_SO_GET_INFO:
119407- ret = get_info(sock_net(sk), user, len, 1);
119408+ ret = get_info(sock_net(sk), user, *len, 1);
119409 break;
119410 case IP6T_SO_GET_ENTRIES:
119411 ret = compat_get_entries(sock_net(sk), user, len);
119412@@ -2038,7 +2038,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119413
119414 switch (cmd) {
119415 case IP6T_SO_GET_INFO:
119416- ret = get_info(sock_net(sk), user, len, 0);
119417+ ret = get_info(sock_net(sk), user, *len, 0);
119418 break;
119419
119420 case IP6T_SO_GET_ENTRIES:
119421diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
119422index 6f187c8..55e564f 100644
119423--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
119424+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
119425@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
119426
119427 static int nf_ct_frag6_sysctl_register(struct net *net)
119428 {
119429- struct ctl_table *table;
119430+ ctl_table_no_const *table = NULL;
119431 struct ctl_table_header *hdr;
119432
119433- table = nf_ct_frag6_sysctl_table;
119434 if (!net_eq(net, &init_net)) {
119435- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
119436+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
119437 GFP_KERNEL);
119438 if (table == NULL)
119439 goto err_alloc;
119440@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119441 table[2].data = &net->nf_frag.frags.high_thresh;
119442 table[2].extra1 = &net->nf_frag.frags.low_thresh;
119443 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
119444- }
119445-
119446- hdr = register_net_sysctl(net, "net/netfilter", table);
119447+ hdr = register_net_sysctl(net, "net/netfilter", table);
119448+ } else
119449+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
119450 if (hdr == NULL)
119451 goto err_reg;
119452
119453@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119454 return 0;
119455
119456 err_reg:
119457- if (!net_eq(net, &init_net))
119458- kfree(table);
119459+ kfree(table);
119460 err_alloc:
119461 return -ENOMEM;
119462 }
119463@@ -348,7 +346,7 @@ found:
119464 fq->ecn |= ecn;
119465 if (payload_len > fq->q.max_size)
119466 fq->q.max_size = payload_len;
119467- add_frag_mem_limit(&fq->q, skb->truesize);
119468+ add_frag_mem_limit(fq->q.net, skb->truesize);
119469
119470 /* The first fragment.
119471 * nhoffset is obtained from the first fragment, of course.
119472@@ -430,7 +428,7 @@ nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev)
119473 clone->ip_summed = head->ip_summed;
119474
119475 NFCT_FRAG6_CB(clone)->orig = NULL;
119476- add_frag_mem_limit(&fq->q, clone->truesize);
119477+ add_frag_mem_limit(fq->q.net, clone->truesize);
119478 }
119479
119480 /* We have to remove fragment header from datagram and to relocate
119481@@ -454,7 +452,7 @@ nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev)
119482 head->csum = csum_add(head->csum, fp->csum);
119483 head->truesize += fp->truesize;
119484 }
119485- sub_frag_mem_limit(&fq->q, head->truesize);
119486+ sub_frag_mem_limit(fq->q.net, head->truesize);
119487
119488 head->ignore_df = 1;
119489 head->next = NULL;
119490diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
119491index 263a516..692f738 100644
119492--- a/net/ipv6/ping.c
119493+++ b/net/ipv6/ping.c
119494@@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
119495 };
119496 #endif
119497
119498+static struct pingv6_ops real_pingv6_ops = {
119499+ .ipv6_recv_error = ipv6_recv_error,
119500+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
119501+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
119502+ .icmpv6_err_convert = icmpv6_err_convert,
119503+ .ipv6_icmp_error = ipv6_icmp_error,
119504+ .ipv6_chk_addr = ipv6_chk_addr,
119505+};
119506+
119507+static struct pingv6_ops dummy_pingv6_ops = {
119508+ .ipv6_recv_error = dummy_ipv6_recv_error,
119509+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
119510+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
119511+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
119512+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
119513+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
119514+};
119515+
119516 int __init pingv6_init(void)
119517 {
119518 #ifdef CONFIG_PROC_FS
119519@@ -247,13 +265,7 @@ int __init pingv6_init(void)
119520 if (ret)
119521 return ret;
119522 #endif
119523- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
119524- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
119525- pingv6_ops.ip6_datagram_recv_specific_ctl =
119526- ip6_datagram_recv_specific_ctl;
119527- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
119528- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
119529- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
119530+ pingv6_ops = &real_pingv6_ops;
119531 return inet6_register_protosw(&pingv6_protosw);
119532 }
119533
119534@@ -262,14 +274,9 @@ int __init pingv6_init(void)
119535 */
119536 void pingv6_exit(void)
119537 {
119538- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
119539- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
119540- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
119541- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
119542- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
119543- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
119544 #ifdef CONFIG_PROC_FS
119545 unregister_pernet_subsys(&ping_v6_net_ops);
119546 #endif
119547+ pingv6_ops = &dummy_pingv6_ops;
119548 inet6_unregister_protosw(&pingv6_protosw);
119549 }
119550diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
119551index 679253d0..70b653c 100644
119552--- a/net/ipv6/proc.c
119553+++ b/net/ipv6/proc.c
119554@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
119555 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
119556 goto proc_snmp6_fail;
119557
119558- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
119559+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
119560 if (!net->mib.proc_net_devsnmp6)
119561 goto proc_dev_snmp6_fail;
119562 return 0;
119563diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
119564index 8072bd4..1629245 100644
119565--- a/net/ipv6/raw.c
119566+++ b/net/ipv6/raw.c
119567@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
119568 {
119569 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
119570 skb_checksum_complete(skb)) {
119571- atomic_inc(&sk->sk_drops);
119572+ atomic_inc_unchecked(&sk->sk_drops);
119573 kfree_skb(skb);
119574 return NET_RX_DROP;
119575 }
119576@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119577 struct raw6_sock *rp = raw6_sk(sk);
119578
119579 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
119580- atomic_inc(&sk->sk_drops);
119581+ atomic_inc_unchecked(&sk->sk_drops);
119582 kfree_skb(skb);
119583 return NET_RX_DROP;
119584 }
119585@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119586
119587 if (inet->hdrincl) {
119588 if (skb_checksum_complete(skb)) {
119589- atomic_inc(&sk->sk_drops);
119590+ atomic_inc_unchecked(&sk->sk_drops);
119591 kfree_skb(skb);
119592 return NET_RX_DROP;
119593 }
119594@@ -608,7 +608,7 @@ out:
119595 return err;
119596 }
119597
119598-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
119599+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
119600 struct flowi6 *fl6, struct dst_entry **dstp,
119601 unsigned int flags)
119602 {
119603@@ -913,12 +913,15 @@ do_confirm:
119604 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
119605 char __user *optval, int optlen)
119606 {
119607+ struct icmp6_filter filter;
119608+
119609 switch (optname) {
119610 case ICMPV6_FILTER:
119611 if (optlen > sizeof(struct icmp6_filter))
119612 optlen = sizeof(struct icmp6_filter);
119613- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
119614+ if (copy_from_user(&filter, optval, optlen))
119615 return -EFAULT;
119616+ raw6_sk(sk)->filter = filter;
119617 return 0;
119618 default:
119619 return -ENOPROTOOPT;
119620@@ -931,6 +934,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119621 char __user *optval, int __user *optlen)
119622 {
119623 int len;
119624+ struct icmp6_filter filter;
119625
119626 switch (optname) {
119627 case ICMPV6_FILTER:
119628@@ -942,7 +946,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119629 len = sizeof(struct icmp6_filter);
119630 if (put_user(len, optlen))
119631 return -EFAULT;
119632- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
119633+ filter = raw6_sk(sk)->filter;
119634+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
119635 return -EFAULT;
119636 return 0;
119637 default:
119638diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
119639index 8ffa2c8..0db5dad 100644
119640--- a/net/ipv6/reassembly.c
119641+++ b/net/ipv6/reassembly.c
119642@@ -144,7 +144,7 @@ void ip6_expire_frag_queue(struct net *net, struct frag_queue *fq,
119643
119644 IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMFAILS);
119645
119646- if (fq->q.flags & INET_FRAG_EVICTED)
119647+ if (inet_frag_evicting(&fq->q))
119648 goto out_rcu_unlock;
119649
119650 IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMTIMEOUT);
119651@@ -330,7 +330,7 @@ found:
119652 fq->q.stamp = skb->tstamp;
119653 fq->q.meat += skb->len;
119654 fq->ecn |= ecn;
119655- add_frag_mem_limit(&fq->q, skb->truesize);
119656+ add_frag_mem_limit(fq->q.net, skb->truesize);
119657
119658 /* The first fragment.
119659 * nhoffset is obtained from the first fragment, of course.
119660@@ -443,7 +443,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
119661 head->len -= clone->len;
119662 clone->csum = 0;
119663 clone->ip_summed = head->ip_summed;
119664- add_frag_mem_limit(&fq->q, clone->truesize);
119665+ add_frag_mem_limit(fq->q.net, clone->truesize);
119666 }
119667
119668 /* We have to remove fragment header from datagram and to relocate
119669@@ -481,7 +481,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
119670 }
119671 fp = next;
119672 }
119673- sub_frag_mem_limit(&fq->q, sum_truesize);
119674+ sub_frag_mem_limit(fq->q.net, sum_truesize);
119675
119676 head->next = NULL;
119677 head->dev = dev;
119678@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
119679
119680 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119681 {
119682- struct ctl_table *table;
119683+ ctl_table_no_const *table = NULL;
119684 struct ctl_table_header *hdr;
119685
119686- table = ip6_frags_ns_ctl_table;
119687 if (!net_eq(net, &init_net)) {
119688- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119689+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119690 if (!table)
119691 goto err_alloc;
119692
119693@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119694 /* Don't export sysctls to unprivileged users */
119695 if (net->user_ns != &init_user_ns)
119696 table[0].procname = NULL;
119697- }
119698+ hdr = register_net_sysctl(net, "net/ipv6", table);
119699+ } else
119700+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
119701
119702- hdr = register_net_sysctl(net, "net/ipv6", table);
119703 if (!hdr)
119704 goto err_reg;
119705
119706@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119707 return 0;
119708
119709 err_reg:
119710- if (!net_eq(net, &init_net))
119711- kfree(table);
119712+ kfree(table);
119713 err_alloc:
119714 return -ENOMEM;
119715 }
119716diff --git a/net/ipv6/route.c b/net/ipv6/route.c
119717index c73ae50..aa55e00 100644
119718--- a/net/ipv6/route.c
119719+++ b/net/ipv6/route.c
119720@@ -3046,7 +3046,7 @@ struct ctl_table ipv6_route_table_template[] = {
119721
119722 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
119723 {
119724- struct ctl_table *table;
119725+ ctl_table_no_const *table;
119726
119727 table = kmemdup(ipv6_route_table_template,
119728 sizeof(ipv6_route_table_template),
119729diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
119730index ac35a28..070cc8c 100644
119731--- a/net/ipv6/sit.c
119732+++ b/net/ipv6/sit.c
119733@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
119734 static void ipip6_dev_free(struct net_device *dev);
119735 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
119736 __be32 *v4dst);
119737-static struct rtnl_link_ops sit_link_ops __read_mostly;
119738+static struct rtnl_link_ops sit_link_ops;
119739
119740 static int sit_net_id __read_mostly;
119741 struct sit_net {
119742@@ -1749,7 +1749,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
119743 unregister_netdevice_queue(dev, head);
119744 }
119745
119746-static struct rtnl_link_ops sit_link_ops __read_mostly = {
119747+static struct rtnl_link_ops sit_link_ops = {
119748 .kind = "sit",
119749 .maxtype = IFLA_IPTUN_MAX,
119750 .policy = ipip6_policy,
119751diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
119752index abcc79f..3b2d2d5 100644
119753--- a/net/ipv6/sysctl_net_ipv6.c
119754+++ b/net/ipv6/sysctl_net_ipv6.c
119755@@ -92,7 +92,7 @@ static struct ctl_table ipv6_rotable[] = {
119756
119757 static int __net_init ipv6_sysctl_net_init(struct net *net)
119758 {
119759- struct ctl_table *ipv6_table;
119760+ ctl_table_no_const *ipv6_table;
119761 struct ctl_table *ipv6_route_table;
119762 struct ctl_table *ipv6_icmp_table;
119763 int err;
119764diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
119765index 3adffb3..fe3cc78 100644
119766--- a/net/ipv6/tcp_ipv6.c
119767+++ b/net/ipv6/tcp_ipv6.c
119768@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
119769 }
119770 }
119771
119772+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119773+extern int grsec_enable_blackhole;
119774+#endif
119775+
119776 static __u32 tcp_v6_init_sequence(const struct sk_buff *skb)
119777 {
119778 return secure_tcpv6_sequence_number(ipv6_hdr(skb)->daddr.s6_addr32,
119779@@ -946,7 +950,7 @@ static struct sock *tcp_v6_hnd_req(struct sock *sk, struct sk_buff *skb)
119780 &ipv6_hdr(skb)->daddr, tcp_v6_iif(skb));
119781 if (req) {
119782 nsk = tcp_check_req(sk, skb, req, false);
119783- if (!nsk)
119784+ if (!nsk || nsk == sk)
119785 reqsk_put(req);
119786 return nsk;
119787 }
119788@@ -1283,6 +1287,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
119789 return 0;
119790
119791 reset:
119792+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119793+ if (!grsec_enable_blackhole)
119794+#endif
119795 tcp_v6_send_reset(sk, skb);
119796 discard:
119797 if (opt_skb)
119798@@ -1392,12 +1399,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
119799
119800 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
119801 inet6_iif(skb));
119802- if (!sk)
119803+ if (!sk) {
119804+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119805+ ret = 1;
119806+#endif
119807 goto no_tcp_socket;
119808+ }
119809
119810 process:
119811- if (sk->sk_state == TCP_TIME_WAIT)
119812+ if (sk->sk_state == TCP_TIME_WAIT) {
119813+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119814+ ret = 2;
119815+#endif
119816 goto do_time_wait;
119817+ }
119818
119819 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
119820 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
119821@@ -1448,6 +1463,10 @@ csum_error:
119822 bad_packet:
119823 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
119824 } else {
119825+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119826+ if (!grsec_enable_blackhole || (ret == 1 &&
119827+ (skb->dev->flags & IFF_LOOPBACK)))
119828+#endif
119829 tcp_v6_send_reset(NULL, skb);
119830 }
119831
119832diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
119833index e51fc3e..8f04229 100644
119834--- a/net/ipv6/udp.c
119835+++ b/net/ipv6/udp.c
119836@@ -76,6 +76,10 @@ static u32 udp6_ehashfn(const struct net *net,
119837 udp_ipv6_hash_secret + net_hash_mix(net));
119838 }
119839
119840+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119841+extern int grsec_enable_blackhole;
119842+#endif
119843+
119844 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
119845 {
119846 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
119847@@ -445,7 +449,7 @@ try_again:
119848 if (unlikely(err)) {
119849 trace_kfree_skb(skb, udpv6_recvmsg);
119850 if (!peeked) {
119851- atomic_inc(&sk->sk_drops);
119852+ atomic_inc_unchecked(&sk->sk_drops);
119853 if (is_udp4)
119854 UDP_INC_STATS_USER(sock_net(sk),
119855 UDP_MIB_INERRORS,
119856@@ -709,7 +713,7 @@ csum_error:
119857 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
119858 drop:
119859 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
119860- atomic_inc(&sk->sk_drops);
119861+ atomic_inc_unchecked(&sk->sk_drops);
119862 kfree_skb(skb);
119863 return -1;
119864 }
119865@@ -750,7 +754,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
119866 if (likely(!skb1))
119867 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
119868 if (!skb1) {
119869- atomic_inc(&sk->sk_drops);
119870+ atomic_inc_unchecked(&sk->sk_drops);
119871 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
119872 IS_UDPLITE(sk));
119873 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
119874@@ -934,6 +938,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
119875 goto csum_error;
119876
119877 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
119878+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119879+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
119880+#endif
119881 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
119882
119883 kfree_skb(skb);
119884diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
119885index f337a90..2a9a9db 100644
119886--- a/net/ipv6/xfrm6_policy.c
119887+++ b/net/ipv6/xfrm6_policy.c
119888@@ -222,11 +222,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
119889 }
119890 }
119891
119892-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
119893+static int xfrm6_garbage_collect(struct dst_ops *ops)
119894 {
119895 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
119896
119897- xfrm6_policy_afinfo.garbage_collect(net);
119898+ xfrm_garbage_collect_deferred(net);
119899 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
119900 }
119901
119902@@ -338,19 +338,19 @@ static struct ctl_table xfrm6_policy_table[] = {
119903
119904 static int __net_init xfrm6_net_init(struct net *net)
119905 {
119906- struct ctl_table *table;
119907+ ctl_table_no_const *table = NULL;
119908 struct ctl_table_header *hdr;
119909
119910- table = xfrm6_policy_table;
119911 if (!net_eq(net, &init_net)) {
119912- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
119913+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
119914 if (!table)
119915 goto err_alloc;
119916
119917 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
119918- }
119919+ hdr = register_net_sysctl(net, "net/ipv6", table);
119920+ } else
119921+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
119922
119923- hdr = register_net_sysctl(net, "net/ipv6", table);
119924 if (!hdr)
119925 goto err_reg;
119926
119927@@ -358,8 +358,7 @@ static int __net_init xfrm6_net_init(struct net *net)
119928 return 0;
119929
119930 err_reg:
119931- if (!net_eq(net, &init_net))
119932- kfree(table);
119933+ kfree(table);
119934 err_alloc:
119935 return -ENOMEM;
119936 }
119937diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
119938index c1d247e..9e5949d 100644
119939--- a/net/ipx/ipx_proc.c
119940+++ b/net/ipx/ipx_proc.c
119941@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
119942 struct proc_dir_entry *p;
119943 int rc = -ENOMEM;
119944
119945- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
119946+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
119947
119948 if (!ipx_proc_dir)
119949 goto out;
119950diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
119951index 683346d..cb0e12d 100644
119952--- a/net/irda/ircomm/ircomm_tty.c
119953+++ b/net/irda/ircomm/ircomm_tty.c
119954@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
119955 add_wait_queue(&port->open_wait, &wait);
119956
119957 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
119958- __FILE__, __LINE__, tty->driver->name, port->count);
119959+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
119960
119961 spin_lock_irqsave(&port->lock, flags);
119962- port->count--;
119963+ atomic_dec(&port->count);
119964 port->blocked_open++;
119965 spin_unlock_irqrestore(&port->lock, flags);
119966
119967@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
119968 }
119969
119970 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
119971- __FILE__, __LINE__, tty->driver->name, port->count);
119972+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
119973
119974 schedule();
119975 }
119976@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
119977
119978 spin_lock_irqsave(&port->lock, flags);
119979 if (!tty_hung_up_p(filp))
119980- port->count++;
119981+ atomic_inc(&port->count);
119982 port->blocked_open--;
119983 spin_unlock_irqrestore(&port->lock, flags);
119984
119985 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
119986- __FILE__, __LINE__, tty->driver->name, port->count);
119987+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
119988
119989 if (!retval)
119990 port->flags |= ASYNC_NORMAL_ACTIVE;
119991@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
119992
119993 /* ++ is not atomic, so this should be protected - Jean II */
119994 spin_lock_irqsave(&self->port.lock, flags);
119995- self->port.count++;
119996+ atomic_inc(&self->port.count);
119997 spin_unlock_irqrestore(&self->port.lock, flags);
119998 tty_port_tty_set(&self->port, tty);
119999
120000 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
120001- self->line, self->port.count);
120002+ self->line, atomic_read(&self->port.count));
120003
120004 /* Not really used by us, but lets do it anyway */
120005 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
120006@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
120007 tty_kref_put(port->tty);
120008 }
120009 port->tty = NULL;
120010- port->count = 0;
120011+ atomic_set(&port->count, 0);
120012 spin_unlock_irqrestore(&port->lock, flags);
120013
120014 wake_up_interruptible(&port->open_wait);
120015@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
120016 seq_putc(m, '\n');
120017
120018 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
120019- seq_printf(m, "Open count: %d\n", self->port.count);
120020+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
120021 seq_printf(m, "Max data size: %d\n", self->max_data_size);
120022 seq_printf(m, "Max header size: %d\n", self->max_header_size);
120023
120024diff --git a/net/irda/irproc.c b/net/irda/irproc.c
120025index b9ac598..f88cc56 100644
120026--- a/net/irda/irproc.c
120027+++ b/net/irda/irproc.c
120028@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
120029 {
120030 int i;
120031
120032- proc_irda = proc_mkdir("irda", init_net.proc_net);
120033+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
120034 if (proc_irda == NULL)
120035 return;
120036
120037diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
120038index 6daa52a..786aa2b 100644
120039--- a/net/iucv/af_iucv.c
120040+++ b/net/iucv/af_iucv.c
120041@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
120042 {
120043 char name[12];
120044
120045- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
120046+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
120047 while (__iucv_get_sock_by_name(name)) {
120048 sprintf(name, "%08x",
120049- atomic_inc_return(&iucv_sk_list.autobind_name));
120050+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
120051 }
120052 memcpy(iucv->src_name, name, 8);
120053 }
120054diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
120055index 2a6a1fd..6c112b0 100644
120056--- a/net/iucv/iucv.c
120057+++ b/net/iucv/iucv.c
120058@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
120059 return NOTIFY_OK;
120060 }
120061
120062-static struct notifier_block __refdata iucv_cpu_notifier = {
120063+static struct notifier_block iucv_cpu_notifier = {
120064 .notifier_call = iucv_cpu_notify,
120065 };
120066
120067diff --git a/net/key/af_key.c b/net/key/af_key.c
120068index f0d52d7..9c9af38 100644
120069--- a/net/key/af_key.c
120070+++ b/net/key/af_key.c
120071@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
120072 static u32 get_acqseq(void)
120073 {
120074 u32 res;
120075- static atomic_t acqseq;
120076+ static atomic_unchecked_t acqseq;
120077
120078 do {
120079- res = atomic_inc_return(&acqseq);
120080+ res = atomic_inc_return_unchecked(&acqseq);
120081 } while (!res);
120082 return res;
120083 }
120084diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
120085index 4b55287..bd247f7 100644
120086--- a/net/l2tp/l2tp_eth.c
120087+++ b/net/l2tp/l2tp_eth.c
120088@@ -42,12 +42,12 @@ struct l2tp_eth {
120089 struct sock *tunnel_sock;
120090 struct l2tp_session *session;
120091 struct list_head list;
120092- atomic_long_t tx_bytes;
120093- atomic_long_t tx_packets;
120094- atomic_long_t tx_dropped;
120095- atomic_long_t rx_bytes;
120096- atomic_long_t rx_packets;
120097- atomic_long_t rx_errors;
120098+ atomic_long_unchecked_t tx_bytes;
120099+ atomic_long_unchecked_t tx_packets;
120100+ atomic_long_unchecked_t tx_dropped;
120101+ atomic_long_unchecked_t rx_bytes;
120102+ atomic_long_unchecked_t rx_packets;
120103+ atomic_long_unchecked_t rx_errors;
120104 };
120105
120106 /* via l2tp_session_priv() */
120107@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
120108 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
120109
120110 if (likely(ret == NET_XMIT_SUCCESS)) {
120111- atomic_long_add(len, &priv->tx_bytes);
120112- atomic_long_inc(&priv->tx_packets);
120113+ atomic_long_add_unchecked(len, &priv->tx_bytes);
120114+ atomic_long_inc_unchecked(&priv->tx_packets);
120115 } else {
120116- atomic_long_inc(&priv->tx_dropped);
120117+ atomic_long_inc_unchecked(&priv->tx_dropped);
120118 }
120119 return NETDEV_TX_OK;
120120 }
120121@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
120122 {
120123 struct l2tp_eth *priv = netdev_priv(dev);
120124
120125- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
120126- stats->tx_packets = atomic_long_read(&priv->tx_packets);
120127- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
120128- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
120129- stats->rx_packets = atomic_long_read(&priv->rx_packets);
120130- stats->rx_errors = atomic_long_read(&priv->rx_errors);
120131+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
120132+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
120133+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
120134+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
120135+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
120136+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
120137 return stats;
120138 }
120139
120140@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
120141 nf_reset(skb);
120142
120143 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
120144- atomic_long_inc(&priv->rx_packets);
120145- atomic_long_add(data_len, &priv->rx_bytes);
120146+ atomic_long_inc_unchecked(&priv->rx_packets);
120147+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
120148 } else {
120149- atomic_long_inc(&priv->rx_errors);
120150+ atomic_long_inc_unchecked(&priv->rx_errors);
120151 }
120152 return;
120153
120154 error:
120155- atomic_long_inc(&priv->rx_errors);
120156+ atomic_long_inc_unchecked(&priv->rx_errors);
120157 kfree_skb(skb);
120158 }
120159
120160diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
120161index 7964993..2c48a3a 100644
120162--- a/net/l2tp/l2tp_ip.c
120163+++ b/net/l2tp/l2tp_ip.c
120164@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
120165 .ops = &l2tp_ip_ops,
120166 };
120167
120168-static struct net_protocol l2tp_ip_protocol __read_mostly = {
120169+static const struct net_protocol l2tp_ip_protocol = {
120170 .handler = l2tp_ip_recv,
120171 .netns_ok = 1,
120172 };
120173diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
120174index d1ded37..c0d1e49 100644
120175--- a/net/l2tp/l2tp_ip6.c
120176+++ b/net/l2tp/l2tp_ip6.c
120177@@ -755,7 +755,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
120178 .ops = &l2tp_ip6_ops,
120179 };
120180
120181-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
120182+static const struct inet6_protocol l2tp_ip6_protocol = {
120183 .handler = l2tp_ip6_recv,
120184 };
120185
120186diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
120187index 1a3c7e0..80f8b0c 100644
120188--- a/net/llc/llc_proc.c
120189+++ b/net/llc/llc_proc.c
120190@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
120191 int rc = -ENOMEM;
120192 struct proc_dir_entry *p;
120193
120194- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
120195+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
120196 if (!llc_proc_dir)
120197 goto out;
120198
120199diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
120200index f06d422..de37d95 100644
120201--- a/net/mac80211/cfg.c
120202+++ b/net/mac80211/cfg.c
120203@@ -582,7 +582,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
120204 ret = ieee80211_vif_use_channel(sdata, chandef,
120205 IEEE80211_CHANCTX_EXCLUSIVE);
120206 }
120207- } else if (local->open_count == local->monitors) {
120208+ } else if (local_read(&local->open_count) == local->monitors) {
120209 local->_oper_chandef = *chandef;
120210 ieee80211_hw_config(local, 0);
120211 }
120212@@ -3429,7 +3429,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
120213 else
120214 local->probe_req_reg--;
120215
120216- if (!local->open_count)
120217+ if (!local_read(&local->open_count))
120218 break;
120219
120220 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
120221@@ -3564,8 +3564,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
120222 if (chanctx_conf) {
120223 *chandef = sdata->vif.bss_conf.chandef;
120224 ret = 0;
120225- } else if (local->open_count > 0 &&
120226- local->open_count == local->monitors &&
120227+ } else if (local_read(&local->open_count) > 0 &&
120228+ local_read(&local->open_count) == local->monitors &&
120229 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
120230 if (local->use_chanctx)
120231 *chandef = local->monitor_chandef;
120232diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
120233index c0a9187..2a13300 100644
120234--- a/net/mac80211/ieee80211_i.h
120235+++ b/net/mac80211/ieee80211_i.h
120236@@ -30,6 +30,7 @@
120237 #include <net/ieee80211_radiotap.h>
120238 #include <net/cfg80211.h>
120239 #include <net/mac80211.h>
120240+#include <asm/local.h>
120241 #include "key.h"
120242 #include "sta_info.h"
120243 #include "debug.h"
120244@@ -1118,7 +1119,7 @@ struct ieee80211_local {
120245 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
120246 spinlock_t queue_stop_reason_lock;
120247
120248- int open_count;
120249+ local_t open_count;
120250 int monitors, cooked_mntrs;
120251 /* number of interfaces with corresponding FIF_ flags */
120252 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
120253diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
120254index 84cef60..53ec813 100644
120255--- a/net/mac80211/iface.c
120256+++ b/net/mac80211/iface.c
120257@@ -550,7 +550,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120258 break;
120259 }
120260
120261- if (local->open_count == 0) {
120262+ if (local_read(&local->open_count) == 0) {
120263 res = drv_start(local);
120264 if (res)
120265 goto err_del_bss;
120266@@ -597,7 +597,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120267 res = drv_add_interface(local, sdata);
120268 if (res)
120269 goto err_stop;
120270- } else if (local->monitors == 0 && local->open_count == 0) {
120271+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
120272 res = ieee80211_add_virtual_monitor(local);
120273 if (res)
120274 goto err_stop;
120275@@ -707,7 +707,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120276 atomic_inc(&local->iff_promiscs);
120277
120278 if (coming_up)
120279- local->open_count++;
120280+ local_inc(&local->open_count);
120281
120282 if (hw_reconf_flags)
120283 ieee80211_hw_config(local, hw_reconf_flags);
120284@@ -745,7 +745,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120285 err_del_interface:
120286 drv_remove_interface(local, sdata);
120287 err_stop:
120288- if (!local->open_count)
120289+ if (!local_read(&local->open_count))
120290 drv_stop(local);
120291 err_del_bss:
120292 sdata->bss = NULL;
120293@@ -915,7 +915,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120294 }
120295
120296 if (going_down)
120297- local->open_count--;
120298+ local_dec(&local->open_count);
120299
120300 switch (sdata->vif.type) {
120301 case NL80211_IFTYPE_AP_VLAN:
120302@@ -984,7 +984,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120303 atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
120304 }
120305
120306- if (local->open_count == 0)
120307+ if (local_read(&local->open_count) == 0)
120308 ieee80211_clear_tx_pending(local);
120309
120310 /*
120311@@ -1027,7 +1027,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120312 if (cancel_scan)
120313 flush_delayed_work(&local->scan_work);
120314
120315- if (local->open_count == 0) {
120316+ if (local_read(&local->open_count) == 0) {
120317 ieee80211_stop_device(local);
120318
120319 /* no reconfiguring after stop! */
120320@@ -1038,7 +1038,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120321 ieee80211_configure_filter(local);
120322 ieee80211_hw_config(local, hw_reconf_flags);
120323
120324- if (local->monitors == local->open_count)
120325+ if (local->monitors == local_read(&local->open_count))
120326 ieee80211_add_virtual_monitor(local);
120327 }
120328
120329diff --git a/net/mac80211/main.c b/net/mac80211/main.c
120330index e86daed..9cbf3f4 100644
120331--- a/net/mac80211/main.c
120332+++ b/net/mac80211/main.c
120333@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
120334 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
120335 IEEE80211_CONF_CHANGE_POWER);
120336
120337- if (changed && local->open_count) {
120338+ if (changed && local_read(&local->open_count)) {
120339 ret = drv_config(local, changed);
120340 /*
120341 * Goal:
120342diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
120343index ac6ad62..77dbac5 100644
120344--- a/net/mac80211/pm.c
120345+++ b/net/mac80211/pm.c
120346@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120347 struct ieee80211_sub_if_data *sdata;
120348 struct sta_info *sta;
120349
120350- if (!local->open_count)
120351+ if (!local_read(&local->open_count))
120352 goto suspend;
120353
120354 ieee80211_scan_cancel(local);
120355@@ -150,7 +150,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120356 WARN_ON(!list_empty(&local->chanctx_list));
120357
120358 /* stop hardware - this must stop RX */
120359- if (local->open_count)
120360+ if (local_read(&local->open_count))
120361 ieee80211_stop_device(local);
120362
120363 suspend:
120364diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
120365index d53355b..21f583a 100644
120366--- a/net/mac80211/rate.c
120367+++ b/net/mac80211/rate.c
120368@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
120369
120370 ASSERT_RTNL();
120371
120372- if (local->open_count)
120373+ if (local_read(&local->open_count))
120374 return -EBUSY;
120375
120376 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
120377diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
120378index 2880f2a..3085cec 100644
120379--- a/net/mac80211/sta_info.c
120380+++ b/net/mac80211/sta_info.c
120381@@ -339,7 +339,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
120382 int size = sizeof(struct txq_info) +
120383 ALIGN(hw->txq_data_size, sizeof(void *));
120384
120385- txq_data = kcalloc(ARRAY_SIZE(sta->sta.txq), size, gfp);
120386+ txq_data = kcalloc(size, ARRAY_SIZE(sta->sta.txq), gfp);
120387 if (!txq_data)
120388 goto free;
120389
120390diff --git a/net/mac80211/util.c b/net/mac80211/util.c
120391index b864ebc..17326ff 100644
120392--- a/net/mac80211/util.c
120393+++ b/net/mac80211/util.c
120394@@ -1761,7 +1761,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120395 bool sched_scan_stopped = false;
120396
120397 /* nothing to do if HW shouldn't run */
120398- if (!local->open_count)
120399+ if (!local_read(&local->open_count))
120400 goto wake_up;
120401
120402 #ifdef CONFIG_PM
120403@@ -2033,7 +2033,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120404 local->in_reconfig = false;
120405 barrier();
120406
120407- if (local->monitors == local->open_count && local->monitors > 0)
120408+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
120409 ieee80211_add_virtual_monitor(local);
120410
120411 /*
120412@@ -2088,7 +2088,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120413 * If this is for hw restart things are still running.
120414 * We may want to change that later, however.
120415 */
120416- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
120417+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
120418 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
120419
120420 if (!local->suspended)
120421@@ -2112,7 +2112,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120422 flush_delayed_work(&local->scan_work);
120423 }
120424
120425- if (local->open_count && !reconfig_due_to_wowlan)
120426+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
120427 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
120428
120429 list_for_each_entry(sdata, &local->interfaces, list) {
120430diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
120431index 1f93a59..96faa29 100644
120432--- a/net/mpls/af_mpls.c
120433+++ b/net/mpls/af_mpls.c
120434@@ -456,7 +456,7 @@ static int mpls_dev_sysctl_register(struct net_device *dev,
120435 struct mpls_dev *mdev)
120436 {
120437 char path[sizeof("net/mpls/conf/") + IFNAMSIZ];
120438- struct ctl_table *table;
120439+ ctl_table_no_const *table;
120440 int i;
120441
120442 table = kmemdup(&mpls_dev_table, sizeof(mpls_dev_table), GFP_KERNEL);
120443@@ -1025,7 +1025,7 @@ static int mpls_platform_labels(struct ctl_table *table, int write,
120444 struct net *net = table->data;
120445 int platform_labels = net->mpls.platform_labels;
120446 int ret;
120447- struct ctl_table tmp = {
120448+ ctl_table_no_const tmp = {
120449 .procname = table->procname,
120450 .data = &platform_labels,
120451 .maxlen = sizeof(int),
120452@@ -1055,7 +1055,7 @@ static const struct ctl_table mpls_table[] = {
120453
120454 static int mpls_net_init(struct net *net)
120455 {
120456- struct ctl_table *table;
120457+ ctl_table_no_const *table;
120458
120459 net->mpls.platform_labels = 0;
120460 net->mpls.platform_label = NULL;
120461diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
120462index a0f3e6a3..b026fe2 100644
120463--- a/net/netfilter/Kconfig
120464+++ b/net/netfilter/Kconfig
120465@@ -1112,6 +1112,16 @@ config NETFILTER_XT_MATCH_ESP
120466
120467 To compile it as a module, choose M here. If unsure, say N.
120468
120469+config NETFILTER_XT_MATCH_GRADM
120470+ tristate '"gradm" match support'
120471+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
120472+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
120473+ ---help---
120474+ The gradm match allows to match on grsecurity RBAC being enabled.
120475+ It is useful when iptables rules are applied early on bootup to
120476+ prevent connections to the machine (except from a trusted host)
120477+ while the RBAC system is disabled.
120478+
120479 config NETFILTER_XT_MATCH_HASHLIMIT
120480 tristate '"hashlimit" match support'
120481 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
120482diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
120483index a87d8b8..d43183c 100644
120484--- a/net/netfilter/Makefile
120485+++ b/net/netfilter/Makefile
120486@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
120487 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
120488 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
120489 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
120490+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
120491 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
120492 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
120493 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
120494diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
120495index d259da3..6a32b2c 100644
120496--- a/net/netfilter/ipset/ip_set_core.c
120497+++ b/net/netfilter/ipset/ip_set_core.c
120498@@ -1952,7 +1952,7 @@ done:
120499 return ret;
120500 }
120501
120502-static struct nf_sockopt_ops so_set __read_mostly = {
120503+static struct nf_sockopt_ops so_set = {
120504 .pf = PF_INET,
120505 .get_optmin = SO_IP_SET,
120506 .get_optmax = SO_IP_SET + 1,
120507diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
120508index b0f7b62..0541842 100644
120509--- a/net/netfilter/ipvs/ip_vs_conn.c
120510+++ b/net/netfilter/ipvs/ip_vs_conn.c
120511@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
120512 /* Increase the refcnt counter of the dest */
120513 ip_vs_dest_hold(dest);
120514
120515- conn_flags = atomic_read(&dest->conn_flags);
120516+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
120517 if (cp->protocol != IPPROTO_UDP)
120518 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
120519 flags = cp->flags;
120520@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
120521
120522 cp->control = NULL;
120523 atomic_set(&cp->n_control, 0);
120524- atomic_set(&cp->in_pkts, 0);
120525+ atomic_set_unchecked(&cp->in_pkts, 0);
120526
120527 cp->packet_xmit = NULL;
120528 cp->app = NULL;
120529@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
120530
120531 /* Don't drop the entry if its number of incoming packets is not
120532 located in [0, 8] */
120533- i = atomic_read(&cp->in_pkts);
120534+ i = atomic_read_unchecked(&cp->in_pkts);
120535 if (i > 8 || i < 0) return 0;
120536
120537 if (!todrop_rate[i]) return 0;
120538diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
120539index 5d2b806..9005b29 100644
120540--- a/net/netfilter/ipvs/ip_vs_core.c
120541+++ b/net/netfilter/ipvs/ip_vs_core.c
120542@@ -574,7 +574,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
120543 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
120544 /* do not touch skb anymore */
120545
120546- atomic_inc(&cp->in_pkts);
120547+ atomic_inc_unchecked(&cp->in_pkts);
120548 ip_vs_conn_put(cp);
120549 return ret;
120550 }
120551@@ -1750,7 +1750,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
120552 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
120553 pkts = sysctl_sync_threshold(ipvs);
120554 else
120555- pkts = atomic_add_return(1, &cp->in_pkts);
120556+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120557
120558 if (ipvs->sync_state & IP_VS_STATE_MASTER)
120559 ip_vs_sync_conn(net, cp, pkts);
120560diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
120561index 285eae3..226f4a7 100644
120562--- a/net/netfilter/ipvs/ip_vs_ctl.c
120563+++ b/net/netfilter/ipvs/ip_vs_ctl.c
120564@@ -814,7 +814,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
120565 */
120566 ip_vs_rs_hash(ipvs, dest);
120567 }
120568- atomic_set(&dest->conn_flags, conn_flags);
120569+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
120570
120571 /* bind the service */
120572 old_svc = rcu_dereference_protected(dest->svc, 1);
120573@@ -1679,7 +1679,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
120574 * align with netns init in ip_vs_control_net_init()
120575 */
120576
120577-static struct ctl_table vs_vars[] = {
120578+static ctl_table_no_const vs_vars[] __read_only = {
120579 {
120580 .procname = "amemthresh",
120581 .maxlen = sizeof(int),
120582@@ -2020,7 +2020,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120583 " %-7s %-6d %-10d %-10d\n",
120584 &dest->addr.in6,
120585 ntohs(dest->port),
120586- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120587+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120588 atomic_read(&dest->weight),
120589 atomic_read(&dest->activeconns),
120590 atomic_read(&dest->inactconns));
120591@@ -2031,7 +2031,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120592 "%-7s %-6d %-10d %-10d\n",
120593 ntohl(dest->addr.ip),
120594 ntohs(dest->port),
120595- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120596+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120597 atomic_read(&dest->weight),
120598 atomic_read(&dest->activeconns),
120599 atomic_read(&dest->inactconns));
120600@@ -2528,7 +2528,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
120601
120602 entry.addr = dest->addr.ip;
120603 entry.port = dest->port;
120604- entry.conn_flags = atomic_read(&dest->conn_flags);
120605+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
120606 entry.weight = atomic_read(&dest->weight);
120607 entry.u_threshold = dest->u_threshold;
120608 entry.l_threshold = dest->l_threshold;
120609@@ -3101,7 +3101,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
120610 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
120611 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
120612 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
120613- (atomic_read(&dest->conn_flags) &
120614+ (atomic_read_unchecked(&dest->conn_flags) &
120615 IP_VS_CONN_F_FWD_MASK)) ||
120616 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
120617 atomic_read(&dest->weight)) ||
120618@@ -3739,7 +3739,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
120619 {
120620 int idx;
120621 struct netns_ipvs *ipvs = net_ipvs(net);
120622- struct ctl_table *tbl;
120623+ ctl_table_no_const *tbl;
120624
120625 atomic_set(&ipvs->dropentry, 0);
120626 spin_lock_init(&ipvs->dropentry_lock);
120627diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
120628index 127f140..553d652 100644
120629--- a/net/netfilter/ipvs/ip_vs_lblc.c
120630+++ b/net/netfilter/ipvs/ip_vs_lblc.c
120631@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
120632 * IPVS LBLC sysctl table
120633 */
120634 #ifdef CONFIG_SYSCTL
120635-static struct ctl_table vs_vars_table[] = {
120636+static ctl_table_no_const vs_vars_table[] __read_only = {
120637 {
120638 .procname = "lblc_expiration",
120639 .data = NULL,
120640diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
120641index 2229d2d..b32b785 100644
120642--- a/net/netfilter/ipvs/ip_vs_lblcr.c
120643+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
120644@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
120645 * IPVS LBLCR sysctl table
120646 */
120647
120648-static struct ctl_table vs_vars_table[] = {
120649+static ctl_table_no_const vs_vars_table[] __read_only = {
120650 {
120651 .procname = "lblcr_expiration",
120652 .data = NULL,
120653diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
120654index 19b9cce..e4f3112 100644
120655--- a/net/netfilter/ipvs/ip_vs_sync.c
120656+++ b/net/netfilter/ipvs/ip_vs_sync.c
120657@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
120658 cp = cp->control;
120659 if (cp) {
120660 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120661- pkts = atomic_add_return(1, &cp->in_pkts);
120662+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120663 else
120664 pkts = sysctl_sync_threshold(ipvs);
120665 ip_vs_sync_conn(net, cp->control, pkts);
120666@@ -771,7 +771,7 @@ control:
120667 if (!cp)
120668 return;
120669 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120670- pkts = atomic_add_return(1, &cp->in_pkts);
120671+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120672 else
120673 pkts = sysctl_sync_threshold(ipvs);
120674 goto sloop;
120675@@ -919,7 +919,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
120676
120677 if (opt)
120678 memcpy(&cp->in_seq, opt, sizeof(*opt));
120679- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120680+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120681 cp->state = state;
120682 cp->old_state = cp->state;
120683 /*
120684diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
120685index 19986ec..416dbc5 100644
120686--- a/net/netfilter/ipvs/ip_vs_xmit.c
120687+++ b/net/netfilter/ipvs/ip_vs_xmit.c
120688@@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
120689 else
120690 rc = NF_ACCEPT;
120691 /* do not touch skb anymore */
120692- atomic_inc(&cp->in_pkts);
120693+ atomic_inc_unchecked(&cp->in_pkts);
120694 goto out;
120695 }
120696
120697@@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
120698 else
120699 rc = NF_ACCEPT;
120700 /* do not touch skb anymore */
120701- atomic_inc(&cp->in_pkts);
120702+ atomic_inc_unchecked(&cp->in_pkts);
120703 goto out;
120704 }
120705
120706diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
120707index 45da11a..ef3e5dc 100644
120708--- a/net/netfilter/nf_conntrack_acct.c
120709+++ b/net/netfilter/nf_conntrack_acct.c
120710@@ -64,7 +64,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
120711 #ifdef CONFIG_SYSCTL
120712 static int nf_conntrack_acct_init_sysctl(struct net *net)
120713 {
120714- struct ctl_table *table;
120715+ ctl_table_no_const *table;
120716
120717 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
120718 GFP_KERNEL);
120719diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
120720index 13fad86..18c984c 100644
120721--- a/net/netfilter/nf_conntrack_core.c
120722+++ b/net/netfilter/nf_conntrack_core.c
120723@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
120724 #define DYING_NULLS_VAL ((1<<30)+1)
120725 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
120726
120727+#ifdef CONFIG_GRKERNSEC_HIDESYM
120728+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
120729+#endif
120730+
120731 int nf_conntrack_init_net(struct net *net)
120732 {
120733 int ret = -ENOMEM;
120734@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
120735 if (!net->ct.stat)
120736 goto err_pcpu_lists;
120737
120738+#ifdef CONFIG_GRKERNSEC_HIDESYM
120739+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
120740+#else
120741 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
120742+#endif
120743 if (!net->ct.slabname)
120744 goto err_slabname;
120745
120746diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
120747index 4e78c57..ec8fb74 100644
120748--- a/net/netfilter/nf_conntrack_ecache.c
120749+++ b/net/netfilter/nf_conntrack_ecache.c
120750@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
120751 #ifdef CONFIG_SYSCTL
120752 static int nf_conntrack_event_init_sysctl(struct net *net)
120753 {
120754- struct ctl_table *table;
120755+ ctl_table_no_const *table;
120756
120757 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
120758 GFP_KERNEL);
120759diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
120760index bd9d315..989947e 100644
120761--- a/net/netfilter/nf_conntrack_helper.c
120762+++ b/net/netfilter/nf_conntrack_helper.c
120763@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
120764
120765 static int nf_conntrack_helper_init_sysctl(struct net *net)
120766 {
120767- struct ctl_table *table;
120768+ ctl_table_no_const *table;
120769
120770 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
120771 GFP_KERNEL);
120772diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
120773index b65d586..beec902 100644
120774--- a/net/netfilter/nf_conntrack_proto.c
120775+++ b/net/netfilter/nf_conntrack_proto.c
120776@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
120777
120778 static void
120779 nf_ct_unregister_sysctl(struct ctl_table_header **header,
120780- struct ctl_table **table,
120781+ ctl_table_no_const **table,
120782 unsigned int users)
120783 {
120784 if (users > 0)
120785diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
120786index fc823fa..8311af3 100644
120787--- a/net/netfilter/nf_conntrack_standalone.c
120788+++ b/net/netfilter/nf_conntrack_standalone.c
120789@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
120790
120791 static int nf_conntrack_standalone_init_sysctl(struct net *net)
120792 {
120793- struct ctl_table *table;
120794+ ctl_table_no_const *table;
120795
120796 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
120797 GFP_KERNEL);
120798diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
120799index 7a394df..bd91a8a 100644
120800--- a/net/netfilter/nf_conntrack_timestamp.c
120801+++ b/net/netfilter/nf_conntrack_timestamp.c
120802@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
120803 #ifdef CONFIG_SYSCTL
120804 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
120805 {
120806- struct ctl_table *table;
120807+ ctl_table_no_const *table;
120808
120809 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
120810 GFP_KERNEL);
120811diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
120812index 675d12c..b36e825 100644
120813--- a/net/netfilter/nf_log.c
120814+++ b/net/netfilter/nf_log.c
120815@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
120816
120817 #ifdef CONFIG_SYSCTL
120818 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
120819-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
120820+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
120821
120822 static int nf_log_proc_dostring(struct ctl_table *table, int write,
120823 void __user *buffer, size_t *lenp, loff_t *ppos)
120824@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
120825 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
120826 mutex_unlock(&nf_log_mutex);
120827 } else {
120828+ ctl_table_no_const nf_log_table = *table;
120829+
120830 mutex_lock(&nf_log_mutex);
120831 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
120832 if (!logger)
120833- table->data = "NONE";
120834+ nf_log_table.data = "NONE";
120835 else
120836- table->data = logger->name;
120837- r = proc_dostring(table, write, buffer, lenp, ppos);
120838+ nf_log_table.data = logger->name;
120839+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
120840 mutex_unlock(&nf_log_mutex);
120841 }
120842
120843diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
120844index c68c1e5..8b5d670 100644
120845--- a/net/netfilter/nf_sockopt.c
120846+++ b/net/netfilter/nf_sockopt.c
120847@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
120848 }
120849 }
120850
120851- list_add(&reg->list, &nf_sockopts);
120852+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
120853 out:
120854 mutex_unlock(&nf_sockopt_mutex);
120855 return ret;
120856@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
120857 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
120858 {
120859 mutex_lock(&nf_sockopt_mutex);
120860- list_del(&reg->list);
120861+ pax_list_del((struct list_head *)&reg->list);
120862 mutex_unlock(&nf_sockopt_mutex);
120863 }
120864 EXPORT_SYMBOL(nf_unregister_sockopt);
120865diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
120866index 4ef1fae..f72f08b 100644
120867--- a/net/netfilter/nfnetlink_log.c
120868+++ b/net/netfilter/nfnetlink_log.c
120869@@ -84,7 +84,7 @@ static int nfnl_log_net_id __read_mostly;
120870 struct nfnl_log_net {
120871 spinlock_t instances_lock;
120872 struct hlist_head instance_table[INSTANCE_BUCKETS];
120873- atomic_t global_seq;
120874+ atomic_unchecked_t global_seq;
120875 };
120876
120877 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
120878@@ -572,7 +572,7 @@ __build_packet_message(struct nfnl_log_net *log,
120879 /* global sequence number */
120880 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
120881 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
120882- htonl(atomic_inc_return(&log->global_seq))))
120883+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
120884 goto nla_put_failure;
120885
120886 if (data_len) {
120887diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
120888index 7f29cfc..917ef5f 100644
120889--- a/net/netfilter/nft_compat.c
120890+++ b/net/netfilter/nft_compat.c
120891@@ -321,14 +321,7 @@ static void nft_match_eval(const struct nft_expr *expr,
120892 return;
120893 }
120894
120895- switch (ret ? 1 : 0) {
120896- case 1:
120897- regs->verdict.code = NFT_CONTINUE;
120898- break;
120899- case 0:
120900- regs->verdict.code = NFT_BREAK;
120901- break;
120902- }
120903+ regs->verdict.code = ret ? NFT_CONTINUE : NFT_BREAK;
120904 }
120905
120906 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
120907diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
120908new file mode 100644
120909index 0000000..c566332
120910--- /dev/null
120911+++ b/net/netfilter/xt_gradm.c
120912@@ -0,0 +1,51 @@
120913+/*
120914+ * gradm match for netfilter
120915